Hello community,
here is the log from the commit of package inkscape for openSUSE:Factory
checked in at 2013-12-23 22:15:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/inkscape (Old)
and /work/SRC/openSUSE:Factory/.inkscape.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape"
Changes:
--------
--- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2013-06-25
07:25:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2013-12-23
22:15:50.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec 11 18:18:09 UTC 2013 - hrvoje.sen...@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.
+
+-------------------------------------------------------------------
New:
----
inkscape-use-recommended-freetype-include.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ inkscape.spec ++++++
--- /var/tmp/diff_new_pack.9ss7BI/_old 2013-12-23 22:15:51.000000000 +0100
+++ /var/tmp/diff_new_pack.9ss7BI/_new 2013-12-23 22:15:51.000000000 +0100
@@ -37,6 +37,8 @@
Patch4: inkscape-apply-invert-transform.patch
# PATCH-FIX-UPSTREAM inkscape-gcc48-buildfix.patch lp#1095364 nico...@yahoo.fr
-- Fix build with GCC 4.8.
Patch5: inkscape-gcc48-buildfix.patch
+# PATCH-FIX-UPSTREAM inkscape-use-recommended-freetype-include.patch
hrvoje.sen...@gmail.com -- Use freetype recommended include style
+Patch6: inkscape-use-recommended-freetype-include.patch
BuildRequires: boost-devel
BuildRequires: docbook-toys
BuildRequires: fdupes
@@ -161,6 +163,7 @@
%patch2 -p1
%patch4 -p1
%patch5 -p0
+%patch6 -p0
%build
RPM_OPT_FLAGS="%{optflags}"
++++++ inkscape-use-recommended-freetype-include.patch ++++++
--- 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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
