diff options
| author |   Joshua Kinard <kumba@gentoo.org> | 2004-04-23 07:41:03 +0000 |
|---|---|---|
| committer | Joshua Kinard <kumba@gentoo.org> | 2004-04-23 07:41:03 +0000 |
| commit | 5c8ad85ad1b81e0dc306364fa3687c7936360ad2 (patch) | |
| tree | 255b21ec3e106fecb9df3a2186921471324ee9c5 /x11-libs | |
| parent | Format String Vulnerabilities. security bug #47918 + Fix broken/insecure logf... (diff) | |
| download | gentoo-2-5c8ad85ad1b81e0dc306364fa3687c7936360ad2.tar.gz gentoo-2-5c8ad85ad1b81e0dc306364fa3687c7936360ad2.tar.bz2 gentoo-2-5c8ad85ad1b81e0dc306364fa3687c7936360ad2.zip | |
The qmake system in qt seems horribly broken, so we have to use a slightly different patch to force a qt build on a mips machine to pass the right flag we need to build. Also fixed a typo from my last commit.
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.3.1-mips-relax-branches.patch | 31 |
3 files changed, 29 insertions, 14 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 2741555dc7af..96b3076876fb 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,12 @@ # 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.138 2004/04/21 08:48:29 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.139 2004/04/23 07:41:03 kumba Exp $ + + 23 Apr 2004; Joshua Kinard <kumba@gentoo.org> + files/qt-3.3.1-mips-relax-branches.patch: + The qmake system in qt seems horribly broken, so we have to use a slightly + different patch to force a qt build on a mips machine to pass the right flag + we need to build. Also fixed a typo from my last commit. 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 diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index bb198ec87350..0a5f56dab791 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,4 +1,4 @@ -MD5 f6c25512871dbf223795a4ed93e50080 ChangeLog 23856 +MD5 73a26ada10d40fef35e1851b5ecde17a ChangeLog 24164 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 MD5 5dee068fc8022a4447d6953ae1ccf398 qt-2.3.2-r1.ebuild 2287 MD5 275bf64fb8919320ba75f00523281729 qt-3.0.5-r2.ebuild 3901 @@ -38,4 +38,4 @@ 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 +MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688 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 index 0ce9d91ad4fc..3dc188fff326 100644 --- 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 @@ -1,11 +1,20 @@ ---- 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 +--- 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 |