From 8929c6083e2d1c47d6372fd7d7e80f47e2629bfdca45867426f67e24a4d35287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 9 Mar 2018 13:09:48 +0000 Subject: [PATCH] Accepting request 584419 from home:iznogood:branches:graphics - Add gimp-gegl03-buildfix.patch: Port to gegl-03, patch taken from debian. - Following the above port, replace pkgconfig(gegl-0.2) with pkgconfig(gegl-0.3) BuildRequires and add libtool BuildRequires: and pass autoreconf as the above patch touches the buildsystem. OBS-URL: https://build.opensuse.org/request/show/584419 OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=21 --- gimp-gegl03-buildfix.patch | 59 ++++++++++++++++++++++++++++++++++++++ gimp.changes | 9 ++++++ gimp.spec | 7 ++++- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 gimp-gegl03-buildfix.patch diff --git a/gimp-gegl03-buildfix.patch b/gimp-gegl03-buildfix.patch new file mode 100644 index 0000000..9d10040 --- /dev/null +++ b/gimp-gegl03-buildfix.patch @@ -0,0 +1,59 @@ +--- ./app/core/gimpparamspecs-duplicate.c 2016-07-04 10:33:22.449542700 +0200 ++++ ./app/core/gimpparamspecs-duplicate.c 2016-07-04 10:34:54.505304400 +0200 +@@ -67,7 +67,7 @@ + spec->default_value, + pspec->flags); + +- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec)) ++ if (gegl_param_spec_get_property_key(pspec, "multiline")) + { + g_param_spec_set_qdata (new, multiline_quark, + GINT_TO_POINTER (TRUE)); + +diff --git a/app/sanity.c b/app/sanity.c +index febddfb..85fea55 100644 +--- a/app/sanity.c ++++ b/app/sanity.c +@@ -351,7 +351,7 @@ sanity_check_babl (void) + + #define BABL_REQUIRED_MAJOR 0 + #define BABL_REQUIRED_MINOR 1 +-#define BABL_REQUIRED_MICRO 10 ++#define BABL_REQUIRED_MICRO 12 + + babl_get_version (&babl_major_version, + &babl_minor_version, +@@ -388,7 +388,7 @@ sanity_check_gegl (void) + gint gegl_micro_version; + + #define GEGL_REQUIRED_MAJOR 0 +-#define GEGL_REQUIRED_MINOR 2 ++#define GEGL_REQUIRED_MINOR 3 + #define GEGL_REQUIRED_MICRO 0 + + gegl_get_version (&gegl_major_version, +diff --git a/configure.ac b/configure.ac +index 26812b6..4252fe9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,8 +40,8 @@ m4_define([gimp_stable], + m4_define([gimp_full_name], [GNU Image Manipulation Program]) + + # required versions of other packages +-m4_define([babl_required_version], [0.1.10]) +-m4_define([gegl_required_version], [0.2.0]) ++m4_define([babl_required_version], [0.1.12]) ++m4_define([gegl_required_version], [0.3.0]) + m4_define([glib_required_version], [2.30.2]) + m4_define([atk_required_version], [2.2.0]) + m4_define([gtk_required_version], [2.24.10]) +@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR) + ############################### + + PKG_CHECK_MODULES(BABL, babl >= babl_required_version) +-PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version) ++PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) + PKG_CHECK_MODULES(ATK, atk >= atk_required_version) + + AM_PATH_GLIB_2_0(glib_required_version, :, + diff --git a/gimp.changes b/gimp.changes index 836f0e6..f403671 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Mar 8 01:16:27 UTC 2018 - bjorn.lie@gmail.com + +- Add gimp-gegl03-buildfix.patch: Port to gegl-03, patch taken from + debian. +- Following the above port, replace pkgconfig(gegl-0.2) with + pkgconfig(gegl-0.3) BuildRequires and add libtool BuildRequires: + and pass autoreconf as the above patch touches the buildsystem. + ------------------------------------------------------------------- Sun Jan 7 13:50:15 UTC 2018 - zaitor@opensuse.org diff --git a/gimp.spec b/gimp.spec index bf0c30e..0a1bc2b 100644 --- a/gimp.spec +++ b/gimp.spec @@ -31,6 +31,8 @@ Source1: macros.gimp # openSUSE palette file Source2: openSUSE.gpl Source99: baselibs.conf +# PATCH-FIX-UPSTREAM gimp-gegl03-buildfix.patch bjorn.lie@gmail.com -- Port to gegl-03, patch taken from debian +Patch0: gimp-gegl03-buildfix.patch BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.0 @@ -48,6 +50,7 @@ BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: librsvg-devel >= 2.36.0 BuildRequires: libtiff-devel +BuildRequires: libtool BuildRequires: libwmf-devel >= 0.2.8 BuildRequires: libxslt-tools BuildRequires: pkgconfig @@ -60,7 +63,7 @@ BuildRequires: pkgconfig(cairo) >= 1.10.2 BuildRequires: pkgconfig(cairo-pdf) >= 1.10.2 BuildRequires: pkgconfig(dbus-glib-1) >= 0.70 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.24.1 -BuildRequires: pkgconfig(gegl-0.2) >= 0.2.0 +BuildRequires: pkgconfig(gegl-0.3) BuildRequires: pkgconfig(glib-2.0) >= 2.30.2 BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10 BuildRequires: pkgconfig(gudev-1.0) >= 167 @@ -171,6 +174,7 @@ applications that want to make use of the GIMP libraries. %prep %setup -q +%patch0 -p1 translation-update-upstream translation-update-upstream po-libgimp gimp20-libgimp @@ -195,6 +199,7 @@ fi %build export CFLAGS="%{optflags} -fno-strict-aliasing" +autoreconf -fiv %configure \ --disable-static\ %if 0%{?suse_version} >= 1330