← Back to branch summary

~ubuntu-branches/ubuntu/utopic/inkscape/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/05-freetype-include.patch

  • Committer: Package Import Robot
  • Author(s): Mattia Rizzolo
  • Date: 2014-01-14 15:44:58 UTC
  • mfrom: (2.5.10 sid)
  • Revision ID: package-import@ubuntu.com-20140114154458-3283675h9vtv5ccc
Tags: 0.48.4-3ubuntu1
https://launchpad.net/bugs/1225013
https://launchpad.net/bugs/811634
* Merge from Debian unstable (LP: #1225013).  Remaining changes:
  - debian/control:
    + Set Ubuntu Developer as maintainer,
    + build-depend on dh-translation to handle Ubuntu translation,
    + build against liblcsm2 instead of liblcsm1,
    + demote pstoedit from Recommends to Suggests (because it's on universe),
    + add a ${python:Depends}.
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/patches/series: update.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation,
    + add python2 to dh addon.
* Debian changes:
  - debian/control: make description more user-friendly (LP: #811634)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05-freetype-include.patch
1
 
Description: Use freetype upstream's recommended include.
2
 
Author: Adam Conrad <adconrad@ubuntu.com>
3
 
 
4
 
--- inkscape-0.48.4~/src/libnrtype/FontFactory.h        2011-07-08 12:25:09.000000000 -0600
5
 
+++ inkscape-0.48.4/src/libnrtype/FontFactory.h 2013-12-25 15:20:26.134011106 -0700
6
 
@@ -31,7 +31,8 @@
7
 
 #include <pango/pangowin32.h>
8
 
 #else
9
 
 #include <pango/pangoft2.h>
10
 
-#include <freetype/freetype.h>
11
 
+#include <ft2build.h>
12
 
+#include FT_FREETYPE_H
13
 
 #endif
14
 
 
15
 
 namespace Glib