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

Accepting request 210871 from openSUSE:Factory:Staging:freetype2

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2013-12-16 22:30:00 +00:00 committed by Git OBS Bridge
parent f58bfafefa
commit 1f3fdbefb9
3 changed files with 26 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
-------------------------------------------------------------------
Sat Aug 24 19:20:09 UTC 2013 - dimstar@opensuse.org

4
dia.spec
View File

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