Added a patch for mips that passes -Wa,-relax-branch to gcc/g++, otherwise the build eventually dies. Also added ~mips to KEYWORDS, and added an 'inherit eutils'.

4 files changed, 49 insertions, 26 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index dc94fa981339..2741555dc7af 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.137 2004/04/17 23:02:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.138 2004/04/21 08:48:29 kumba Exp $
+
+  21 Apr 2004; Joshua Kinard <kumba@gentoo.org> qt-3.3.1-r2.ebuild:
+  Added a patch for mips that passes -Wa,-relax-branch to gcc/g++, otherwise the
+  build eventually dies. Also added ~mips to KEYWORDS, and added an 'inherit
+  eutils'.
 
   17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> qt-2.3.2-r1.ebuild,
   qt-3.2.3-r1.ebuild, qt-3.3.0-r1.ebuild, qt-3.3.1-r1.ebuild:
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 05067987645a..bb198ec87350 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,40 +1,41 @@
-MD5 cbddc6a88e04b4e7aba8185d785648b3 qt-3.3.0-r1.ebuild 5027
-MD5 8d0a82fdd4b59c8a00c821584d773cc4 qt-3.1.2-r3.ebuild 4978
+MD5 f6c25512871dbf223795a4ed93e50080 ChangeLog 23856
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 5dee068fc8022a4447d6953ae1ccf398 qt-2.3.2-r1.ebuild 2287
-MD5 7a36006a09f5dee625b87dc71d17909e qt-3.3.1-r2.ebuild 5480
 MD5 275bf64fb8919320ba75f00523281729 qt-3.0.5-r2.ebuild 3901
-MD5 ce9d5c62726ada9222916a03601939a3 qt-3.3.1-r1.ebuild 4843
+MD5 8d0a82fdd4b59c8a00c821584d773cc4 qt-3.1.2-r3.ebuild 4978
 MD5 c973d5945a144bf34263a12ec0ed0379 qt-3.1.2-r4.ebuild 5342
-MD5 4e8bb246b60d45694b2ae0d0b6a6f823 ChangeLog 23617
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 737f6d3b6421a2ffcfed3b3f3e8f917a qt-3.2.3-r1.ebuild 5130
-MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 cbddc6a88e04b4e7aba8185d785648b3 qt-3.3.0-r1.ebuild 5027
+MD5 ce9d5c62726ada9222916a03601939a3 qt-3.3.1-r1.ebuild 4843
+MD5 403178b025b7cef96c026ced9c1973d0 qt-3.3.1-r2.ebuild 5749
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
-MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
-MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
-MD5 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
-MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
+MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
 MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r4 72
 MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
 MD5 c585d6ad02168e4645ea5ca46d237e1c files/digest-qt-3.3.0-r1 72
 MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r1 72
-MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
-MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
-MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
-MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
 MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
+MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
+MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
+MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
 MD5 953be971128fb1a5ad7d9893f657e13c files/qt-3.1.2-korean-xim.patch 4285
-MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
 MD5 8c9b47edf5949643d8dbeb3fecc40e7c files/qt-3.1.2-qfont-jp-family-subst-20030421.patch 22730
 MD5 bf7aed227565288222ea889c81b1e363 files/qt-3.1.2-qlistview-dnd.diff 469
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
+MD5 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
+MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
+MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
 MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
-MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
+MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
+MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
+MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
+MD5 ab65c37e94ac512a1a772a491d3127bf files/qt-3.3.1-mips-relax-branches.patch 455
diff --git a/x11-libs/qt/files/qt-3.3.1-mips-relax-branches.patch b/x11-libs/qt/files/qt-3.3.1-mips-relax-branches.patch
new file mode 100644
index 000000000000..0ce9d91ad4fc
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.1-mips-relax-branches.patch
@@ -0,0 +1,11 @@
+--- mkspecs/linux-g++/qmake.conf.orig	2004-04-21 04:11:26.815710000 -0400
++++ mkspecs/linux-g++/qmake.conf	2004-02-18 08:23:27.000000000 -0500
+@@ -17,7 +17,7 @@ QMAKE_YACCFLAGS		= -d
+ QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+ QMAKE_YACC_HEADER       = $base.tab.h
+ QMAKE_YACC_SOURCE       = $base.tab.c
+-QMAKE_CFLAGS		= -pipe
++QMAKE_CFLAGS		= -pipe -Wa,-relax-branch
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	= -w
diff --git a/x11-libs/qt/qt-3.3.1-r2.ebuild b/x11-libs/qt/qt-3.3.1-r2.ebuild
index 1ee5af2bd9d8..9c7af9a7b61a 100644
--- a/x11-libs/qt/qt-3.3.1-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.1-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1-r2.ebuild,v 1.1 2004/04/17 11:53:14 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1-r2.ebuild,v 1.2 2004/04/21 08:48:29 kumba Exp $
+
+inherit eutils
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -10,7 +12,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
 
 LICENSE="QPL-1.0 | GPL-2"
 SLOT="3"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~hppa"
+KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~hppa ~mips"
 IUSE="cups nas postgres opengl mysql odbc gif doc firebird zlib icc sqlite ipv6 xinerama"
 
 DEPEND="virtual/x11 virtual/xft
@@ -49,6 +51,10 @@ src_unpack() {
 	epatch ${FILESDIR}/qfontdatabase_x11.diff
 	epatch ${FILESDIR}/${P}-qclipboard-fix.patch
 
+	# mips requires this patch to pass a CFLAG to gcc/g++ (which passes it to the assembler).
+	# It tells the assembler to relax branches on mips, otherwise we get build errors.
+	[ "`use mips`" ] && epatch ${FILESDIR}/${P}-mips-relax-branches.patch
+
 #	use icc && export PLATFORM=linux-icc
 }