Add a patch to find >=freetype-2.5.1

4 files changed, 71 insertions, 11 deletions

diff --git a/dev-qt/qt-meta/ChangeLog b/dev-qt/qt-meta/ChangeLog
index 533c2736..d844ab69 100644
--- a/dev-qt/qt-meta/ChangeLog
+++ b/dev-qt/qt-meta/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-qt/qt-meta
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.586 2009/08/02 21:54:28 tommy Exp $
 
+  30 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> qt-meta-3.3.8b-r2.ebuild,
+  +files/qt-3.3.8b-freetype251.patch:
+  Add a patch to find >=freetype-2.5.1
+
   05 Jun 2013; Lars Wendler <polynomial-c@gentoo.org> qt-meta-3.3.8b-r1.ebuild,
   qt-meta-3.3.8b-r2.ebuild:
   Fixed SRC_URI and HOMEPAGE.
diff --git a/dev-qt/qt-meta/Manifest b/dev-qt/qt-meta/Manifest
index 1005b252..a2380455 100644
--- a/dev-qt/qt-meta/Manifest
+++ b/dev-qt/qt-meta/Manifest
@@ -13,10 +13,11 @@ AUX qt-3.3.8-uic-fix.patch 711 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a5
 AUX qt-3.3.8-visibility.patch 5554 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 SHA512 8257e29311fb890e3c3fe192bc2032c45e1449acc219884ec7da50577ff87ae67a87a3f51dd013c4547b007ccf010a65c8fcf8794c7e11e91a027cc8c48dc5cd WHIRLPOOL 4212dda16e4fd5f6eac078ce0803255f07abd2c6f7109e65e935a81a8051e4246aac71c3548d318b628db75e1f7e4d1d0853f5cf4ad80a0aa749547b7169c71c
 AUX qt-3.3.8b-cjk-fix.patch 1191 SHA256 94369e7cca8531ed89370480c2d5f3a0e99dbb49640df715ef33711b9d1cae4b SHA512 3f09a4463e6f2cdf0b000806717abd54ced3b020b5cf59d29bf8143e94c132b1eebfc658fc6585faf805ef02dc2120eac42aca76db31a580985eaecfcc3901ef WHIRLPOOL 6dc36431247d178e792562ab72645368198e896b7889d753f8cc6c760af3527f1f205b4166357f9232970859e96c4aa031c23f63fdd8a048a3b0c089fb052a81
 AUX qt-3.3.8b-cstddef.patch 1197 SHA256 ea2c24d508e6f38f9724a852f1fdd1024a681922a0df1adb81e2ec4b2eeaf071 SHA512 f7a529724cb2d326d32711cb9968d34186628e98c01f8c0a7b249394aa74de77c8028760908fe83d42f09b510898781b659cb775881573acdec9aecd622b455f WHIRLPOOL ca7a37145190f44f1857c8bc57d7d843d07d3c280ed399be0d71e77039ea445830602c796cd0481ddc8ae0f26440c4ec5ed32ef82345dfdc1955753ce89d4379
+AUX qt-3.3.8b-freetype251.patch 2402 SHA256 f398ae9d30f9ca2bbabf2d3c1932da7c94d6bfe4f8711f10931d5a0fc097d6f5 SHA512 45e7984abad87a68e226cf23bacc1457c2d2d982a42ecade69946d50b5b4babf37bbe8caf0955a7240797d2725cc6cc7805b7bc23d9e859805c37f24c74b0711 WHIRLPOOL bb59e4ff580c85ee274e1ee50b4a3a1f927d8e1a58c306f907561210b2a50b6fe978b96556311d2e7aa5edaf64a2bd4b067ed64303c26566a4a0668016e03d76
 AUX qt-ulibc.patch 355 SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d SHA512 8cd3d637bb708fa5396e0e93b711c4fde74851beea7771b27f19ba8e660dc13d74236e15cb10829cbebd64a8b357ebc978a09961c448a54e21d9b41df39e012c WHIRLPOOL 1102370186f512ca28ccc195f2d1aa0cfc793b5fd0ac04725075971fcadf4162ca2e28f9611453fd1026b8e59f477aa9080fc288128cddc7453f06aa04fba14c
 DIST qt-x11-free-3.3.8b.tar.gz 17313883 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
 EBUILD qt-meta-3.3.8b-r1.ebuild 10846 SHA256 aec8996be7f0bc34303fbb372e5518034e4b4d1a5f76178cb27af9482da09e61 SHA512 85fa9745f082b6d8b245358de48dbce3683d1a26b63a5758f26fd98d58e8c067a24d65b1f507d3539e618614e6f1e273c6cad60dd7fc2cc37b3ff720f9b5902a WHIRLPOOL 66f4a38e3e4a716cb14c9ca5b6a25f595ce65a3341429ffc4c9004e8a566d49941016ea19688789b0d2d3b72ebbc7cadf64cee8b10a6729c917bd3070a4c376a
