summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2004-07-09 19:33:23 +0000
committerCaleb Tennis <caleb@gentoo.org>2004-07-09 19:33:23 +0000
commit4300779c4183285e53c1e984ed0ed9d4595d5746 (patch)
tree4450b55acc681d7bc08f8ca847b2c6f20a8b5103 /x11-libs/qt
parentWhoops, got rid of one too many. Readd (diff)
downloadhistorical-4300779c4183285e53c1e984ed0ed9d4595d5746.tar.gz
historical-4300779c4183285e53c1e984ed0ed9d4595d5746.tar.bz2
historical-4300779c4183285e53c1e984ed0ed9d4595d5746.zip
another patch
Diffstat (limited to 'x11-libs/qt')
-rw-r--r--x11-libs/qt/Manifest1
-rw-r--r--x11-libs/qt/files/qt-3.3.2-mips-relax-branches.patch20
2 files changed, 21 insertions, 0 deletions
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 4a4788f78d57..961b460e8bf0 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -11,6 +11,7 @@ MD5 f31b46105b5e5c3c76619c6ce96b2751 files/digest-qt-3.3.2 72
MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
+MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
diff --git a/x11-libs/qt/files/qt-3.3.2-mips-relax-branches.patch b/x11-libs/qt/files/qt-3.3.2-mips-relax-branches.patch
new file mode 100644
index 000000000000..3dc188fff326
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.2-mips-relax-branches.patch
@@ -0,0 +1,20 @@
+--- mkspecs/linux-g++/qmake.conf.orig 2004-04-29 14:39:16.000000000 -0400
++++ mkspecs/linux-g++/qmake.conf 2004-04-17 04:20:23.000000000 -0400
+@@ -9,7 +9,7 @@ TEMPLATE = app
+ CONFIG += qt warn_on release incremental link_prl
+ QMAKE_INCREMENTAL_STYLE = sublib
+
+-QMAKE_CC = gcc
++QMAKE_CC = gcc -Wa,-relax-branch
+ QMAKE_LEX = flex
+ QMAKE_LEXFLAGS =
+ QMAKE_YACC = yacc
+@@ -27,7 +27,7 @@ QMAKE_CFLAGS_SHLIB = -fPIC
+ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD = -D_REENTRANT
+
+-QMAKE_CXX = g++
++QMAKE_CXX = g++ -Wa,-relax-branch
+ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON