Control: tag -1 upstream patch

Julien Cristau <jcris...@debian.org> (2013-12-12):
> Source: gimp
> Version: 2.8.6-1
> Severity: serious
> Justification: fails to build from source (but built successfully in the past)
> Control: block 717923 with -1
> 
> Hi,
> 
> gimp fails to build from source against freetype 2.5.1:
> > gcc -DHAVE_CONFIG_H -I. -I/«PKGBUILDDIR»/./app/text -I../.. -I../.. 
> > -I/«PKGBUILDDIR»/. -I../../app -I/«PKGBUILDDIR»/./app -pthread 
> > -I/usr/include/gegl-0.2 -I/usr/include/babl-0.1 -I/usr/include/glib-2.0 
> > -I/usr/lib/x86_64-linux-gnu/glib-2.0/include   -pthread 
> > -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 
> > -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 
> > -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libdrm 
> > -I/usr/include/harfbuzz   -pthread -I/usr/include/gdk-pixbuf-2.0 
> > -I/usr/include/libpng12 -I/usr/include/glib-2.0 
> > -I/usr/lib/x86_64-linux-gnu/glib-2.0/include   -I/usr/include 
> > -DG_LOG_DOMAIN=\"Gimp-Text\" -D_FORTIFY_SOURCE=2 -DGIMP_DISABLE_DEPRECATED 
> > -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGDK_DISABLE_DEPRECATED 
> > -DGTK_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE  -g -O2 
> > -fstack-protector --param=ssp-buffer-size=4 -Wformat 
> > -Werror=format-security -Wall -Wdeclaration-after-statement 
> > -Wmissing-prototypes -Werror=missing-prototypes -Wstrict-prototypes 
> > -Wmissing-declarations -Winit-self -Wpointer-arith -Wold-style-definition 
> > -Wmissing-format-attribute -Wformat-security  -fno-common 
> > -fdiagnostics-show-option   -c /«PKGBUILDDIR»/./app/text/gimpfont.c
> > /«PKGBUILDDIR»/./app/text/gimpfont.c:30:31: fatal error: 
> > freetype/tttables.h: No such file or directory
> >  #include <freetype/tttables.h>
> >                                ^
> > compilation terminated.
> > make[5]: *** [gimpfont.o] Error 1
> 
> freetype changed its header location, you should include
> FT_TRUETYPE_TABLES_H instead of <freetype/tttables.h>.

Commit available upstream:
  
https://git.gnome.org/browse/gimp/commit/?id=6c73f28b6d87a2afd11974552a075bffec52347f

And attached to this mail.

Confirmed locally in a devel chroot, can NMU if that helps.

Mraw,
KiBi.
From 6c73f28b6d87a2afd11974552a075bffec52347f Mon Sep 17 00:00:00 2001
From: Michael Natterer <mi...@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

Attachment: signature.asc
Description: Digital signature

Reply via email to