renpy/trunk/renpy-system-fribidi.patch

   1 From 9509dff47c44ef321b5133051d949a066310f4bf Mon Sep 17 00:00:00 2001
   2 From: Maxime Gauduin <alucryd@gmail.com>
   3 Date: Mon, 4 Jan 2021 10:46:05 +0100
   4 Subject: [PATCH] use system fribidi
   5
   6 ---
   7  module/renpybidicore.c |  4 ----
   8  module/setup.py        | 16 ++--------------
   9  2 files changed, 2 insertions(+), 18 deletions(-)
  10
  11 diff --git a/module/renpybidicore.c b/module/renpybidicore.c
  12 index 18182946b..a85124f28 100644
  13 --- a/module/renpybidicore.c
  14 +++ b/module/renpybidicore.c
  15 @@ -1,10 +1,6 @@
  16  #include <Python.h>
  17
  18 -#ifdef RENPY_BUILD
  19  #include <fribidi.h>
  20 -#else
  21 -#include <fribidi-src/lib/fribidi.h>
  22 -#endif
  23
  24  #include <stdlib.h>
  25
  26 diff --git a/module/setup.py b/module/setup.py
  27 index e3a3dc784..7b1de7cbc 100755
  28 --- a/module/setup.py
  29 +++ b/module/setup.py
  30 @@ -125,29 +125,17 @@ cython(
  31      sdl + [ png, 'z', 'm' ])
  32
  33  FRIBIDI_SOURCES = """
  34 -fribidi-src/lib/fribidi.c
  35 -fribidi-src/lib/fribidi-arabic.c
  36 -fribidi-src/lib/fribidi-bidi.c
  37 -fribidi-src/lib/fribidi-bidi-types.c
  38 -fribidi-src/lib/fribidi-deprecated.c
  39 -fribidi-src/lib/fribidi-joining.c
  40 -fribidi-src/lib/fribidi-joining-types.c
  41 -fribidi-src/lib/fribidi-mem.c
  42 -fribidi-src/lib/fribidi-mirroring.c
  43 -fribidi-src/lib/fribidi-run.c
  44 -fribidi-src/lib/fribidi-shape.c
  45  renpybidicore.c
  46  """.split()
  47  cython(
  48      "_renpybidi",
  49      FRIBIDI_SOURCES,
  50 +    ["fribidi"],
  51      includes=[
  52 -        BASE + "/fribidi-src/",
  53 -        BASE + "/fribidi-src/lib/",
  54 +        "/usr/include/fribidi/",
  55          ],
  56      define_macros=[
  57          ("FRIBIDI_ENTRY", ""),
  58 -        ("HAVE_CONFIG_H", "1"),
  59          ])
  60
  61  cython("_renpysteam", language="c++", compile_if=steam_sdk, libs=["steam_api"])
  62 --
  63 2.29.2
  64