diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch | 34 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb (renamed from import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.20.bb) | 15 |
2 files changed, 41 insertions, 8 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch new file mode 100644 index 000000000..7da78e205 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch @@ -0,0 +1,34 @@ +From e1c8f4b8323e3965271a93529eab5774c1a7083c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Jun 2017 10:32:14 -0700 +Subject: [PATCH 3/3] Fix use of gegl API + +newer version of gegl does not define GEGL_IS_PARAM_SPEC_MULTILINE + +| core/libappcore.a(gimpparamspecs-duplicate.o): In function `gimp_param_spec_duplicate': +| /usr/src/debug/gimp/2.8.22-r0/gimp-2.8.22/app/core/../../../../../../../../../workspace/sources/gimp/app/core/gimpparamspecs-duplicate.c:70: undefined reference to `GEGL_IS_PARAM_SPEC_MULTILINE' +| collect2: error: ld returned 1 exit status + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + app/core/gimpparamspecs-duplicate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c +index c0b7426..2efaf23 100644 +--- a/app/core/gimpparamspecs-duplicate.c ++++ b/app/core/gimpparamspecs-duplicate.c +@@ -67,7 +67,7 @@ gimp_param_spec_duplicate (GParamSpec *pspec) + 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)); +-- +2.13.2 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.20.bb b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb index 9588ab016..cd7e27a19 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.20.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb @@ -11,7 +11,6 @@ DEPENDS = " \ gtk+ \ babl \ gegl \ - libart-lgpl \ jpeg \ libpng \ libexif \ @@ -27,13 +26,13 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', inherit gnome gtk-doc -SRC_URI = " \ - http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ - file://0001-configure-ac-do-not-check-for-freetype-config.patch \ - file://bump_Babl-GEGL_versions.patch \ -" -SRC_URI[md5sum] = "d405640c426b234d6efc36fb4f5bae57" -SRC_URI[sha256sum] = "939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805" +SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ + file://0001-configure-ac-do-not-check-for-freetype-config.patch \ + file://bump_Babl-GEGL_versions.patch \ + file://0003-Fix-use-of-gegl-API.patch \ + " +SRC_URI[md5sum] = "7e4fd7a53b1d3c32dff642ab1a94b44d" +SRC_URI[sha256sum] = "9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a" EXTRA_OECONF = "--disable-python \ --without-webkit \ |