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

[Maxime Gauduin]

    Date: Monday, January 4, 2021 @ 11:05:22
  Author: alucryd
Revision: 806930

upgpkg: renpy 7.4.0-1

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

----------------------------+
 PKGBUILD                   |   19 ++++++++++-------
 renpy-system-fribidi.patch |   46 ++++++++++++++++++++++++++++---------------
 2 files changed, 42 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-04 10:49:58 UTC (rev 806929)
+++ PKGBUILD	2021-01-04 11:05:22 UTC (rev 806930)
@@ -9,8 +9,8 @@
   renpy
   renpy-demos
 )
-pkgver=7.3.5
-pkgrel=2
+pkgver=7.4.0
+pkgrel=1
 pkgdesc="The Ren'Py Visual Novel Engine"
 arch=(x86_64)
 url=https://www.renpy.org
@@ -18,10 +18,13 @@
 depends=(
   ffmpeg
   glew
+  python2-future
   python2-pygame-sdl2
 )
 makedepends=(cython2)
-optdepends=('atom: Default editor')
+optdepends=(
+  'atom: Default editor'
+  'code: Another editor')
 source=(
   https://www.renpy.org/dl/${pkgver}/renpy-${pkgver}-source.tar.bz2
   renpy
@@ -29,11 +32,11 @@
   renpy.png
   renpy-system-fribidi.patch
 )
-sha256sums=('84d7f46b54b9204bf472cd533201380ff2c8669b7967b2c98c4bafbd1c2bd9aa'
-            'e10630ec0b5d0e479f20b15a4f5ceec8e6992dd8cbc7d3cd5c487da380858a28'
-            'fccde3461617a098a78d938d9db782d403eda410a84ab52825a597498ab95834'
-            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5'
-            'c82d57331b8146ac3f76579f95e7cdca559f84919f96b35e9b19c25a5e2128b5')
+b2sums=('04d5dacee85aa380c1dd6256c68dc65f7cf53167c663e1a0a948cfa2d9aafc14e1b989d7be71d9f0b5fe1029c3c92d6db099303158c13675b751c46ac44ba1ea'
+        '1b6ebdbca74d03c86a3b90d8c749fbb433d4427bf2f5e38dc976819a61a911015d059995463a3be81661080a28bae8042c24a552c5b5a3ef0efb6acd83df1053'
+        'b5bec9d19a25ae849d0e86e483040b320be9048b55ba002cc83d4ee018e99ff7549ba26a60afe6522c2efe2abb724f2679750e25f8d7c161847ad1babeccf006'
+        'd0b22e3f970f28096a6ea50019d708a568cfca489acc3c5b1bbce78a0b5afc35d43712b5348ab88b643543ce4f627c31a83eacaab293bede55de2eeabfea2238'
+        '1e1c8b1a8d670c7ec1587b13140972d463ba6a442f895e73ba9df45f36c52babe86783180b0d265e4bb93df44ad31ed5c0e9e859d656d253ad086b8fdb784281')
 
 prepare() {
   cd renpy-${pkgver}-source

Modified: renpy-system-fribidi.patch
===================================================================
--- renpy-system-fribidi.patch	2021-01-04 10:49:58 UTC (rev 806929)
+++ renpy-system-fribidi.patch	2021-01-04 11:05:22 UTC (rev 806930)
@@ -1,17 +1,33 @@
-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 @@
+From 9509dff47c44ef321b5133051d949a066310f4bf Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd at gmail.com>
+Date: Mon, 4 Jan 2021 10:46:05 +0100
+Subject: [PATCH] use system fribidi
+
+---
+ module/renpybidicore.c |  4 ----
+ module/setup.py        | 16 ++--------------
+ 2 files changed, 2 insertions(+), 18 deletions(-)
+
+diff --git a/module/renpybidicore.c b/module/renpybidicore.c
+index 18182946b..a85124f28 100644
+--- a/module/renpybidicore.c
++++ b/module/renpybidicore.c
+@@ -1,10 +1,6 @@
  #include <Python.h>
+ 
+-#ifdef RENPY_BUILD
+ #include <fribidi.h>
+-#else
 -#include <fribidi-src/lib/fribidi.h>
-+#include <fribidi.h>
+-#endif
+ 
  #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,19 @@ cython(
+diff --git a/module/setup.py b/module/setup.py
+index e3a3dc784..7b1de7cbc 100755
+--- a/module/setup.py
++++ b/module/setup.py
+@@ -125,29 +125,17 @@ cython(
      sdl + [ png, 'z', 'm' ])
  
  FRIBIDI_SOURCES = """
@@ -31,11 +47,11 @@
  cython(
      "_renpybidi",
      FRIBIDI_SOURCES,
-+    ['fribidi'],
++    ["fribidi"],
      includes=[
 -        BASE + "/fribidi-src/",
 -        BASE + "/fribidi-src/lib/",
-+        "/usr/include/fribidi/"
++        "/usr/include/fribidi/",
          ],
      define_macros=[
          ("FRIBIDI_ENTRY", ""),
@@ -42,7 +58,7 @@
 -        ("HAVE_CONFIG_H", "1"),
          ])
  
--
  cython("_renpysteam", language="c++", compile_if=steam_sdk, libs=["steam_api"])
- 
- # Sound.
+-- 
+2.29.2
+