| 1 |
commit: a58b78a2b5826bb28d85731ce02399d4d4dc4f2d |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 30 16:43:56 2014 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 30 16:43:56 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=a58b78a2 |
| 7 |
|
| 8 |
Add a patch to find >=freetype-2.5.1 |
| 9 |
|
| 10 |
--- |
| 11 |
dev-qt/qt-meta/ChangeLog | 6 ++- |
| 12 |
dev-qt/qt-meta/files/qt-3.3.8b-freetype251.patch | 52 ++++++++++++++++++++++++ |
| 13 |
dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild | 19 +++++---- |
| 14 |
3 files changed, 68 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-qt/qt-meta/ChangeLog b/dev-qt/qt-meta/ChangeLog |
| 17 |
index 533c273..d844ab6 100644 |
| 18 |
--- a/dev-qt/qt-meta/ChangeLog |
| 19 |
+++ b/dev-qt/qt-meta/ChangeLog |
| 20 |
@@ -1,7 +1,11 @@ |
| 21 |
# ChangeLog for dev-qt/qt-meta |
| 22 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.586 2009/08/02 21:54:28 tommy Exp $ |
| 25 |
|
| 26 |
+ 30 Jan 2014; Lars Wendler <polynomial-c@g.o> qt-meta-3.3.8b-r2.ebuild, |
| 27 |
+ +files/qt-3.3.8b-freetype251.patch: |
| 28 |
+ Add a patch to find >=freetype-2.5.1 |
| 29 |
+ |
| 30 |
05 Jun 2013; Lars Wendler <polynomial-c@g.o> qt-meta-3.3.8b-r1.ebuild, |
| 31 |
qt-meta-3.3.8b-r2.ebuild: |
| 32 |
Fixed SRC_URI and HOMEPAGE. |
| 33 |
|
| 34 |
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 |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..e8f968d |
| 37 |
--- /dev/null |
| 38 |
+++ b/dev-qt/qt-meta/files/qt-3.3.8b-freetype251.patch |
| 39 |
@@ -0,0 +1,52 @@ |
| 40 |
+--- qt-x11-free-3.3.8b/config.tests/x11/xfreetype.test |
| 41 |
++++ qt-x11-free-3.3.8b/config.tests/x11/xfreetype.test |
| 42 |
+@@ -116,29 +116,32 @@ |
| 43 |
+ # check for freetype2 headers |
| 44 |
+ FREETYPE2_INCDIR= |
| 45 |
+ if [ "$XFT" = "yes" ]; then |
| 46 |
+- INC="freetype2/freetype/freetype.h" |
| 47 |
++ INC_OLD="freetype2/freetype/freetype.h" |
| 48 |
++ INC_NEW="freetype2/freetype.h" |
| 49 |
+ XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` |
| 50 |
+ LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` |
| 51 |
+ INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" |
| 52 |
+ F= |
| 53 |
+ for INCDIR in $INCDIRS; do |
| 54 |
+- if [ -f $INCDIR/$INC ]; then |
| 55 |
+- # detect major version of freetype2 |
| 56 |
+- FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` |
| 57 |
+- FREETYPE_MINOR=`grep "#define FREETYPE_MINOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` |
| 58 |
+- FREETYPE_PATCH=`grep "#define FREETYPE_PATCH" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` |
| 59 |
+- test -z "$FREETYPE_PATCH" && FREETYPE_PATCH="0" |
| 60 |
+- [ "$VERBOSE" = "yes" ] && \ |
| 61 |
+- echo " Found Freetype version $FREETYPE_MAJOR.$FREETYPE_MINOR.$FREETYPE_PATCH" |
| 62 |
+- if [ "$FREETYPE_MAJOR" -eq "2" ] \ |
| 63 |
+- && [ "$FREETYPE_MINOR" -ge "0" -a "$FREETYPE_PATCH" -ge "9" ] \ |
| 64 |
+- || [ "$FREETYPE_MINOR" -ge "1" ]; then |
| 65 |
+- F=yes |
| 66 |
+- FREETYPE2_INCDIR=$INCDIR/freetype2 |
| 67 |
+- [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" |
| 68 |
+- break |
| 69 |
++ for INC in $INC_OLD $INC_NEW; do |
| 70 |
++ if [ -f $INCDIR/$INC ]; then |
| 71 |
++ # detect major version of freetype2 |
| 72 |
++ FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` |
| 73 |
++ FREETYPE_MINOR=`grep "#define FREETYPE_MINOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` |
| 74 |
++ FREETYPE_PATCH=`grep "#define FREETYPE_PATCH" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` |
| 75 |
++ test -z "$FREETYPE_PATCH" && FREETYPE_PATCH="0" |
| 76 |
++ [ "$VERBOSE" = "yes" ] && \ |
| 77 |
++ echo " Found Freetype version $FREETYPE_MAJOR.$FREETYPE_MINOR.$FREETYPE_PATCH" |
| 78 |
++ if [ "$FREETYPE_MAJOR" -eq "2" ] \ |
| 79 |
++ && [ "$FREETYPE_MINOR" -ge "0" -a "$FREETYPE_PATCH" -ge "9" ] \ |
| 80 |
++ || [ "$FREETYPE_MINOR" -ge "1" ]; then |
| 81 |
++ F=yes |
| 82 |
++ FREETYPE2_INCDIR=$INCDIR/freetype2 |
| 83 |
++ [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" |
| 84 |
++ break |
| 85 |
++ fi |
| 86 |
+ fi |
| 87 |
+- fi |
| 88 |
++ done |
| 89 |
+ done |
| 90 |
+ if [ -z "$F" ]; then |
| 91 |
+ XFT=no |
| 92 |
|
| 93 |
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 |
| 94 |
index 90949bc..b6f9af0 100644 |
| 95 |
--- a/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild |
| 96 |
+++ b/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild |
| 97 |
@@ -1,4 +1,4 @@ |
| 98 |
-# Copyright 1999-2013 Gentoo Foundation |
| 99 |
+# Copyright 1999-2014 Gentoo Foundation |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
# $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 $ |
| 102 |
|
| 103 |
@@ -111,12 +111,12 @@ src_unpack() { |
| 104 |
epatch "${FILESDIR}"/qt-3.3.8-uic-fix.patch |
| 105 |
|
| 106 |
# KDE related patches |
| 107 |
- epatch "${FILESDIR}"/0001-dnd_optimization.patch |
| 108 |
- epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch |
| 109 |
- epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch |
| 110 |
- epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff |
| 111 |
- epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff |
| 112 |
- epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch |
| 113 |
+ epatch "${FILESDIR}"/0001-dnd_optimization.patch \ |
| 114 |
+ "${FILESDIR}"/0002-dnd_active_window_fix.patch \ |
| 115 |
+ "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch \ |
| 116 |
+ "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff \ |
| 117 |
+ "${FILESDIR}"/0047-fix-kmenu-widget.diff \ |
| 118 |
+ "${FILESDIR}"/0048-qclipboard_hack_80072.patch |
| 119 |
|
| 120 |
# ulibc patch (bug #100246) |
| 121 |
epatch "${FILESDIR}"/qt-ulibc.patch |
| 122 |
@@ -126,7 +126,7 @@ src_unpack() { |
| 123 |
|
| 124 |
# Visibility patch, apply only on GCC 4.1 and later for safety |
| 125 |
# [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \ |
| 126 |
- epatch "${FILESDIR}"/qt-3.3.8-visibility.patch |
| 127 |
+ epatch "${FILESDIR}"/qt-3.3.8-visibility.patch |
| 128 |
|
| 129 |
# Fix configure to correctly pick up gcc version, bug 244732 |
| 130 |
epatch "${FILESDIR}"/qt-3.3.8-fix-compiler-detection.patch |
| 131 |
@@ -140,6 +140,9 @@ src_unpack() { |
| 132 |
# Fix libpng-1.5 issues |
| 133 |
epatch "${FILESDIR}"/qt-3.3.8-libpng15.patch |
| 134 |
|
| 135 |
+ # Fix detection of >=freetype-2.5.1 |
| 136 |
+ epatch "${FILESDIR}"/qt-3.3.8b-freetype251.patch |
| 137 |
+ |
| 138 |
if use immqt || use immqt-bc ; then |
| 139 |
epatch ../${IMMQT_P}.diff |
| 140 |
sh make-symlinks.sh || die "make symlinks failed" |
Archives