[arch-commits] Commit in renpy/trunk (PKGBUILD renpy-system-fribidi.patch)

[Maxime Gauduin]

    Date: Thursday, September 13, 2018 @ 15:13:19
  Author: alucryd
Revision: 380303

upgpkg: renpy 7.1.0-1

Added:
  renpy/trunk/renpy-system-fribidi.patch
Modified:
  renpy/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   13 ++++++++---
 renpy-system-fribidi.patch |   47 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-13 14:55:03 UTC (rev 380302)
+++ PKGBUILD	2018-09-13 15:13:19 UTC (rev 380303)
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 371260 2018-08-13 09:13:06Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 # Contributor: Cravix <dr.neemous at gmail.com>
 # Contributor: AlexanderR <rvacheva at nxt.ru>
@@ -5,7 +6,7 @@
 
 pkgbase=renpy
 pkgname=('renpy' 'renpy-demos')
-pkgver=7.0.0
+pkgver=7.1.0
 pkgrel=1
 pkgdesc="The Ren'Py Visual Novel Engine"
 arch=('x86_64')
@@ -17,16 +18,20 @@
 source=("https://www.renpy.org/dl/${pkgver}/renpy-${pkgver}-source.tar.bz2"
         'renpy'
         'renpy.desktop'
-        'renpy.png')
-sha256sums=('4f2019e5056196d92cb0f5e569f3b20d5c011fda3810d0d63c4f3ac263b93c7b'
+        'renpy.png'
+        'renpy-system-fribidi.patch')
+sha256sums=('dc8f58b7de4f92c73cca9543c27acc61831ff88ba42459fde8c6409c88f97f37'
             'e10630ec0b5d0e479f20b15a4f5ceec8e6992dd8cbc7d3cd5c487da380858a28'
             'fccde3461617a098a78d938d9db782d403eda410a84ab52825a597498ab95834'
-            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5')
+            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5'
+            'b4a2e8dcb2646bcebf57f6364a1ca7e9dfe0be61ec5b81564fc2d4c53e85dc0a')
 
 prepare() {
   cd renpy-${pkgver}-source
 
   sed 's/python/python2/' -i atom/Atom.edit.py launcher/game/tkaskdir.py
+
+  patch -Np1 -i ../renpy-system-fribidi.patch
 }
 
 build() {

Added: renpy-system-fribidi.patch
===================================================================
--- renpy-system-fribidi.patch	                        (rev 0)
+++ renpy-system-fribidi.patch	2018-09-13 15:13:19 UTC (rev 380303)
@@ -0,0 +1,47 @@
+diff -rupN renpy-7.1.0-source.old/module/renpybidicore.c renpy-7.1.0-source/module/renpybidicore.c
+--- renpy-7.1.0-source.old/module/renpybidicore.c	2018-09-13 14:10:03.102145102 +0200
++++ renpy-7.1.0-source/module/renpybidicore.c	2018-09-13 14:11:07.782646087 +0200
+@@ -1,5 +1,5 @@
+ #include <Python.h>
+-#include <fribidi-src/lib/fribidi.h>
++#include <fribidi.h>
+ #include <stdlib.h>
+ 
+ #ifndef alloca
+diff -rupN renpy-7.1.0-source.old/module/setup.py renpy-7.1.0-source/module/setup.py
+--- renpy-7.1.0-source.old/module/setup.py	2018-09-13 14:10:03.102145102 +0200
++++ renpy-7.1.0-source/module/setup.py	2018-09-13 14:11:51.122981804 +0200
+@@ -119,32 +119,18 @@ 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/",
++        "/usr/include/fribidi/"
+         ],
+     define_macros=[
+         ("FRIBIDI_ENTRY", ""),
+-        ("HAVE_CONFIG_H", "1"),
+         ])
+ 
+-
+ cython("_renpysteam", language="c++", compile_if=steam_sdk, libs=["steam_api"])
+ 
+ # Sound.