Add a patch which fixes qt build in -debug-and-release mode, from Trolltech (bug #117127)

Package-Manager: portage-2.1_pre3-r1

6 files changed, 92 insertions, 12 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 51be0e245028..ace0b2a13c0b 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/qt
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.274 2005/12/20 17:23:01 caleb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.275 2006/01/03 12:12:06 caleb Exp $
+
+  03 Jan 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/qt-4.1.0-debug-and-release.diff, qt-3.3.4-r8.ebuild,
+  qt-3.3.5.ebuild, qt-4.1.0.ebuild:
+  Add a patch which fixes qt build in -debug-and-release mode, from Trolltech
+  (bug #117127)
+
+  03 Jan 2006; Caleb Tennis <caleb@gentoo.org> qt-3.3.4-r8.ebuild,
+  qt-3.3.5.ebuild:
+  build qembed tool by default
 
   20 Dec 2005; Caleb Tennis <caleb@gentoo.org> qt-4.1.0.ebuild:
   Remove QtAssistant manual installation (it looks to me like it's handled
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index ad4ce764555c..c3ebd9c2848f 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,4 +1,4 @@
-MD5 29fe42c77e019f49f9870fd4c3d6c061 ChangeLog 4464
+MD5 c72073684dfdb7bd11f4316609a21930 ChangeLog 4822
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
@@ -18,10 +18,11 @@ MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
 MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154
 MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.5-uic-fix.patch 711
 MD5 0495f1d3f467a2972feccba453135258 files/qt-4.1.0-configure-no-mysql.diff 11142
+MD5 b50b8f687bb25b6b372b22abc591e20c files/qt-4.1.0-debug-and-release.diff 1727
 MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 8feb6ab675abfabe03c64990724716cb qt-3.3.4-r8.ebuild 10234
-MD5 e9921cdbf779efba80c3877aea9d719a qt-3.3.5.ebuild 10201
+MD5 535413f7903ecea020dd6ae98fa3a8d3 qt-3.3.4-r8.ebuild 10353
+MD5 9cb64e365be8153b3aa5d14291cc58cc qt-3.3.5.ebuild 10320
 MD5 013f53daa2fbe33eec94e47726c9e853 qt-4.0.1.ebuild 5936
-MD5 689a9a0dd97c261ec08f68118db4979a qt-4.1.0.ebuild 6199
+MD5 646d36bb71f8b40f3f91ee8bed5e059a qt-4.1.0.ebuild 6251
 MD5 6212755080bc0fd437c6e83d2db3ae82 qt-4.1.0_rc1.ebuild 6088
diff --git a/x11-libs/qt/files/qt-4.1.0-debug-and-release.diff b/x11-libs/qt/files/qt-4.1.0-debug-and-release.diff
new file mode 100644
index 000000000000..ad43f2e95781
--- /dev/null
+++ b/x11-libs/qt/files/qt-4.1.0-debug-and-release.diff
@@ -0,0 +1,56 @@
+--- configure	2006-01-03 10:12:46 -0000
++++ configure	2006-01-03 10:12:46 -0000
+
+@@ -370,7 +370,6 @@
+ CFG_QCONFIG=full
+ CFG_EMBEDDED=no
+ CFG_DEBUG=auto
+-CFG_BUILD_ALL=yes
+ CFG_DEBUG_RELEASE=no
+ CFG_SHARED=yes
+ CFG_SM=auto
+@@ -1297,14 +1296,12 @@
+ fi
+ 
+ # detect build style
+-if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+-    QMAKE_CONFIG="$QMAKE_CONFIG build_all"
+-elif [ "$CFG_DEBUG" = "auto" ]; then
++if [ "$CFG_DEBUG" = "auto" ]; then
+     CFG_DEBUG_RELEASE=yes
+     CFG_DEBUG=yes
++fi
++if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
+     QMAKE_CONFIG="$QMAKE_CONFIG build_all"
+-else
+-    CFG_BUILD_ALL=no
+ fi
+ 
+ # if the source tree is different from the build tree,
+@@ -4174,7 +4171,16 @@
+ 
+ [ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL"
+ echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG"
+-echo "Debug................ $CFG_DEBUG"
++if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
++   echo "Debug................ yes (combined)"
++   if [ "$CFG_DEBUG" = "yes" ]; then
++       echo "Default Link......... debug"
++   else
++       echo "Default Link......... release"
++   fi
++else
++   echo "Debug................ $CFG_DEBUG"
++fi
+ echo "Qt3 compatibility.... $CFG_QT3SUPPORT"
+ echo "STL support ......... $CFG_STL"
+ echo "PCH support ......... $CFG_PRECOMPILE"
+@@ -4452,7 +4458,7 @@
+ # WARNING: This makefile will be replaced with a real makefile.
+ # All changes made to this file will be lost.
+ EOF
+-            [ "$CFG_BUILD_ALL" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
++            [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
+ 
+             cat >>${OUTDIR}/Makefile <<EOF
+ all clean install qmake first Makefile: FORCE
diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild
index 81379ed7a490..ff49b1d22272 100644
--- a/x11-libs/qt/qt-3.3.4-r8.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.11 2005/12/14 05:54:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.12 2006/01/03 12:12:06 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -195,6 +195,11 @@ src_compile() {
 	../../bin/qmake
 	emake
 
+	# Make the qembed utility (not made by default)
+	cd ${S}/tools/qembed
+	../../bin/qmake
+	emake
+
 }
 
 src_install() {
@@ -202,6 +207,7 @@ src_install() {
 	into ${QTBASE}
 	dobin bin/*
 	dobin tools/msg2qm/msg2qm
+	dobin tools/qembed/qembed
 
 	# libraries
 	if use ppc-macos; then
diff --git a/x11-libs/qt/qt-3.3.5.ebuild b/x11-libs/qt/qt-3.3.5.ebuild
index 310b84a871d1..1ffe84bc6dc6 100644
--- a/x11-libs/qt/qt-3.3.5.ebuild
+++ b/x11-libs/qt/qt-3.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.5.ebuild,v 1.6 2005/12/16 09:57:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.5.ebuild,v 1.7 2006/01/03 12:12:06 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -198,6 +198,11 @@ src_compile() {
 	../../bin/qmake
 	emake
 
+	# Make the qembed utility (not made by default)
+	cd ${S}/tools/qembed
+	../../bin/qmake
+	emake
+
 }
 
 src_install() {
@@ -205,6 +210,7 @@ src_install() {
 	into ${QTBASE}
 	dobin bin/*
 	dobin tools/msg2qm/msg2qm
+	dobin tools/qembed/qembed
 
 	# libraries
 	if use ppc-macos; then
diff --git a/x11-libs/qt/qt-4.1.0.ebuild b/x11-libs/qt/qt-4.1.0.ebuild
index 27f015b76a89..ba352dc99ff3 100644
--- a/x11-libs/qt/qt-4.1.0.ebuild
+++ b/x11-libs/qt/qt-4.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0.ebuild,v 1.2 2005/12/20 17:23:01 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0.ebuild,v 1.3 2006/01/03 12:12:06 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -104,6 +104,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/qt4-nomkdir.patch
 	epatch ${FILESDIR}/qt-4.1.0-configure-no-mysql.diff
+	epatch ${FILESDIR}/qt-4.1.0-debug-and-release.diff
 
 	if [[ "$(gcc-major-version)" == "4" ]]; then
 		einfo "Visibility support: auto"