[packages/libmypaint] - use gegl 0.4

arekm arekm at pld-linux.org
Sun Apr 29 14:13:23 CEST 2018


commit 3e91b2def33b5c335de21f62bcde7af28c4297ef
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Apr 29 14:13:16 2018 +0200

    - use gegl 0.4

 libmypaint-gegl.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 libmypaint.spec       | 11 +++++++++--
 2 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/libmypaint.spec b/libmypaint.spec
index 0987a0b..66f5d5d 100644
--- a/libmypaint.spec
+++ b/libmypaint.spec
@@ -8,9 +8,12 @@ Group:		Libraries
 URL:		https://github.com/mypaint/libmypaint
 Source0:	https://github.com/mypaint/libmypaint/releases/download/v%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	2e7200c7873514dfca26eea9e3d273f5
+Patch0:		%{name}-gegl.patch
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	babl-devel
 BuildRequires:	gcc
-BuildRequires:	gegl-devel >= 0.3.0
+BuildRequires:	gegl-devel >= 0.4.0
 BuildRequires:	glib2-devel
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	intltool
@@ -34,8 +37,12 @@ This package contains files needed for development with libmypaint.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
 	%{?with_doc:--enable-docs} \
 	--enable-introspection=yes \
@@ -51,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete -print
 
-rm -r $RPM_BUILD_ROOT/usr/share/locale/{es_ES,nn_NO}
+rm -r $RPM_BUILD_ROOT%{_localedir}/{es_ES,nn_NO}
 
 %find_lang %{name}
 
diff --git a/libmypaint-gegl.patch b/libmypaint-gegl.patch
new file mode 100644
index 0000000..b3bb54a
--- /dev/null
+++ b/libmypaint-gegl.patch
@@ -0,0 +1,40 @@
+--- libmypaint-1.3.0/configure.ac~	2016-12-01 23:47:49.000000000 +0100
++++ libmypaint-1.3.0/configure.ac	2018-04-29 14:07:21.040693575 +0200
+@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full],
+           [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
+ 
+ # Dependencies.
+-m4_define([gegl_required_version], [0.3])
++m4_define([gegl_required_version], [0.4])
+ m4_define([introspection_required_version], [1.32.0])
+ 
+ AC_INIT([libmypaint],
+@@ -312,7 +312,7 @@ AC_ARG_ENABLE(gegl,
+ )
+ 
+ if eval "test x$enable_gegl = xyes"; then
+-  PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
++  PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
+ fi
+ AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
+ 
+--- libmypaint-1.3.0/gegl/Makefile.am~	2016-11-29 04:49:30.000000000 +0100
++++ libmypaint-1.3.0/gegl/Makefile.am	2018-04-29 14:12:02.935879430 +0200
+@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = \
+     --warn-all \
+-    --pkg="gegl-0.3" \
++    --pkg="gegl-0.4" \
+     --pkg="glib-2.0" \
+     --namespace="MyPaintGegl" \
+     --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
+@@ -38,7 +38,7 @@ introspection_sources = \
+ 	mypaint-gegl-surface.c
+ 
+ MyPaintGegl- at LIBMYPAINT_MAJOR_VERSION@. at LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
+-MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
++MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
+ MyPaintGegl_ at LIBMYPAINT_MAJOR_VERSION@_ at LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmypaint.git/commitdiff/3e91b2def33b5c335de21f62bcde7af28c4297ef



More information about the pld-cvs-commit mailing list