-EBUILD qt-meta-3.3.8b-r2.ebuild 10967 SHA256 ee6e78469f4961dcb150b26c02c05ca0d0144cfa5f2620a02b5f5501dfdd1a27 SHA512 95c1fcb47ef514558a8b03eade9b2f56c1f4d9abfe6cac770a688b27608f878991ef3927e1fcdd7b1e944ba53f6d67addc3f6338d3932702a8b06019add54fb2 WHIRLPOOL b91e133865bbf62d154f78a0fd55e9f5bc53eaf9cad4cd67f697fb7d3bb3172757772faa24bce447739a9fc49b1dba7afa8612b6c039ea0ceb61ef6e67f8a719
-MISC ChangeLog 50114 SHA256 a7f3d4b071449dd3b5f456319f43d2fbc3336203c0ceb6f4b7a3cf52a25f4181 SHA512 e6a3b31f5e1f2fed99e30ce246ef0b6770d155281dd06cac23740fa55cf959012060be9b119b5e554d66337ca0b4fe992186cf21520f654a2aa379cba57f3f17 WHIRLPOOL ab314eb460308f6190809492df65062717a9e43189370610664e8869d6c50ce0bafdedb0d8e1b912747c656792c023325996fc2abab4cae4339985e65f463b77
+EBUILD qt-meta-3.3.8b-r2.ebuild 11034 SHA256 e3a2e5e7a013c6018aa1d2abc660799336737c457c2a2e8e00d0e5e8f58aa074 SHA512 09df27dd12a25e50c8d8baa2f464f13f5b187e98d61cb0d09796fab06d24730f5be3d2b61b9b86973a32d8600653e053cf99c6d2f65f693a267c217b9b345463 WHIRLPOOL 3e16e74e9f2300cada4490ed7a37a3f9ac22b591a1c6f23f75b98c98c3b9eceaf09e4ddba79b7482efebc59b02f170fc8e4083a7fd66906622f1d9386eb9d5cd
+MISC ChangeLog 50272 SHA256 7aebaec591bad01df7b7898a120ea612ee522cc6cb751b5fd628d08ebb563d2d SHA512 108d4138e64076db6873aa3bc8c09d91ce1725ca36016f1323ead7432f9ccce2bb0e610e1d7a34626e9f847d4640c8efc4f91347ce7ae1f0f714a5cf62d95da9 WHIRLPOOL 0c2cc2785efcff8d1b0c0fea31f216dde10a584c45867048d23ec7dae9ecf3e23c076d72570cbd32f1e1d6b5f9eb8dcae18db151a07918bf7c262b919081618c
 MISC metadata.xml 335 SHA256 53934f5173007d42204665e1561d36656c6ecf587162b8eb4e289fcfa88c577a SHA512 006c6c8bb33b0a5a7eca4910a6ba12fb4ed307d8d8478c77d20ee5d659bdab0320491e992c45e225ac4b778a78eea7f5dabe06c3abf848741f2cfe5477fa104a WHIRLPOOL 4978b14b3a69f928cfde293cbf9614d131c1f17d00c4f54420ebe7d20e5305f52cc61e58cc3748618d51a6b0679db40ab1760b000876c742c1d7a522f2c575e0
