diff options
-rw-r--r-- | meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/gimp/gimp/freetype.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb (renamed from meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb) | 13 |
3 files changed, 45 insertions, 36 deletions
diff --git a/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch b/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch new file mode 100644 index 0000000000..fecd0121c3 --- /dev/null +++ b/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch @@ -0,0 +1,38 @@ +From 72ad76841d87e857428693d812a961935284ac62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Thu, 12 Feb 2015 15:57:47 +0100 +Subject: [PATCH] configure-ac: do not check for freetype-config +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +freetype-config is not allowed in our environment - see also binconfig-disabled + +Upstream-Status: inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.ac | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 26812b6..abec714 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -647,13 +647,6 @@ if test "x$fontconfig_ok" = xno; then + fi + + +-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +-if test "x$FREETYPE_CONFIG" != "xno" ; then +- AC_MSG_CHECKING([for freetype libraries]) +- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` +- AC_MSG_RESULT($FREETYPE_LIBS) +-fi +-AC_SUBST(FREETYPE_LIBS) + + + ########################################## +-- +1.9.3 + diff --git a/meta-oe/recipes-graphics/gimp/gimp/freetype.patch b/meta-oe/recipes-graphics/gimp/gimp/freetype.patch deleted file mode 100644 index ed6c097915..0000000000 --- a/meta-oe/recipes-graphics/gimp/gimp/freetype.patch +++ /dev/null @@ -1,30 +0,0 @@ -Include the freetype headers via macros ( recommended way) - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport - -From 6c73f28b6d87a2afd11974552a075bffec52347f Mon Sep 17 00:00:00 2001 -From: Michael Natterer <mitch@gimp.org> -Date: Fri, 29 Nov 2013 20:57:46 +0000 -Subject: Bug 719560 - Build failure with freetype 2.5.1 - -Apply patch from su-v that fixes the freetype include to -the madness devised and recommended by freetype. ---- -diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c -index 4045ca9..66c6e52 100644 ---- a/app/text/gimpfont.c -+++ b/app/text/gimpfont.c -@@ -28,7 +28,9 @@ - - #define PANGO_ENABLE_ENGINE 1 /* Argh */ - #include <pango/pango-ot.h> --#include <freetype/tttables.h> -+ -+#include <ft2build.h> -+#include FT_TRUETYPE_TABLES_H - - #include "text-types.h" - --- -cgit v0.9.2 diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb index a893dc259a..7d52cf18ef 100644 --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb +++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb @@ -7,16 +7,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "babl gdk-pixbuf-native libart-lgpl gtk+ jpeg libpng libexif tiff lcms gegl poppler jasper bzip2" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" -inherit gnome +inherit gnome gtk-doc PACKAGECONFIG ??= "" PACKAGECONFIG[helpbrowser] = "--with-webkit, --without-webkit, webkit-gtk" -SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ - file://freetype.patch \ - " -SRC_URI[md5sum] = "84c964aab7044489af69f7319bb59b47" -SRC_URI[sha256sum] = "e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6" +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 \ +" +SRC_URI[md5sum] = "233c948203383fa078434cc3f8f925cb" +SRC_URI[sha256sum] = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d" EXTRA_OECONF = "--disable-python \ --without-wmf" |