Drop unneeded patches

Package-Manager: portage--svn/cvs/Linux i686

6 files changed, 8 insertions, 175 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 7de74c6b1db4..a9ee677264b9 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.594 2009/10/31 13:44:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.595 2009/11/02 09:13:31 abcd Exp $
+
+  02 Nov 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/0037-dnd-timestamp-fix.patch,
+  -files/qt-3.3.8-mysql-unload-crash.diff, -files/qsslsocket-fix.patch,
+  -files/qt-ulibc.patch:
+  Drop unneeded patches
 
   31 Oct 2009; Markus Meier <maekke@gentoo.org> qt-4.5.3.ebuild:
   amd64 stable, bug #290922
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 3d0c1d4ec8b3..157edd4b1ccd 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1
-AUX 0037-dnd-timestamp-fix.patch 2138 RMD160 c11fffd7801fb357beb2d489e6e7cc4edefc3030 SHA1 cda25e150541c3a2ba56ec6974e2771b8aaad0de SHA256 490eb5c21dc30e0beac0aac8a4b6159d56a5e3e7fe40daad39f0c0823648917d
 AUX 0038-dragobject-dont-prefer-unknown.patch 2551 RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 SHA1 3a2371a520d800904350bb9e6e445d6b3092bb88 SHA256 b5c0d00d1ac84302bc2123ccdfdab473cd0daf12f4ba70d6318084d9f744242c
 AUX 0044-qscrollview-windowactivate-fix.diff 1584 RMD160 978cc6c473b668e1bfd5969cce9307719baecf0a SHA1 657ff8ab47aafbd6469688f489fd3788ccb98907 SHA256 f73798b72251d6fe97ed8e661719ba29983c087587ed952618ec4a97bf1816d5
 AUX 0047-fix-kmenu-widget.diff 992 RMD160 bada5e23043d314b15f3af1eda70c8833112ebce SHA1 d67e34b540c2f19e7e3e3715535a6732f447b22c SHA256 0dadffc3218b04eb327baf51c1f681843046cdf07a52b943f46373cd8384c275
 AUX 0048-qclipboard_hack_80072.patch 1662 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb SHA1 5c174acaf3b148f8d70345f68c7f22352450d582 SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c
-AUX qsslsocket-fix.patch 1547 RMD160 bfa729876c0e7c1562ce6a383055e135a658e265 SHA1 f8d2a98c660d45fede3559181f8563c70e698a2b SHA256 281a343e09a769f34019a20a3fff0725209af7e7ef5d7962e25bff3a5e92d1a1
 AUX qt-3.3.8-fix-compiler-detection.patch 637 RMD160 08b7151a83031f0c268da2899d800742a5ed63cf SHA1 7c571a1c98bd29acf4e32fd15b1c9188b7d69bec SHA256 639cd7fb8548f67a51065efba8bb2deecd4778b451855bf28dac1bd9701cd9d5
 AUX qt-3.3.8-immqt+gcc-4.3.patch 756 RMD160 b4379b8c66b2708301f9883ecc1be55ae916a20f SHA1 179825f382fab2cadd097f7597292a69ef71d575 SHA256 d281c1e1f20cdc4f3351eede25287ba3b6bd80cbb0e6f5a9f997394521feb6bd
 AUX qt-3.3.8-mips.patch 1326 RMD160 0fd662a36c2fe0013e7204218ddfc8c604467269 SHA1 a8d1cf81f4b2c35c46b1d0efacd5e5ad7811ec49 SHA256 982a92c010df448cb83c2e6a8f46a4f8979d8b5708b2942485cca962621f0caf
-AUX qt-3.3.8-mysql-unload-crash.diff 1150 RMD160 02f9d2c720503ec851be2c5488b0153823ab8a62 SHA1 bb6aad81cce143c23ff7840b1d79f6b2007a0c04 SHA256 d494e386cab40f7f7a1803745c220c6104b56b73419981b20d49fc0750996076
 AUX qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503
 AUX qt-3.3.8-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3
 AUX qt-3.3.8-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 SHA1 692ada218ed717b8b2fc5f5f67cf747bb50f59e4 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407
 AUX qt-3.3.8b-cjk-fix.patch 1191 RMD160 62cc0a9db2ab42b9081967033ae75b0a0eed9e93 SHA1 24bf196b466f4b3956149b29830b158944b6a545 SHA256 94369e7cca8531ed89370480c2d5f3a0e99dbb49640df715ef33711b9d1cae4b
-AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d
 DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
 EBUILD qt-3.3.8b-r1.ebuild 10842 RMD160 1792a6bfc6a946dc5b9da2b62b9cc9a83409b132 SHA1 1e6c65520259fdfb9893c338459c5a445f94830a SHA256 18c2ebaf40f51aabe185cf923bbeb9c1672232bfd3c42fb9a2e8c340ef9627b0
