Add fix for bug 235392

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.5 i686

4 files changed, 24 insertions, 4 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 87646bbd3a6d..fba9180fbb92 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.14 2008/09/19 00:12:12 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.15 2008/09/19 12:00:04 yngwin Exp $
+
+  19 Sep 2008; Ben de Groot <yngwin@gentoo.org>
+  +files/qt-gui-designer-4.4.1.patch, qt-gui-4.4.1.ebuild:
+  Add fix for bug 235392
 
 *qt-gui-4.4.2 (19 Sep 2008)
 
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index b48ee03604de..2fa0a3f1b15f 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,6 +1,7 @@
 AUX Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2ca9fc952d204635a2b62480cf4531faf2938110 SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741
 AUX Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7
 AUX qt-gui-4.4.0-scrollbars.patch 508 RMD160 fc8f3b529f6abf395643f839af91d87654f6de00 SHA1 ef9b3996d7ad046725c7cc4ea5210e83ed0bcbe6 SHA256 55eaa28bfed52326ad116aa95f77bccce8b1702def464c6f9d225764141d6945
+AUX qt-gui-designer-4.4.1.patch 531 RMD160 ab7e5f965541ff4e16d3530f55b8fc40cfc6d5a5 SHA1 dba254383e0504e8f4257217e15e201cc5216f9c SHA256 fbc46d38a87ab3ffaec5ac5b58f4a534e1ef3af050f9f68eb6001ddb33920b12
 AUX xinerama.patch 693 RMD160 c5bdfb4184c4b94059b8c095545355a0b5c48643 SHA1 6848994884a62a0d599e0cb499e546688bfba062 SHA256 ca1afcdd29fe2a1c02af3dbe4640fd4ec2aafa4f0bae4c01e0b6a40e23303a0b
 DIST qt-x11-opensource-src-4.4.0-headers.tar.bz2 2531285 RMD160 5cf74dd7e5864420abc5ebb725ed824854d1d0d2 SHA1 7ea8a69fb5d7bd757d3fc8ea5a91d5b738fec43a SHA256 edca0e755c3e63d514dbe94a5d1c532937412c8019c339bc68f824e031ab8ef2
 DIST qt-x11-opensource-src-4.4.0.tar.bz2 98584925 RMD160 ddcfe3390e65761a45a6112a8466b3b1e22cc584 SHA1 71acc53f5ec7bdc6abbc85409568d0d006a040e3 SHA256 871dc71c6c905212f2fea7e6598362114a3b6097c220b0b251f8d159ee7d706e
@@ -9,7 +10,7 @@ DIST qt-x11-opensource-src-4.4.1.tar.bz2 99481677 RMD160 82526c00dd979ceda40d408
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675
 EBUILD qt-gui-4.4.0.ebuild 3883 RMD160 51c30f4e6b14107316b58df1f3656a8006e7acd6 SHA1 ef85d1bcf53998b1e0465f0c08458e3633cc9242 SHA256 472907ab8ae642a9d9f873e95a7e4e812189f0c16b015454834435a62554cee7
-EBUILD qt-gui-4.4.1.ebuild 3880 RMD160 9a45bcaa1b8e40d96c518018b33df970731069f9 SHA1 066971e6ffdba45264f05c9f4e686cfce341fac4 SHA256 a3e757e1b60574a9dff85933ae67ffc774390ecba37e5c122b974c5646353648
+EBUILD qt-gui-4.4.1.ebuild 3953 RMD160 6964536b874110e429a2f208bf92e868aabcedd7 SHA1 852a3320e9671a19d0abed7f332ad383fbf442b5 SHA256 432c0e507423f24c4447a442faf04f5e9b9a3d99977040abc64b63f1ad2c65ff
 EBUILD qt-gui-4.4.2.ebuild 3880 RMD160 eb392782ef4ad7113e30ee5e66f28ee1bdd70f54 SHA1 372cb2910f17588fc5a73868e3a0e7d54e32ec54 SHA256 fcc8e2ad8b8f360e8e50b4e82ba659c26a9cbaaa5f6ec27e82c4ccd8a1759f5d
-MISC ChangeLog 2047 RMD160 df0c84f645afdaa8e8a9efb0671d26a361e3fbee SHA1 831bddb209c5502cce2108c3ffac81e6e76b6397 SHA256 efa75bc2677c6f9be5594a262392e9d1410964973db24497757ebdad34673707
+MISC ChangeLog 2180 RMD160 f5b42f6b9b2daea7d471be73278d4942fbe2c7a7 SHA1 f3f1dfda7112be3a14b19aed18c17e590408b4b6 SHA256 beb514379bbaf36e94d8a195c8d0bf0ad44f1761eb172205f9f610263578fd1f
 MISC metadata.xml 426 RMD160 82c15c9cce37ed4f91380dd174d67490902ef824 SHA1 777cc58f7d827e146751de5bb2e1b790ecae2f34 SHA256 ed24a12acb0e487adce4d6f6abade35e273ac48e61c5f6e7109d15b07920c328
diff --git a/x11-libs/qt-gui/files/qt-gui-designer-4.4.1.patch b/x11-libs/qt-gui/files/qt-gui-designer-4.4.1.patch
new file mode 100644
index 000000000000..e82ab9dfb0b7
--- /dev/null
+++ b/x11-libs/qt-gui/files/qt-gui-designer-4.4.1.patch
@@ -0,0 +1,12 @@
+--- src/tools/designer/src/components/propertyeditor/propertyeditor.cpp	2008-08-14 10:25:28 -0000
++++ src/tools/designer/src/components/propertyeditor/propertyeditor.cpp	2008-08-14 10:25:28 -0000
+
+@@ -656,7 +656,7 @@
+ 
+ void PropertyEditor::updateColors()
+ {
+-    if (m_currentBrowser == m_treeBrowser) {
++    if (m_treeBrowser && m_currentBrowser == m_treeBrowser) {
+         QList<QtBrowserItem *> items = m_treeBrowser->topLevelItems();
+         QListIterator<QtBrowserItem *> itItem(items);
+         while (itItem.hasNext()) {
diff --git a/x11-libs/qt-gui/qt-gui-4.4.1.ebuild b/x11-libs/qt-gui/qt-gui-4.4.1.ebuild
index 3a812f98ea11..84eb6b786df3 100644
--- a/x11-libs/qt-gui/qt-gui-4.4.1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.1.ebuild,v 1.3 2008/08/16 15:07:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.1.ebuild,v 1.4 2008/09/19 12:00:04 yngwin Exp $
 
 EAPI="1"
 inherit eutils qt4-build
@@ -70,6 +70,9 @@ src_unpack() {
 
 	qt4-build_src_unpack
 
+	# fix for bug 235392
+	epatch "${FILESDIR}"/qt-gui-designer-4.4.1.patch
+
 	# Don't build plugins this go around, because they depend on qt3support lib
 	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
 }