diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-06-30 05:59:47 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-14 23:43:21 +0200 |
commit | 49bb63d5b35b3e156a66727ebb0e696ef8d4fec5 (patch) | |
tree | c77db96087809b44b26e424372eff3afe463ee2a /meta-oe/recipes-graphics | |
parent | 598ec9e4c410adc22ee717d669d24988e45b5cd7 (diff) | |
download | meta-openembedded-49bb63d5b35b3e156a66727ebb0e696ef8d4fec5.tar.gz |
gimp: Upgrade to 2.8.22
Fix API issue due to new gegl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch | 34 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb (renamed from meta-oe/recipes-graphics/gimp/gimp_2.8.20.bb) | 14 |
2 files changed, 41 insertions, 7 deletions
diff --git a/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch b/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch new file mode 100644 index 000000000..7da78e205 --- /dev/null +++ b/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From e1c8f4b8323e3965271a93529eab5774c1a7083c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 29 Jun 2017 10:32:14 -0700 | ||
4 | Subject: [PATCH 3/3] Fix use of gegl API | ||
5 | |||
6 | newer version of gegl does not define GEGL_IS_PARAM_SPEC_MULTILINE | ||
7 | |||
8 | | core/libappcore.a(gimpparamspecs-duplicate.o): In function `gimp_param_spec_duplicate': | ||
9 | | /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' | ||
10 | | collect2: error: ld returned 1 exit status | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | app/core/gimpparamspecs-duplicate.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c | ||
20 | index c0b7426..2efaf23 100644 | ||
21 | --- a/app/core/gimpparamspecs-duplicate.c | ||
22 | +++ b/app/core/gimpparamspecs-duplicate.c | ||
23 | @@ -67,7 +67,7 @@ gimp_param_spec_duplicate (GParamSpec *pspec) | ||
24 | spec->default_value, | ||
25 | pspec->flags); | ||
26 | |||
27 | - if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec)) | ||
28 | + if (gegl_param_spec_get_property_key(pspec, "multiline")) | ||
29 | { | ||
30 | g_param_spec_set_qdata (new, multiline_quark, | ||
31 | GINT_TO_POINTER (TRUE)); | ||
32 | -- | ||
33 | 2.13.2 | ||
34 | |||
diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.20.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb index 9588ab016..1ecd2b715 100644 --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.20.bb +++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | |||
@@ -27,13 +27,13 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', | |||
27 | 27 | ||
28 | inherit gnome gtk-doc | 28 | inherit gnome gtk-doc |
29 | 29 | ||
30 | SRC_URI = " \ | 30 | SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ |
31 | http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ | 31 | file://0001-configure-ac-do-not-check-for-freetype-config.patch \ |
32 | file://0001-configure-ac-do-not-check-for-freetype-config.patch \ | 32 | file://bump_Babl-GEGL_versions.patch \ |
33 | file://bump_Babl-GEGL_versions.patch \ | 33 | file://0003-Fix-use-of-gegl-API.patch \ |
34 | " | 34 | " |
35 | SRC_URI[md5sum] = "d405640c426b234d6efc36fb4f5bae57" | 35 | SRC_URI[md5sum] = "7e4fd7a53b1d3c32dff642ab1a94b44d" |
36 | SRC_URI[sha256sum] = "939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805" | 36 | SRC_URI[sha256sum] = "9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a" |
37 | 37 | ||
38 | EXTRA_OECONF = "--disable-python \ | 38 | EXTRA_OECONF = "--disable-python \ |
39 | --without-webkit \ | 39 | --without-webkit \ |