From 9068da8453af4756cd97998903b9a8e0b4151243 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 7 Dec 2013 01:14:58 -0800 Subject: gimp: Upgrade 2.8.2 -> 2.8.10 Also fix build with freetype 2.5.1 Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-oe/recipes-graphics/gimp/gimp/freetype.patch | 30 +++++++++++++++++++++++ meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb | 26 ++++++++++++++++++++ meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb | 23 ----------------- 3 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 meta-oe/recipes-graphics/gimp/gimp/freetype.patch create mode 100644 meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb delete mode 100644 meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb (limited to 'meta-oe/recipes-graphics/gimp') diff --git a/meta-oe/recipes-graphics/gimp/gimp/freetype.patch b/meta-oe/recipes-graphics/gimp/gimp/freetype.patch new file mode 100644 index 0000000000..ed6c097915 --- /dev/null +++ b/meta-oe/recipes-graphics/gimp/gimp/freetype.patch @@ -0,0 +1,30 @@ +Include the freetype headers via macros ( recommended way) + +Signed-off-by: Khem Raj +Upstream-Status: Backport + +From 6c73f28b6d87a2afd11974552a075bffec52347f Mon Sep 17 00:00:00 2001 +From: Michael Natterer +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 +-#include ++ ++#include ++#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.10.bb new file mode 100644 index 0000000000..c74716842c --- /dev/null +++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." +HOMEPAGE = "http://www.gimp.org" +SECTION = "x11/graphics" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "babl gdk-pixbuf-native libart-lgpl gtk+ jpeg libpng libexif tiff webkit-gtk lcms gegl poppler" + +inherit gnome + +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ + file://freetype.patch \ + " +SRC_URI[md5sum] = "84c964aab7044489af69f7319bb59b47" +SRC_URI[sha256sum] = "e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6" + +EXTRA_OECONF = "--disable-python \ + --without-wmf" + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g +} + +FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug" +FILES_${PN} += "${datadir}/appdata" diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb deleted file mode 100644 index e9bbdcf70a..0000000000 --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." -HOMEPAGE = "http://www.gimp.org" -SECTION = "x11/graphics" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "babl gdk-pixbuf-native libart-lgpl gtk+ jpeg libpng libexif tiff webkit-gtk lcms gegl poppler" - -inherit gnome - -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2" -SRC_URI[md5sum] = "b542138820ca3a41cbd63fc331907955" -SRC_URI[sha256sum] = "0cd1a7e67e132ead810e16e31ff929394c83fcf841e4a295c45d6f3829601ad9" - -EXTRA_OECONF = "--disable-python \ - --without-wmf" - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g -} - -FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug" -- cgit 1.2.3-korg