Package: inkscape
Version: 0.48.4-1
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* 05-freetype-include.patch: Use freetype upstream's recommended include.
Freetype's include structure has moved around a bit and, according to
bug #731015, the only supported and stable API for freetype includes is
the one I've employed in this patch. This should be suitable to send
upstream as well.
... Adam
-- System Information:
Debian Release: wheezy/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty'), (500, 'saucy-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-0-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u inkscape-0.48.4/debian/changelog inkscape-0.48.4/debian/changelog
diff -u inkscape-0.48.4/debian/control inkscape-0.48.4/debian/control
--- inkscape-0.48.4/debian/control
+++ inkscape-0.48.4/debian/control
@@ -4,8 +4,7 @@
Vcs-git: git://git.debian.org/git/collab-maint/inkscape.git
Vcs-Browser: http://git.debian.org/?p=git/collab-maint/inkscape.git
Homepage: http://www.inkscape.org/
-Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
-XSBC-Original-Maintainer: Wolfram Quester wo...@sigxcpu.org
+Maintainer: Wolfram Quester wo...@sigxcpu.org
Uploaders: Matteo F. Vescovi mfv.deb...@gmail.com
Build-Depends: autoconf,
automake,
diff -u inkscape-0.48.4/debian/patches/series inkscape-0.48.4/debian/patches/series
--- inkscape-0.48.4/debian/patches/series
+++ inkscape-0.48.4/debian/patches/series
@@ -5,0 +6 @@
+05-freetype-include.patch
only in patch2:
unchanged:
--- inkscape-0.48.4.orig/debian/patches/05-freetype-include.patch
+++ inkscape-0.48.4/debian/patches/05-freetype-include.patch
@@ -0,0 +1,15 @@
+Description: Use freetype upstream's recommended include.
+Author: Adam Conrad adcon...@ubuntu.com
+
+--- inkscape-0.48.4~/src/libnrtype/FontFactory.h 2011-07-08 12:25:09.0 -0600
inkscape-0.48.4/src/libnrtype/FontFactory.h 2013-12-25 15:20:26.134011106 -0700
+@@ -31,7 +31,8 @@
+ #include pango/pangowin32.h
+ #else
+ #include pango/pangoft2.h
+-#include freetype/freetype.h
++#include ft2build.h
++#include FT_FREETYPE_H
+ #endif
+
+ namespace Glib