rev 7814 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-11-06 08:51:14 +0000 (Tue, 06 Nov 2007)
New Revision: 7814

Added:
   trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff
   trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
* Merge Kubuntu load ssl patch. Thanks to Jonathan Riddell.
* Add qt-copy patch: 0196-q3toolbar-clean-rebuild.
  It fixes crash when we clear q3toolbar and rebuild it.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-11-04 23:19:09 UTC (rev 7813)
+++ trunk/packages/qt4-x11/debian/changelog	2007-11-06 08:51:14 UTC (rev 7814)
@@ -1,10 +1,18 @@
 qt4-x11 (4.3.2-2) UNRELEASED; urgency=low
 
+  [Adeodato Simó]
+
   * Do not depend or build-depend on the transitional package xlibmesa-gl-dev,
     but on libgl1-mesa-dev instead. Ditto for libglu1-xorg-dev/libglu1-mesa-dev.
 
- -- Adeodato Simó <dato at net.com.org.es>  Sun, 28 Oct 2007 22:48:17 +0100
+  [Fathi Boudra]
 
+  * Merge Kubuntu load ssl patch. Thanks to Jonathan Riddell.
+  * Add qt-copy patch: 0196-q3toolbar-clean-rebuild.
+    It fixes crash when we clear q3toolbar and rebuild it.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 06 Nov 2007 09:20:21 +0100
+
 qt4-x11 (4.3.2-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff	2007-11-06 08:51:14 UTC (rev 7814)
@@ -0,0 +1,29 @@
+qt-bugs@ issue : 182657
+bugs.kde.org number : none
+applied: yes
+author: TrollTech
+
+This patch fixes crash when we clear q3toolbar and rebuild it.
+bug reported and tested by Laurent Montel <montel at kde.org>,
+fixed by TT, patch will be in qt 4.3.3.
+
+--- a/src/qt3support/widgets/q3toolbar.cpp
++++ b/src/qt3support/widgets/q3toolbar.cpp
+@@ -489,7 +489,8 @@
+         if (child && child->isWidgetType() && !((QWidget*)child)->isWindow()
+              && child->parent() == this
+             && QLatin1String("qt_dockwidget_internal") != child->objectName()) {
+-            QWidgetItem *item = new QWidgetItem((QWidget*)child);
++            boxLayout()->addWidget((QWidget*)child);
++            QLayoutItem *item = boxLayout()->itemAt(boxLayout()->indexOf((QWidget*)child));
+             if (QToolButton *button = qobject_cast<QToolButton*>(child)) {
+                 item->setAlignment(Qt::AlignHCenter);
+                 button->setFocusPolicy(Qt::NoFocus);
+@@ -503,7 +504,6 @@
+                 }
+                 button->setAutoRaise(true);
+             }
+-            boxLayout()->addItem(item);
+             if (isVisible()) {
+                 // toolbar compatibility: we auto show widgets that
+                 // are not explicitly hidden

Added: trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff	2007-11-06 08:51:14 UTC (rev 7814)
@@ -0,0 +1,20 @@
+--- a/src/network/qsslsocket_openssl_symbols.cpp
++++ b/src/network/qsslsocket_openssl_symbols.cpp
+@@ -249,7 +249,7 @@
+         return false;
+     }
+ #else
+-    QLibrary libssl(QLatin1String("ssl"));
++    QLibrary libssl(QLatin1String("ssl.so.0.9.8"));
+     if (!libssl.load()) {
+         // Cannot find libssl
+         qWarning("QSslSocket: cannot find ssl library: %s.",
+@@ -257,7 +257,7 @@
+         return false;
+     }
+ 
+-    QLibrary libcrypto(QLatin1String("crypto"));
++    QLibrary libcrypto(QLatin1String("crypto.so.0.9.8"));
+     if (!libcrypto.load()) {
+         // Cannot find libcrypto
+         qWarning("QSslSocket: cannot find crypto library: %s.",

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2007-11-04 23:19:09 UTC (rev 7813)
+++ trunk/packages/qt4-x11/debian/patches/series	2007-11-06 08:51:14 UTC (rev 7814)
@@ -15,6 +15,7 @@
 0193-qtreeview-division-by-zero.diff
 0194-fix-moveonly-dnd-in-itemviews.diff
 0195-compositing-properties.diff
+0196-q3toolbar-clean-rebuild.diff
 
 # debian patches
 01_qmake_for_debian.diff
@@ -24,6 +25,7 @@
 05_append_qt4_target.diff
 06_qtdemo_destdir.diff
 07_trust_dpkg-arch_over_uname-m.diff
+08_load_ssl.diff
 20_mips_atomic_ops.diff
 30_arm_ftbfs_fixes.diff
 31_arm_eabi_fix.diff