[arch-commits] Commit in mypaint/trunk (PKGBUILD json-c.patch)

[Jan Steffens]

    Date: Sunday, April 26, 2020 @ 00:27:13
  Author: heftig
Revision: 621250

1.2.1-12

Added:
  mypaint/trunk/json-c.patch
Modified:
  mypaint/trunk/PKGBUILD

--------------+
 PKGBUILD     |    8 +++++++-
 json-c.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-26 00:26:39 UTC (rev 621249)
+++ PKGBUILD	2020-04-26 00:27:13 UTC (rev 621250)
@@ -4,7 +4,7 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=11
+pkgrel=12
 pkgdesc="Fast and easy painting application for digital painters, with brush dynamics"
 arch=('x86_64')
 url="http://mypaint.org/"
@@ -14,6 +14,7 @@
 # requires mypaint 2.0 with libmypaint 2.0 to work dynamically
 options=('!emptydirs')
 source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
+        json-c.patch
         fix-wayland.patch
         0001-Fix-AppStream-metadata-validation.patch
         scons-python3.patch
@@ -21,6 +22,7 @@
 validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
 sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
             'SKIP'
+            'cdb78e8f592bdb1862c57edbb0e287b23512203e33e398f1471d6dea3f47f772'
             '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b'
             '5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b'
             'f2f99e7d0db538eb2c9c084077e7c8ceb480911318b3c0fbf23cf9cc37bfc893'
@@ -28,6 +30,10 @@
 
 prepare() {
   cd $pkgname-$pkgver
+
+  # Fix building with json-c 0.14
+  patch -Np1 -i ../json-c.patch
+
   # Fix run under wayland
   # https://github.com/mypaint/mypaint/issues/791
   patch -Np1 -i ../fix-wayland.patch

Added: json-c.patch
===================================================================
--- json-c.patch	                        (rev 0)
+++ json-c.patch	2020-04-26 00:27:13 UTC (rev 621250)
@@ -0,0 +1,13 @@
+diff -u -r mypaint-1.2.1/brushlib/mypaint-brush.c mypaint-1.2.1-json-c/brushlib/mypaint-brush.c
+--- mypaint-1.2.1/brushlib/mypaint-brush.c	2017-01-21 17:51:52.000000000 +0000
++++ mypaint-1.2.1-json-c/brushlib/mypaint-brush.c	2020-04-26 00:23:04.098737838 +0000
+@@ -28,9 +28,6 @@
+ #include "rng-double.h"
+ 
+ #ifdef HAVE_JSON_C
+-// Allow the C99 define from json.h
+-#undef TRUE
+-#undef FALSE
+ #include <json.h>
+ #endif // HAVE_JSON_C
+