Patchwork [meta-oe] gimp: Upgrade 2.8.2 -> 2.8.10

login
register
mail settings
Submitter Khem Raj
Date Dec. 7, 2013, 9:14 a.m.
Message ID <1386407698-24915-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/63013/
State Accepted, archived
Headers show

Comments

Khem Raj - Dec. 7, 2013, 9:14 a.m.
Also fix build with freetype 2.5.1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-graphics/gimp/gimp/freetype.patch  |   30 ++++++++++++++++++++
 .../gimp/{gimp_2.8.2.bb => gimp_2.8.10.bb}         |    9 ++++--
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/gimp/gimp/freetype.patch
 rename meta-oe/recipes-graphics/gimp/{gimp_2.8.2.bb => gimp_2.8.10.bb} (68%)
Andreas Müller - Dec. 18, 2013, 9:34 a.m.
On Sat, Dec 7, 2013 at 10:14 AM, Khem Raj <raj.khem@gmail.com> wrote:
> Also fix build with freetype 2.5.1
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta-oe/recipes-graphics/gimp/gimp/freetype.patch  |   30 ++++++++++++++++++++
>  .../gimp/{gimp_2.8.2.bb => gimp_2.8.10.bb}         |    9 ++++--
>  2 files changed, 36 insertions(+), 3 deletions(-)
>  create mode 100644 meta-oe/recipes-graphics/gimp/gimp/freetype.patch
>  rename meta-oe/recipes-graphics/gimp/{gimp_2.8.2.bb => gimp_2.8.10.bb} (68%)
>
> 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 0000000..ed6c097
> --- /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 <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.2.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
> similarity index 68%
> rename from meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
> rename to meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
> index e9bbdcf..c747168 100644
> --- a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
> +++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
> @@ -8,9 +8,11 @@ DEPENDS = "babl gdk-pixbuf-native libart-lgpl gtk+ jpeg libpng libexif tiff webk
>
>  inherit gnome
>
> -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2"
> -SRC_URI[md5sum] = "b542138820ca3a41cbd63fc331907955"
> -SRC_URI[sha256sum] = "0cd1a7e67e132ead810e16e31ff929394c83fcf841e4a295c45d6f3829601ad9"
> +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"
> @@ -21,3 +23,4 @@ do_configure_append() {
>  }
>
>  FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug"
> +FILES_${PN}  += "${datadir}/appdata"
> --
> 1.7.10.4
>
 Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Patch

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 0000000..ed6c097
--- /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 <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.2.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
similarity index 68%
rename from meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
rename to meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
index e9bbdcf..c747168 100644
--- a/meta-oe/recipes-graphics/gimp/gimp_2.8.2.bb
+++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.10.bb
@@ -8,9 +8,11 @@  DEPENDS = "babl gdk-pixbuf-native libart-lgpl gtk+ jpeg libpng libexif tiff webk
 
 inherit gnome
 
-SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2"
-SRC_URI[md5sum] = "b542138820ca3a41cbd63fc331907955"
-SRC_URI[sha256sum] = "0cd1a7e67e132ead810e16e31ff929394c83fcf841e4a295c45d6f3829601ad9"
+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"
@@ -21,3 +23,4 @@  do_configure_append() {
 }
 
 FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug"
+FILES_${PN}  += "${datadir}/appdata"