From 1f3fdbefb91a4b9f36f41e003f77fb737657678ec8641ef0ecb617d6c8f80206 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Dec 2013 22:30:00 +0000 Subject: [PATCH 1/2] Accepting request 210871 from openSUSE:Factory:Staging:freetype2 Added use-recommended-freetype-include.patch -- needed for freetype2 2.5.1 OBS-URL: https://build.opensuse.org/request/show/210871 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=25 --- dia-use-recommended-freetype-include.patch | 14 ++++++++++++++ dia.changes | 8 ++++++++ dia.spec | 4 ++++ 3 files changed, 26 insertions(+) create mode 100644 dia-use-recommended-freetype-include.patch diff --git a/dia-use-recommended-freetype-include.patch b/dia-use-recommended-freetype-include.patch new file mode 100644 index 0000000..d8f2d0b --- /dev/null +++ b/dia-use-recommended-freetype-include.patch @@ -0,0 +1,14 @@ +--- 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 + #include + /* I'd really rather avoid this */ +-#include +-#include ++#include ++#include FT_GLYPH_H ++#include FT_OUTLINE_H + + #define DPI 300 + diff --git a/dia.changes b/dia.changes index bc68b47..d395b07 100644 --- a/dia.changes +++ b/dia.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 14 18:25:30 UTC 2013 - hrvoje.senjan@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 + ------------------------------------------------------------------- Sat Aug 24 19:20:09 UTC 2013 - dimstar@opensuse.org diff --git a/dia.spec b/dia.spec index 8e82e3e..0137d9c 100644 --- a/dia.spec +++ b/dia.spec @@ -66,6 +66,9 @@ Patch19: dia-glib-2.31.patch Patch20: dia-libemf-64bit.patch # PATCH-FIX-UPSTREAM dia-glib-2.35.patch bgo#694025 bnc#835972 dimstar@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 -- 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 +Patch22: dia-use-recommended-freetype-include.patch Url: http://live.gnome.org/Dia BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang @@ -93,6 +96,7 @@ translation-update-upstream %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 cp $RPM_SOURCE_DIR/font-test*dia . %build From 42709f744d5fb62511d20c3de68b8c20277a4506354d11c8202dbc6539e18c59 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Dec 2013 22:33:51 +0000 Subject: [PATCH 2/2] tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=26 --- dia.changes | 8 ++++---- dia.spec | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dia.changes b/dia.changes index d395b07..d8dcf84 100644 --- a/dia.changes +++ b/dia.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- Sat Dec 14 18:25:30 UTC 2013 - hrvoje.senjan@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 +- 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). ------------------------------------------------------------------- Sat Aug 24 19:20:09 UTC 2013 - dimstar@opensuse.org diff --git a/dia.spec b/dia.spec index 0137d9c..4793898 100644 --- a/dia.spec +++ b/dia.spec @@ -66,8 +66,7 @@ Patch19: dia-glib-2.31.patch Patch20: dia-libemf-64bit.patch # PATCH-FIX-UPSTREAM dia-glib-2.35.patch bgo#694025 bnc#835972 dimstar@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 -- 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 +# PATCH-FIX-UPSTREAM dia-use-recommended-freetype-include.patch bgo#720573 hrvoje.senjan@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