aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/renpy-use-system-fribidi.patch
blob: 913415e317e9228d987ae4ec78f8ee85164b45e3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
See also [Arch] and [Gentoo] for similar patches in other distros.
[Arch] https://github.com/archlinux/svntogit-community/blob/packages/renpy/trunk/renpy-system-fribidi.patch
[Gentoo] https://gitweb.gentoo.org/repo/gentoo.git/tree/games-engines/renpy/files/renpy-7.3.5-use-system-fribidi.patch

Index: renpy-7.4.0-source/module/renpybidicore.c
===================================================================
--- renpy-7.4.0-source.orig/module/renpybidicore.c
+++ renpy-7.4.0-source/module/renpybidicore.c
@@ -1,9 +1,3 @@
 #include <Python.h>
-
-#ifdef RENPY_BUILD
 #include <fribidi.h>
-#else
-#include <fribidi-src/lib/fribidi.h>
-#endif
-
 #include <stdlib.h>

 #ifndef alloca
Index: renpy-7.4.0-source/module/setup.py
===================================================================
--- renpy-7.4.0-source.orig/module/setup.py
+++ renpy-7.4.0-source/module/setup.py
@@ -125,30 +125,13 @@ cython(
     sdl + [ png, 'z', 'm' ])

 FRIBIDI_SOURCES = """
-fribidi-src/lib/fribidi.c
-fribidi-src/lib/fribidi-arabic.c
-fribidi-src/lib/fribidi-bidi.c
-fribidi-src/lib/fribidi-bidi-types.c
-fribidi-src/lib/fribidi-deprecated.c
-fribidi-src/lib/fribidi-joining.c
-fribidi-src/lib/fribidi-joining-types.c
-fribidi-src/lib/fribidi-mem.c
-fribidi-src/lib/fribidi-mirroring.c
-fribidi-src/lib/fribidi-run.c
-fribidi-src/lib/fribidi-shape.c
 renpybidicore.c
 """.split()
 cython(
     "_renpybidi",
     FRIBIDI_SOURCES,
-    includes=[
-        BASE + "/fribidi-src/",
-        BASE + "/fribidi-src/lib/",
-        ],
-    define_macros=[
-        ("FRIBIDI_ENTRY", ""),
-        ("HAVE_CONFIG_H", "1"),
-        ])
+    includes=["/usr/include/fribidi"],
+    libs=["fribidi"])


 cython("_renpysteam", language="c++", compile_if=steam_sdk, libs=["steam_api"])