[dia] make it build with freetype >= 2.5.1
Jiří Popelka
jpopelka at fedoraproject.org
Tue Feb 11 19:02:49 UTC 2014
commit 91a410c2507e83f1263a3615b7af8579aa491a97
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Tue Feb 11 19:57:54 2014 +0100
make it build with freetype >= 2.5.1
https://lists.fedoraproject.org/pipermail/devel-announce/2014-January/001288.html
dia-freetype.patch | 14 ++++++++++++++
dia.spec | 10 ++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/dia-freetype.patch b/dia-freetype.patch
new file mode 100644
index 0000000..28ce7ef
--- /dev/null
+++ b/dia-freetype.patch
@@ -0,0 +1,14 @@
+diff -up dia-0.97.2/plug-ins/postscript/diapsft2renderer.c.freetype dia-0.97.2/plug-ins/postscript/diapsft2renderer.c
+--- dia-0.97.2/plug-ins/postscript/diapsft2renderer.c.freetype 2009-11-07 18:13:53.000000000 +0100
++++ dia-0.97.2/plug-ins/postscript/diapsft2renderer.c 2014-02-11 19:53:39.812657853 +0100
+@@ -29,8 +29,8 @@
+ #include <pango/pangoft2.h>
+ #include <pango/pango-engine.h>
+ /* I'd really rather avoid this */
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <freetype2/ftglyph.h>
++#include <freetype2/ftoutln.h>
+
+ #define DPI 300
+
diff --git a/dia.spec b/dia.spec
index 864fa61..279daa1 100644
--- a/dia.spec
+++ b/dia.spec
@@ -1,6 +1,6 @@
Name: dia
Version: 0.97.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 1
Summary: Diagram drawing program
License: GPLv2+
@@ -10,10 +10,12 @@ Patch0: dia-noglib.patch
Patch1: dia-unregister-import.patch
Patch2: dia-glib.patch
Patch3: dia-lang-sr-latin.patch
+Patch4: dia-freetype.patch
-BuildRequires: gtk2-devel libxml2-devel libart_lgpl-devel desktop-file-utils
+BuildRequires: gtk2-devel freetype-devel libxml2-devel libart_lgpl-devel
BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl
BuildRequires: gettext
+BuildRequires: desktop-file-utils
BuildRequires: rarian-compat
# autoreconf
BuildRequires: autoconf automake libtool
@@ -33,6 +35,7 @@ and can export to PostScript(TM).
%patch1 -p1 -b .unregister-import
%patch2 -p1 -b .glib
%patch3 -p1 -b .lang-sr-latin
+%patch4 -p1 -b .freetype
sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 --libs)|' \
lib/Makefile.*
@@ -104,6 +107,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Tue Feb 11 2014 Jiri Popelka <jpopelka at redhat.com> - 1:0.97.2-10
+- make it build with freetype >= 2.5.1
+
* Tue Feb 11 2014 Jiri Popelka <jpopelka at redhat.com> - 1:0.97.2-9
- desktop file runs dia in single window mode (--integrated) (#910275)
- update URL
More information about the scm-commits
mailing list