From 109a1bc051ca0e70375c6c54d8fa13d5e2d3e154 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 9 Mar 2020 17:17:18 +0100 Subject: [PATCH] - updated to 1.5.1 (note: new soname) - removed obsolete gegl patch --- libmypaint-gegl.patch | 70 ------------------------------------------- libmypaint.spec | 25 +++++++--------- 2 files changed, 11 insertions(+), 84 deletions(-) delete mode 100644 libmypaint-gegl.patch diff --git a/libmypaint-gegl.patch b/libmypaint-gegl.patch deleted file mode 100644 index fb6155e..0000000 --- a/libmypaint-gegl.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- 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-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile --MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3 -+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I.. - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@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() diff --git a/libmypaint.spec b/libmypaint.spec index 91065bc..e464218 100644 --- a/libmypaint.spec +++ b/libmypaint.spec @@ -6,13 +6,13 @@ Summary: Library for making brush strokes Summary(pl.UTF-8): Biblioteka do wykonywania dotknięć pędzla Name: libmypaint -Version: 1.3.0 -Release: 3 +Version: 1.5.1 +Release: 1 License: ISC Group: Libraries +#Source0Download: https://github.com/mypaint/libmypaint/releases Source0: https://github.com/mypaint/libmypaint/releases/download/v%{version}/%{name}-%{version}.tar.xz -# Source0-md5: 2e7200c7873514dfca26eea9e3d273f5 -Patch0: %{name}-gegl.patch +# Source0-md5: 60334e7449ea05674714b1c7098b5383 URL: http://mypaint.org/ BuildRequires: autoconf >= 2.62 BuildRequires: automake @@ -70,7 +70,6 @@ Dokumentacja API biblioteki libmypaint. %prep %setup -q -%patch0 -p1 %build %{__libtoolize} @@ -94,8 +93,6 @@ rm -rf $RPM_BUILD_ROOT %{__rm} $RPM_BUILD_ROOT%{_libdir}/libmypaint*.la -# a copy of es -%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/es_ES # unify name %{__mv} $RPM_BUILD_ROOT%{_localedir}/{nn_NO,nn} @@ -110,12 +107,12 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) %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-1.5.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libmypaint-1.5.so.1 %attr(755,root,root) %{_libdir}/libmypaint-gegl.so.*.* -%{_libdir}/girepository-1.0/MyPaint-1.3.typelib -%{_libdir}/girepository-1.0/MyPaintGegl-1.3.typelib +%attr(755,root,root) %ghost %{_libdir}/libmypaint-gegl.so.0 +%{_libdir}/girepository-1.0/MyPaint-1.5.typelib +%{_libdir}/girepository-1.0/MyPaintGegl-1.5.typelib %files devel %defattr(644,root,root,755) @@ -125,8 +122,8 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libmypaint-gegl %{_pkgconfigdir}/libmypaint.pc %{_pkgconfigdir}/libmypaint-gegl.pc -%{_datadir}/gir-1.0/MyPaint-1.3.gir -%{_datadir}/gir-1.0/MyPaintGegl-1.3.gir +%{_datadir}/gir-1.0/MyPaint-1.5.gir +%{_datadir}/gir-1.0/MyPaintGegl-1.5.gir %if %{with apidocs} %files apidocs -- 2.44.0