diff --git a/dev-qt/qt-meta/files/qt-3.3.8b-freetype251.patch b/dev-qt/qt-meta/files/qt-3.3.8b-freetype251.patch
new file mode 100644
index 00000000..e8f968d4
--- /dev/null
+++ b/dev-qt/qt-meta/files/qt-3.3.8b-freetype251.patch
@@ -0,0 +1,52 @@
+--- qt-x11-free-3.3.8b/config.tests/x11/xfreetype.test
++++ qt-x11-free-3.3.8b/config.tests/x11/xfreetype.test
+@@ -116,29 +116,32 @@
+ # check for freetype2 headers
+ FREETYPE2_INCDIR=
+ if [ "$XFT" = "yes" ]; then
+-    INC="freetype2/freetype/freetype.h"
++    INC_OLD="freetype2/freetype/freetype.h"
++    INC_NEW="freetype2/freetype.h"
+     XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
+     LDIRS=`sed -n -e '/^QMAKE_INCDIR[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
+     INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"
+     F=
+     for INCDIR in $INCDIRS; do
+-	if [ -f $INCDIR/$INC ]; then
+-	    # detect major version of freetype2
+-	    FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
+-	    FREETYPE_MINOR=`grep "#define FREETYPE_MINOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
+-	    FREETYPE_PATCH=`grep "#define FREETYPE_PATCH" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
+-	    test -z "$FREETYPE_PATCH" && FREETYPE_PATCH="0"
+-	    [ "$VERBOSE" = "yes" ] && \
+-		echo "  Found Freetype version $FREETYPE_MAJOR.$FREETYPE_MINOR.$FREETYPE_PATCH"
+-	    if [ "$FREETYPE_MAJOR" -eq "2" ] \
+-               && [ "$FREETYPE_MINOR" -ge "0" -a "$FREETYPE_PATCH" -ge "9" ] \
+-               || [ "$FREETYPE_MINOR" -ge "1" ]; then
+-		F=yes
+-		FREETYPE2_INCDIR=$INCDIR/freetype2
+-		[ "$VERBOSE" = "yes" ] && echo "  Found $INC in $INCDIR"
+-		break
++	for INC in $INC_OLD $INC_NEW; do
++	    if [ -f $INCDIR/$INC ]; then
++		# detect major version of freetype2
++		FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
++		FREETYPE_MINOR=`grep "#define FREETYPE_MINOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
++		FREETYPE_PATCH=`grep "#define FREETYPE_PATCH" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
++		test -z "$FREETYPE_PATCH" && FREETYPE_PATCH="0"
++		[ "$VERBOSE" = "yes" ] && \
++		    echo "  Found Freetype version $FREETYPE_MAJOR.$FREETYPE_MINOR.$FREETYPE_PATCH"
++		if [ "$FREETYPE_MAJOR" -eq "2" ] \
++            	   && [ "$FREETYPE_MINOR" -ge "0" -a "$FREETYPE_PATCH" -ge "9" ] \
++            	   || [ "$FREETYPE_MINOR" -ge "1" ]; then
++		    F=yes
++		    FREETYPE2_INCDIR=$INCDIR/freetype2
++		    [ "$VERBOSE" = "yes" ] && echo "  Found $INC in $INCDIR"
++		    break
++		fi
+ 	    fi
+-	fi
++	done
+     done
+     if [ -z "$F" ]; then
+ 	XFT=no
diff --git a/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild b/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
index 90949bc3..b6f9af04 100644
--- a/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
+++ b/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild,v 1.7 2009/12/03 18:25:47 yngwin Exp $
 
@@ -111,12 +111,12 @@ src_unpack() {
 	epatch "${FILESDIR}"/qt-3.3.8-uic-fix.patch
 
 	# KDE related patches
-	epatch "${FILESDIR}"/0001-dnd_optimization.patch
-	epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch
-	epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch
-	epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff
-	epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff
-	epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch
+	epatch "${FILESDIR}"/0001-dnd_optimization.patch \
+		"${FILESDIR}"/0002-dnd_active_window_fix.patch \
+		"${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch \
+		"${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff \
+		"${FILESDIR}"/0047-fix-kmenu-widget.diff \
+		"${FILESDIR}"/0048-qclipboard_hack_80072.patch
 
 	# ulibc patch (bug #100246)
 	epatch "${FILESDIR}"/qt-ulibc.patch
@@ -126,7 +126,7 @@ src_unpack() {
 
 	# Visibility patch, apply only on GCC 4.1 and later for safety
 	# [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
-		epatch "${FILESDIR}"/qt-3.3.8-visibility.patch
+	epatch "${FILESDIR}"/qt-3.3.8-visibility.patch
 
 	# Fix configure to correctly pick up gcc version, bug 244732
 	epatch "${FILESDIR}"/qt-3.3.8-fix-compiler-detection.patch
@@ -140,6 +140,9 @@ src_unpack() {
 	# Fix libpng-1.5 issues
 	epatch "${FILESDIR}"/qt-3.3.8-libpng15.patch
 
+	# Fix detection of >=freetype-2.5.1
+	epatch "${FILESDIR}"/qt-3.3.8b-freetype251.patch
+
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
 		sh make-symlinks.sh || die "make symlinks failed"