From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 14 Jun 2015 06:11:08 +0000 (+0200)
Subject: - added ft2demos-includes patch (reorder ft2demos includes to use new headers when... 
X-Git-Tag: auto/th/freetype-2.6.1-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreetype.git;a=commitdiff_plain;h=c2b39a7504d1f8fbe1b6506ff0b5e4a15323ecfc

- added ft2demos-includes patch (reorder ft2demos includes to use new headers when building demos)
---

diff --git a/freetype.spec b/freetype.spec
index 860ef8e..92878b9 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,5 +1,3 @@
-# TODO:
-# - demos seem to use installed headers instead of these coming from new tarball (therefore buildconflicts)
 #
 # Conditional build:
 %bcond_without	lcd		# without LCD subpixel color filtering (Microsoft patents in USA)
@@ -27,6 +25,7 @@ Source1:	http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{versio
 Source2:	http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
 # Source2-md5:	c6c209b37f10621d6ff100620b8292b4
 Patch0:		%{name}-2.2.1-enable-valid.patch
+Patch1:		ft2demos-includes.patch
 URL:		http://www.freetype.org/
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
@@ -42,7 +41,6 @@ BuildRequires:	sed >= 4.0
 %{?with_x11:BuildRequires:	xorg-lib-libX11-devel}
 %endif
 BuildRequires:	zlib-devel
-BuildConflicts:	%{name}-devel < %{version}
 Obsoletes:	freetype2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -200,6 +198,7 @@ Programy demonstracyjne do biblioteki FreeType.
 %prep
 %setup -q -a1 -a2
 %patch0 -p1
+%patch1 -p1
 
 # avoid propagating -L%{_libdir} through *.la
 %{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure
diff --git a/ft2demos-includes.patch b/ft2demos-includes.patch
new file mode 100644
index 0000000..b2603d8
--- /dev/null
+++ b/ft2demos-includes.patch
@@ -0,0 +1,14 @@
+--- freetype-2.6/ft2demos-2.6/Makefile.orig	2015-06-07 09:34:19.000000000 +0200
++++ freetype-2.6/ft2demos-2.6/Makefile	2015-06-14 08:06:29.912090987 +0200
+@@ -127,9 +127,9 @@
+                  $(TOP_DIR)/include \
+                  $(SRC_DIR)
+ 
+-  COMPILE = $(CC) $(CPPFLAGS) \
++  COMPILE = $(CC) $(INCLUDES:%=$I%) \
++                  $(CPPFLAGS) \
+                   $(CFLAGS) \
+-                  $(INCLUDES:%=$I%) \
+                   $DFT_CONFIG_MODULES_H="<ftmodule.h>"
+ 
+   FTLIB := $(LIB_DIR)/$(LIBRARY).$A