pool/inkscape
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 212063 from GNOME:Apps

Browse Source 
- Add inkscape-use-recommended-freetype-include.patch: Freetype
  upstream recommends using their macros together with ft2build.h
  include. Positive sideeffect is that this patch makes it build
  with both freetype2 2.5.1, and older versions.

OBS-URL: https://build.opensuse.org/request/show/212063
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=70
This commit is contained in:
Stephan Kulow 2013-12-23 21:15:49 +00:00 committed by Git OBS Bridge
parent 199622ee22
commit 03e893808b
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inkscape-use-recommended-freetype-include.patch Normal file
View File

@ -0,0 +1,12 @@
--- src/libnrtype/FontFactory.h.orig 2013-12-08 11:01:49.000000000 +0100
+++ src/libnrtype/FontFactory.h 2013-12-08 11:02:22.000000000 +0100
@@ -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

8
inkscape.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 11 18:18:09 UTC 2013 - hrvoje.senjan@gmail.com
- Add inkscape-use-recommended-freetype-include.patch: Freetype
upstream recommends using their macros together with ft2build.h
include. Positive sideeffect is that this patch makes it build
with both freetype2 2.5.1, and older versions.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 24 10:19:35 UTC 2013 - cgiboudeaux@gmx.com Mon Jun 24 10:19:35 UTC 2013 - cgiboudeaux@gmx.com

3
inkscape.spec
View File

@ -37,6 +37,8 @@ Patch2: inkscape-return-on-exit.patch
Patch4: inkscape-apply-invert-transform.patch Patch4: inkscape-apply-invert-transform.patch
# PATCH-FIX-UPSTREAM inkscape-gcc48-buildfix.patch lp#1095364 nicoduf@yahoo.fr -- Fix build with GCC 4.8. # PATCH-FIX-UPSTREAM inkscape-gcc48-buildfix.patch lp#1095364 nicoduf@yahoo.fr -- Fix build with GCC 4.8.
Patch5: inkscape-gcc48-buildfix.patch Patch5: inkscape-gcc48-buildfix.patch
# PATCH-FIX-UPSTREAM inkscape-use-recommended-freetype-include.patch hrvoje.senjan@gmail.com -- Use freetype recommended include style
Patch6: inkscape-use-recommended-freetype-include.patch
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: docbook-toys BuildRequires: docbook-toys
BuildRequires: fdupes BuildRequires: fdupes
@ -161,6 +163,7 @@ Inkscape is a vector illustration program for the GNOME desktop.
%patch2 -p1 %patch2 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p0 %patch5 -p0
%patch6 -p0
%build %build
RPM_OPT_FLAGS="%{optflags}" RPM_OPT_FLAGS="%{optflags}"