mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

gimp: accept newer versins of babl and gegl

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2016-02-22 20:09:16 +02:00
committed by Martin Jansa
parent 465f6c4913
commit bbc895b6ea
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
+53
View File
@@ -0,0 +1,53 @@
Bump acceptable versions of babl and gegl.
Patch is taken from debian:
https://packages.debian.org/stretch/gimp
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
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, :,
meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
+1
View File
@@ -12,6 +12,7 @@ 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] = "233c948203383fa078434cc3f8f925cb"
SRC_URI[sha256sum] = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d"