[packages/libmypaint] - updated gegl patch (fix gegl .pc dependency, adjust for gegl new iterator API, which is default si

qboosh qboosh at pld-linux.org
Thu Jun 13 21:14:33 CEST 2019 

commit 81e4cf1ac647351e41c096fa0ed68424644dc972
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jun 13 21:15:37 2019 +0200

    - updated gegl patch (fix gegl .pc dependency, adjust for gegl new iterator API, which is default since 0.4.14)
    - package apidocs by default
    - OpenMP support
    - release 3

 libmypaint-gegl.patch | 30 ++++++++++++++++
 libmypaint.spec       | 98 +++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 101 insertions(+), 27 deletions(-)
---
diff --git a/libmypaint.spec b/libmypaint.spec
index eee76f9..91065bc 100644
--- a/libmypaint.spec
+++ b/libmypaint.spec
@@ -1,52 +1,88 @@
-%bcond_with	doc
+#
+# Conditional build:
+%bcond_without	apidocs	# API documentation
+%bcond_without	openmp	# OpenMP support
+
 Summary:	Library for making brush strokes
+Summary(pl.UTF-8):	Biblioteka do wykonywania dotknięć pędzla
 Name:		libmypaint
 Version:	1.3.0
-Release:	2
+Release:	3
 License:	ISC
 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
+URL:		http://mypaint.org/
+BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake
-BuildRequires:	babl-devel
-BuildRequires:	gcc
-BuildRequires:	gegl-devel >= 0.4.0
-BuildRequires:	glib2-devel
-BuildRequires:	gobject-introspection-devel
+BuildRequires:	gcc >= 5:3.2
+BuildRequires:	gegl-devel >= 0.4.14
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	gobject-introspection-devel >= 1.32.0
 BuildRequires:	intltool
+%{?with_openmp:BuildRequires:	libgomp-devel}
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	json-c-devel
-%if %{with doc}
+BuildRequires:	pkgconfig >= 1:0.16
+%if %{with apidocs}
 BuildRequires:	doxygen
 BuildRequires:	python-breathe
-BuildRequires:	sphinx-pdg
+BuildRequires:	sphinx-pdg-2
 %endif
+Requires:	gegl >= 0.4.14
 Conflicts:	mypaint < 1.3.0
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This is a self-contained library containing the MyPaint brush engine.
 
+%description -l pl.UTF-8
+Ten pakiet zawiera samodzielną bibliotekę silnika pędzli MyPaint.
+
 %package devel
 Summary:	Development files for libmypaint
-Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary(pl.UTF-8):	Pliki programistyczne biblioteki libmypaint
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	gegl-devel >= 0.4.14
+Requires:	glib2-devel >= 2.0
+Requires:	json-c-devel
 
 %description devel
 This package contains files needed for development with libmypaint.
 
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki niezbędne do tworzenia oprogramowania
+wykorzystujących bibliotekę libmypaint.
+
+%package apidocs
+Summary:	API documentation for libmypaint library
+Summary(pl.UTF-8):	Dokumentacja API biblioteki libmypaint
+Group:		Documentation
+
+%description apidocs
+API documentation for libmypaint library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libmypaint.
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
-%{__aclocal}
+%{__libtoolize}
+%{__aclocal} -I m4macros
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	%{?with_doc:--enable-docs} \
-	--enable-introspection=yes \
+	%{?with_apidocs:--enable-docs} \
 	--enable-gegl \
+	--enable-introspection \
+	%{?with_openmp:--enable-openmp}
 
 %{__make}
 
@@ -56,36 +92,44 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete -print
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmypaint*.la
 
-rm -r $RPM_BUILD_ROOT%{_localedir}/{es_ES,nn_NO}
+# a copy of es
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/es_ES
+# unify name
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{nn_NO,nn}
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README.md
+%doc COPYING README.md TODO
 %attr(755,root,root) %ghost %{_libdir}/libmypaint-1.3.so.0
 %attr(755,root,root) %{_libdir}/libmypaint-1.3.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmypaint-gegl.so.0
 %attr(755,root,root) %{_libdir}/libmypaint-gegl.so.*.*
-%{_libdir}/girepository-1.0/MyPaint-*.typelib
-%{_libdir}/girepository-1.0/MyPaintGegl-*.typelib
+%{_libdir}/girepository-1.0/MyPaint-1.3.typelib
+%{_libdir}/girepository-1.0/MyPaintGegl-1.3.typelib
 
 %files devel
 %defattr(644,root,root,755)
-%{?with_doc:%doc doc/build/*}
 %attr(755,root,root) %{_libdir}/libmypaint.so
 %attr(755,root,root) %{_libdir}/libmypaint-gegl.so
-%{_includedir}/%{name}
-%{_includedir}/%{name}-gegl
+%{_includedir}/libmypaint
+%{_includedir}/libmypaint-gegl
 %{_pkgconfigdir}/libmypaint.pc
 %{_pkgconfigdir}/libmypaint-gegl.pc
-%{_datadir}/gir-1.0/MyPaint-*.gir
-%{_datadir}/gir-1.0/MyPaintGegl-*.gir
+%{_datadir}/gir-1.0/MyPaint-1.3.gir
+%{_datadir}/gir-1.0/MyPaintGegl-1.3.gir
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/build/{_static,*.html,*.js}
+%endif
diff --git a/libmypaint-gegl.patch b/libmypaint-gegl.patch
index b3bb54a..fb6155e 100644
--- a/libmypaint-gegl.patch
+++ b/libmypaint-gegl.patch
@@ -38,3 +38,33 @@
  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)
+--- libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in.orig	2016-05-17 20:55:34.000000000 +0200
++++ libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in	2019-06-13 20:01:16.545170043 +0200
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libmypaint
+ Description: MyPaint brush engine library, with GEGL integration.
+ Version: @LIBMYPAINT_VERSION@
+-Requires: gegl-0.3 libmypaint
++Requires: gegl-0.4 libmypaint
+ Cflags: -I${includedir}/libmypaint-gegl
+ Libs: -L${libdir} -lmypaint-gegl
+--- libmypaint-1.3.0/gegl/mypaint-gegl-surface.c.orig	2016-06-02 17:43:32.000000000 +0200
++++ libmypaint-1.3.0/gegl/mypaint-gegl-surface.c	2019-06-13 19:04:35.830259962 +0200
+@@ -78,7 +78,7 @@ tile_request_start(MyPaintTiledSurface *
+ 
+     if (buffer_is_native(self)) {
+         GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
+-                                      read_write_flags, GEGL_ABYSS_NONE);
++                                      read_write_flags, GEGL_ABYSS_NONE, 1);
+ 
+         // Read out
+         gboolean completed = gegl_buffer_iterator_next(iterator);
+@@ -88,7 +88,7 @@ tile_request_start(MyPaintTiledSurface *
+             g_critical("Unable to get tile aligned access to GeglBuffer");
+             request->buffer = NULL;
+         } else {
+-            request->buffer = (uint16_t *)(iterator->data[0]);
++            request->buffer = (uint16_t *)(iterator->items[0].data);
+         }
+ 
+         // So we can finish the iterator in tile_request_end()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmypaint.git/commitdiff/81e4cf1ac647351e41c096fa0ed68424644dc972

More information about the pld-cvs-commit mailing list