Update to qt 3.3.6

Package-Manager: portage-2.1_pre6-r3

2 files changed, 24 insertions, 0 deletions

diff --git a/x11-libs/qt/files/digest-qt-3.3.6 b/x11-libs/qt/files/digest-qt-3.3.6
new file mode 100644
index 000000000000..bf39850175d6
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.6
@@ -0,0 +1,6 @@
+MD5 dc1384c03ac08af21f6fefab32d982cf qt-x11-free-3.3.6.tar.bz2 14565843
+RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 qt-x11-free-3.3.6.tar.bz2 14565843
+SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae qt-x11-free-3.3.6.tar.bz2 14565843
+MD5 2d1a6979301ee81da404f63670211416 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
+RMD160 18fe91f54f2f18c2b1b2b870b36c7545132ed166 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
+SHA256 a3c31dd54aaf1a88222715a2140f9a4ed4eaf240930c94c506bbde15f00f746a qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
diff --git a/x11-libs/qt/files/qt-3.3.6-uic-fix.patch b/x11-libs/qt/files/qt-3.3.6-uic-fix.patch
new file mode 100644
index 000000000000..8e5bd5590874
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.6-uic-fix.patch
@@ -0,0 +1,18 @@
+Index: tools/designer/uic/form.cpp
+===================================================================
+--- tools/designer/uic/form.cpp	(revision 460038)
++++ tools/designer/uic/form.cpp	(working copy)
+@@ -731,6 +731,13 @@
+             while ( !n2.isNull() ) {
+                 if ( n2.tagName() == "includehint" ) {
+                     QString file = n2.firstChild().toText().data();
++                    int colons = file.find("::");
++
++                    if (colons != -1)
++                    {
++                        file = file.right(file.length() - colons - 2);
++                    }
++
+                     localIncludes += file;
+                 }
+                 n2 = n2.nextSibling().toElement();