[packages/mypaint] - fix building with json-c 0.12+ - rel 4

baggins baggins at pld-linux.org
Mon Nov 24 07:33:13 CET 2014


commit 62b09b0042533d87d16a303b695cd174db110e70
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 24 07:32:52 2014 +0100

    - fix building with json-c 0.12+
    - rel 4

 json-c-0.12.patch | 11 +++++++++++
 mypaint.spec      |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/mypaint.spec b/mypaint.spec
index 5d3f76d..ddf059e 100644
--- a/mypaint.spec
+++ b/mypaint.spec
@@ -2,11 +2,12 @@ Summary:	MyPaint is a fast and easy open-source graphics application for digital
 Summary(pl.UTF-8):	Szybka i łatwa w obsłudze aplikacja dla komputerowych malarzy.
 Name:		mypaint
 Version:	1.1.0
-Release:	3
+Release:	4
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://download.gna.org/mypaint/%{name}-%{version}.tar.bz2
 # Source0-md5:	7846a8406259d0fc81c9a2157a2348bf
+Patch0:		json-c-0.12.patch
 URL:		http://mypaint.intilinux.com/
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel
@@ -42,6 +43,7 @@ ukrywania interfejsu użytkownika.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e "
 	# set our cflags
diff --git a/json-c-0.12.patch b/json-c-0.12.patch
new file mode 100644
index 0000000..99751af
--- /dev/null
+++ b/json-c-0.12.patch
@@ -0,0 +1,11 @@
+--- mypaint-1.1.0/brushlib/SConscript~	2014-11-24 07:29:45.000000000 +0100
++++ mypaint-1.1.0/brushlib/SConscript	2014-11-24 07:31:11.602008599 +0100
+@@ -73,7 +73,7 @@
+ 
+ env.Append(CPPPATH='./')
+ 
+-pkg_deps = ['json']
++pkg_deps = ['json-c']
+ libs = ['m']
+ linkflags = []
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mypaint.git/commitdiff/62b09b0042533d87d16a303b695cd174db110e70



More information about the pld-cvs-commit mailing list