@@ -27,12 +20,5 @@ EBUILD qt-4.5.1.ebuild 1365 RMD160 61613317878179108dda8873062ee6d8d51ddb33 SHA1
 EBUILD qt-4.5.2.ebuild 1361 RMD160 9968b6b881593c7fc032014e19ebc52db5fa70f8 SHA1 f5fd5cb1f7e37f855dd0e51f8fe2a715be70d899 SHA256 8ddaf9242a41aafa9a5e83a03327a51e0a0a9190f4fd7dc246e21fa125bcaefa
 EBUILD qt-4.5.3.ebuild 1364 RMD160 bba14886b02179626996889a2851baac5537e1f2 SHA1 4b0b89b7344752a4f944f29785159c49602605ac SHA256 f1695f571d88e5c3195eb1d875d21cb776cb7471e6d5af51af5be664915096f1
 EBUILD qt-4.6.0_beta1.ebuild 1353 RMD160 a395bb679f0130facd7367b7e4160b199e1142f7 SHA1 eecb24b7070682ae416cf9318185169e322e134f SHA256 d1a751c7b2559209755aeb7a74a9f47acc745334166935607bda9a8363c68216
-MISC ChangeLog 48731 RMD160 8dc7514e889d177a219e0c9ce6c4bb11ce278247 SHA1 d434f7599045b1f85bde1a72376ee1fa1663c350 SHA256 073991c7017946329b9bd9a27028bf3bce7e9821092e29f3b3bc15a75d92ea31
+MISC ChangeLog 48939 RMD160 5410978201461b128b6eb68528ef7a99764eb185 SHA1 a2172ec1eaf7484456c1d16560161fd18bdb986e SHA256 4846d0d24d6d618f64355f7e20208dc5fb2e064a2ee36121554104c77a377ef4
 MISC metadata.xml 504 RMD160 1c964085340a6c32da556e0dddba675aa599ca0c SHA1 eb798d83a888e31c15db0affca952dbdaf99ba28 SHA256 b3441d2b0fedef04315e978acea237525c7ef6899b5721174f55e82dc50bbb1d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrsP0wACgkQkKaRLQcq0GIJGwCeJjXviBFwv+qjQZHHud0muTI6
