Hello community, here is the log from the commit of package dia for openSUSE:Factory checked in at 2013-12-17 10:00:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dia (Old) and /work/SRC/openSUSE:Factory/.dia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dia" Changes: -------- --- /work/SRC/openSUSE:Factory/dia/dia.changes 2013-08-27 20:40:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dia.new/dia.changes 2013-12-17 10:01:00.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Dec 14 18:25:30 UTC 2013 - hrvoje.sen...@gmail.com + +- Added dia-use-recommended-freetype-include.patch: Freetype + upstream recommends using their macros together with ft2build + include. Positive sideeffect is that this patch makes it build + with both freetype2 2.5.1, and older versions (bgo#720573). + +------------------------------------------------------------------- New: ---- dia-use-recommended-freetype-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.tlQeFR/_old 2013-12-17 10:01:01.000000000 +0100 +++ /var/tmp/diff_new_pack.tlQeFR/_new 2013-12-17 10:01:01.000000000 +0100 @@ -66,6 +66,8 @@ Patch20: dia-libemf-64bit.patch # PATCH-FIX-UPSTREAM dia-glib-2.35.patch bgo#694025 bnc#835972 dims...@opensuse.org -- GLib drop support for adding interfaces after class_init, taken from git Patch21: dia-glib-2.35.patch +# PATCH-FIX-UPSTREAM dia-use-recommended-freetype-include.patch bgo#720573 hrvoje.sen...@gmail.com -- Freetype upstream recommends using their macros together with ft2build include. Fix build with old and new freetype versions +Patch22: dia-use-recommended-freetype-include.patch Url: http://live.gnome.org/Dia BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang @@ -93,6 +95,7 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 cp $RPM_SOURCE_DIR/font-test*dia . %build ++++++ dia-use-recommended-freetype-include.patch ++++++ --- a/plug-ins/postscript/diapsft2renderer.c 2009-11-07 11:13:53.000000000 -0600 +++ b/plug-ins/postscript/diapsft2renderer.c 2013-12-02 18:49:27.000000000 -0600 @@ -29,8 +29,9 @@ #include <pango/pangoft2.h> #include <pango/pango-engine.h> /* I'd really rather avoid this */ -#include <freetype/ftglyph.h> -#include <freetype/ftoutln.h> +#include <ft2build.h> +#include FT_GLYPH_H +#include FT_OUTLINE_H #define DPI 300 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
