From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mail.openembedded.org (Postfix) with ESMTP id 07EAA6FF80 for ; Wed, 9 Mar 2016 15:10:48 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP; 09 Mar 2016 07:10:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,311,1455004800"; d="scan'208";a="62869224" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by fmsmga004.fm.intel.com with ESMTP; 09 Mar 2016 07:10:22 -0800 From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Date: Wed, 9 Mar 2016 17:05:43 +0200 Message-Id: <92e3de59f7869fa8e4e010bb844c8a12e488bc33.1457535831.git.alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 27/38] gimp: accept newer versins of babl and gegl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 15:10:49 -0000 Add a patch that makes gimp accept new versions of babl and gegl, taken from Debian. Signed-off-by: Alexander Kanavin --- .../gimp/gimp/bump_Babl-GEGL_versions.patch | 53 ++++++++++++++++++++++ meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch 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 0000000..b71bf32 --- /dev/null +++ b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch @@ -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 +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/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb index 1522fd6..a647911 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 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" -- 2.7.0