-nxgAoIflYRpW/ZS4ONszGxT2Dap/QU7G
-=uSjp
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/0037-dnd-timestamp-fix.patch b/x11-libs/qt/files/0037-dnd-timestamp-fix.patch
deleted file mode 100644
index 234e1b794705..000000000000
--- a/x11-libs/qt/files/0037-dnd-timestamp-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-qt-bugs@ issue : 38794
-bugs.kde.org number : 69519
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
- Hello,
- 
-please consider applying the attached patch. It changes XDND handling code to 
-put the drop timestamp in the right field in the XdndDrop message according 
-to http://www.newplanetsoftware.com/xdnd/ . I'm not quite sure why the code 
-has the field moved by one, and puts 1<<24 in the flags, but I see it has a 
-todo mark next to it. The last snippet of the patch changes it to match the 
-XDND spec. I tested briefly with Gtk, Mozilla and OOo, and they still work 
-with the patch.
-
-The rest of the patch is for fixing part of 
-http://bugs.kde.org/show_bug.cgi?id=69519, when the user drags some data to 
-the desktop, and desktop in response popups a dialog asking for filename. 
-Without the X user timestamp (qt-bugs@ issue 24923) being updated after the 
-drop, KWin's focus stealing prevention will refuse to activate the dialog. As 
-the XdndDrop message is kind of an user action too, the timestamp should be 
-updated.
-
---- src/kernel/qdnd_x11.cpp.sav	2004-01-05 19:18:33.000000000 +0100
-+++ src/kernel/qdnd_x11.cpp	2004-01-08 19:08:52.000000000 +0100
-@@ -81,6 +81,7 @@ extern void qt_leave_modal( QWidget *wid
- extern Window qt_x11_findClientWindow( Window, Atom, bool );
- extern Atom qt_wm_state;
- extern Time qt_x_time;
-+extern Time qt_x_user_time;
- 
- // this stuff is copied from qclb_x11.cpp
- 
-@@ -834,6 +835,9 @@ void qt_handle_xdnd_drop( QWidget *, con
- 	//       l[0], qt_xdnd_dragsource_xid );
- 	return;
-     }
-+    
-+    if( l[2] != 0 )
-+        qt_x_user_time = l[2];
-     if ( qt_xdnd_source_object )
- 	qt_xdnd_source_object->setTarget( qt_xdnd_current_widget );
- 
-@@ -1366,9 +1370,9 @@ void QDragManager::drop()
-     drop.format = 32;
-     drop.message_type = qt_xdnd_drop;
-     drop.data.l[0] = object->source()->winId();
--    drop.data.l[1] = 1 << 24; // flags
--    drop.data.l[2] = 0; // ###
--    drop.data.l[3] = qt_x_time;
-+    drop.data.l[1] = 0; // flags
-+    drop.data.l[2] = qt_x_time;
-+    drop.data.l[3] = 0;
-     drop.data.l[4] = 0;
- 
-     QWidget * w = QWidget::find( qt_xdnd_current_proxy_target );
diff --git a/x11-libs/qt/files/qsslsocket-fix.patch b/x11-libs/qt/files/qsslsocket-fix.patch
deleted file mode 100644
index b44b78f2812f..000000000000
--- a/x11-libs/qt/files/qsslsocket-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff src/network/qsslsocket_openssl.cpp src/network/qsslsocket_openssl.cpp
---- src/network/qsslsocket_openssl.cpp
-+++ src/network/qsslsocket_openssl.cpp
-@@ -188,8 +188,8 @@ struct QSslErrorList
- Q_GLOBAL_STATIC(QSslErrorList, _q_sslErrorList)
- static int q_X509Callback(int ok, X509_STORE_CTX *ctx)
- {
--    Q_UNUSED(ok);
--    _q_sslErrorList()->errors << ctx->error;
-+    if (!ok)
-+        _q_sslErrorList()->errors << ctx->error;
-     return ctx->error;
- }
- 
-@@ -297,6 +297,7 @@ bool QSslSocketBackendPrivate::initSslContext()
- 
-     // Clear the session.
-     q_SSL_clear(ssl);
-+    errorList.clear();
- 
-     // Initialize memory BIOs for encryption and decryption.
-     readBio = q_BIO_new(q_BIO_s_mem());
-@@ -570,7 +571,7 @@ bool QSslSocketBackendPrivate::testConnection()
-     _q_sslErrorList()->mutex.lock();
-     _q_sslErrorList()->errors.clear();
-     int result = (mode == QSslSocket::SslClientMode) ? q_SSL_connect(ssl) : q_SSL_accept(ssl);
--    QList<int> errorList = _q_sslErrorList()->errors;
-+    errorList << _q_sslErrorList()->errors;
-     _q_sslErrorList()->mutex.unlock();
- 
-     // Check if we're encrypted or not.
-diff src/network/qsslsocket_openssl_p.h src/network/qsslsocket_openssl_p.h
-index be57b87..00b9b45 100644
---- src/network/qsslsocket_openssl_p.h
-+++ src/network/qsslsocket_openssl_p.h
-@@ -77,6 +77,7 @@ public:
-     SSL_SESSION *session;
-     X509_STORE *certificateStore;
-     X509_STORE_CTX *certificateStoreCtx;
-+    QList<int> errorList;
- 
-     // Platform specific functions
-     void startClientEncryption();
diff --git a/x11-libs/qt/files/qt-3.3.8-mysql-unload-crash.diff b/x11-libs/qt/files/qt-3.3.8-mysql-unload-crash.diff
deleted file mode 100644
index 5f61edc672bc..000000000000
--- a/x11-libs/qt/files/qt-3.3.8-mysql-unload-crash.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/sql/drivers/mysql/qsql_mysql.cpp
-+++ src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -37,7 +37,6 @@
- #include "qsql_mysql.h"
- #include <private/qsqlextension_p.h>
- 
--#include <qapplication.h>
- #include <qdatetime.h>
- #include <qvaluevector.h>
- #include <qsqlrecord.h>
-@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
- }
- 
- /////////////////////////////////////////////////////////
--static void qServerEnd()
--{
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID >= 40000
--    mysql_server_end();
--# endif // MYSQL_VERSION_ID
--#endif // Q_NO_MYSQL_EMBEDDED
--}
- 
- static void qServerInit()
- {
-@@ -366,9 +357,7 @@ static void qServerInit()
- 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
- #  endif
-     }
--    qAddPostRoutine(qServerEnd);
-     init = TRUE;    
--    
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
- }
-@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
- 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
- 	delete ext;
-     }
-+#ifndef Q_NO_MYSQL_EMBEDDED
-+# if MYSQL_VERSION_ID > 40000
-+    mysql_server_end();
-+# endif
-+#endif
- }
- 
- bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/x11-libs/qt/files/qt-ulibc.patch b/x11-libs/qt/files/qt-ulibc.patch
deleted file mode 100644
index f188778e4bdf..000000000000
--- a/x11-libs/qt/files/qt-ulibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp        2005-01-21 17:16:05.000000000 +0000
-+++ qt-x11-free-3.3.4/src/tools/qlocale.cpp     2005-02-18 13:36:59.000000000 +0000
-@@ -55,6 +55,10 @@
- #   undef INFINITY
- #endif
- 
-+#if defined(Q_OS_LINUX) && defined(__UCLIBC__)
-+#   undef Q_OS_LINUX
-+#endif
-+
- #ifdef Q_OS_LINUX
- #    include <fenv.h>
- #endif