rpm/dia
SHA256
1
0
Fork 0
forked from pool/dia
Code Pull Requests Activity

Accepting request 211123 from GNOME:Apps

Browse Source 
- 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).

OBS-URL: https://build.opensuse.org/request/show/211123
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dia?expand=0&rev=37
This commit is contained in:
Stephan Kulow 2013-12-17 09:00:59 +00:00 committed by Git OBS Bridge
commit a01f182bdd
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dia-use-recommended-freetype-include.patch Normal file
View File

@ -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 <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

8
dia.changes
View File

@ -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 (bgo#720573).
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 24 19:20:09 UTC 2013 - dimstar@opensuse.org Sat Aug 24 19:20:09 UTC 2013 - dimstar@opensuse.org

3
dia.spec
View File

@ -66,6 +66,8 @@ Patch19: dia-glib-2.31.patch
Patch20: dia-libemf-64bit.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 # 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 Patch21: dia-glib-2.35.patch
# 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 Url: http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang Recommends: %{name}-lang
@ -93,6 +95,7 @@ translation-update-upstream
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
%patch22 -p1
cp $RPM_SOURCE_DIR/font-test*dia . cp $RPM_SOURCE_DIR/font-test*dia .
%build %build