summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-02-22 20:09:16 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-14 12:15:33 +0100
commitbbc895b6eaf270c7d25da71362d12f8e543bec46 (patch)
tree6cc0aceec6eb8c769fa774d87a50bd4987750459 /meta-oe
parent465f6c491316dc1f3ce0adf5785f13d84acb3844 (diff)
downloadmeta-openembedded-bbc895b6eaf270c7d25da71362d12f8e543bec46.tar.gz
gimp: accept newer versins of babl and gegl
Add a patch that makes gimp accept new versions of babl and gegl, taken from Debian. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch53
-rw-r--r--meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb1
2 files changed, 54 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
new file mode 100644
index 000000000..b71bf329e
--- /dev/null
+++ b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
@@ -0,0 +1,53 @@
1Bump acceptable versions of babl and gegl.
2
3Patch is taken from debian:
4https://packages.debian.org/stretch/gimp
5
6Upstream-Status: Inappropriate [OE specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8diff --git a/app/sanity.c b/app/sanity.c
9index febddfb..85fea55 100644
10--- a/app/sanity.c
11+++ b/app/sanity.c
12@@ -351,7 +351,7 @@ sanity_check_babl (void)
13
14 #define BABL_REQUIRED_MAJOR 0
15 #define BABL_REQUIRED_MINOR 1
16-#define BABL_REQUIRED_MICRO 10
17+#define BABL_REQUIRED_MICRO 12
18
19 babl_get_version (&babl_major_version,
20 &babl_minor_version,
21@@ -388,7 +388,7 @@ sanity_check_gegl (void)
22 gint gegl_micro_version;
23
24 #define GEGL_REQUIRED_MAJOR 0
25-#define GEGL_REQUIRED_MINOR 2
26+#define GEGL_REQUIRED_MINOR 3
27 #define GEGL_REQUIRED_MICRO 0
28
29 gegl_get_version (&gegl_major_version,
30diff --git a/configure.ac b/configure.ac
31index 26812b6..4252fe9 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -40,8 +40,8 @@ m4_define([gimp_stable],
35 m4_define([gimp_full_name], [GNU Image Manipulation Program])
36
37 # required versions of other packages
38-m4_define([babl_required_version], [0.1.10])
39-m4_define([gegl_required_version], [0.2.0])
40+m4_define([babl_required_version], [0.1.12])
41+m4_define([gegl_required_version], [0.3.0])
42 m4_define([glib_required_version], [2.30.2])
43 m4_define([atk_required_version], [2.2.0])
44 m4_define([gtk_required_version], [2.24.10])
45@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
46 ###############################
47
48 PKG_CHECK_MODULES(BABL, babl >= babl_required_version)
49-PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version)
50+PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
51 PKG_CHECK_MODULES(ATK, atk >= atk_required_version)
52
53 AM_PATH_GLIB_2_0(glib_required_version, :,
diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
index 1522fd667..a64791179 100644
--- a/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
+++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
@@ -12,6 +12,7 @@ inherit gnome gtk-doc
12SRC_URI = " \ 12SRC_URI = " \
13 http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ 13 http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \
14 file://0001-configure-ac-do-not-check-for-freetype-config.patch \ 14 file://0001-configure-ac-do-not-check-for-freetype-config.patch \
15 file://bump_Babl-GEGL_versions.patch \
15" 16"
16SRC_URI[md5sum] = "233c948203383fa078434cc3f8f925cb" 17SRC_URI[md5sum] = "233c948203383fa078434cc3f8f925cb"
17SRC_URI[sha256sum] = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d" 18SRC_URI[sha256sum] = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d"