Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b57d493c93e6306a487e2fbce46b647634d97aa7

commit b57d493c93e6306a487e2fbce46b647634d97aa7
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Wed Nov 30 23:50:55 2011 +0100

qt4-4.7.4-3-i686

- backport patch to fix crash of libreoffice under kde4

diff --git a/source/xlib-extra/qt4/FrugalBuild 
b/source/xlib-extra/qt4/FrugalBuild
index cb6135f..63ad7fe 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -7,7 +7,7 @@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"}
pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
pkgver=4.7.4
-pkgrel=2
+pkgrel=3
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/";
depends=()
@@ -22,10 +22,12 @@ _F_archive_grepv="-tp"
up2date="Flasttar ftp://ftp.qt.nokia.com/qt/source/";
source=(ftp://ftp.qt.nokia.com/qt/source/$_F_archive_name-$pkgver.tar.gz \
frugalware.patch \
-       fix-config.tests.patch)
+       fix-config.tests.patch \
+       fdo53777.patch)
sha1sums=('af9016aa924a577f7b06ffd28c9773b56d74c939' \
'8d65e6bff36eb0b3219d30101ea7d062504aaaf8' \
-          'e2522839807839f1af77de7ccd4c9e8c7df4acd0')
+          'e2522839807839f1af77de7ccd4c9e8c7df4acd0' \
+          '652fc396b99846d1f2fe334c15f4cd4b8599806b')
export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH}
export YACC='yacc -d'

diff --git a/source/xlib-extra/qt4/fdo53777.patch 
b/source/xlib-extra/qt4/fdo53777.patch
new file mode 100644
index 0000000..0350183
--- /dev/null
+++ b/source/xlib-extra/qt4/fdo53777.patch
@@ -0,0 +1,46 @@
+--- src/corelib/global/qnamespace.qdoc.sav     2011-08-23 14:02:27.000000000 
+0200
++++ src/corelib/global/qnamespace.qdoc 2011-11-22 13:06:00.879288001 +0100
+@@ -167,6 +167,10 @@
+            attribute is true. This attribute must be set after QApplication is
+            constructed. This is only supported in Symbian^3 and later Symbian 
releases.
+
++    \value AA_X11InitThreads Calls XInitThreads() as part of the QApplication
++           construction in order to make Xlib calls thread-safe.
++
++
+     \omitvalue AA_AttributeCount
+ */
+
+--- src/corelib/global/qnamespace.h.sav        2011-08-23 14:02:27.000000000 
+0200
++++ src/corelib/global/qnamespace.h    2011-11-22 13:07:35.925288002 +0100
+@@ -544,6 +544,7 @@ public:
+         AA_MacDontSwapCtrlAndMeta = 7,
+         AA_S60DontConstructApplicationPanes = 8,
+         AA_S60DisablePartialScreenInputMode = 9,
++        AA_X11InitThreads = 10,
+
+         // Add new attributes before this line
+         AA_AttributeCount
+--- src/gui/kernel/qapplication_x11.cpp.sav    2011-08-23 14:02:27.000000000 
+0200
++++ src/gui/kernel/qapplication_x11.cpp        2011-11-22 13:06:00.881288001 
+0100
+@@ -1739,6 +1739,9 @@ void qt_init(QApplicationPrivate *priv,
+     } else {
+         // Qt controls everything (default)
+
++        if (QApplication::testAttribute(Qt::AA_X11InitThreads))
++            XInitThreads();
++
+         // Set application name and class
+         char *app_class = 0;
+         if (argv && argv[0]) {
+--- src/gui/image/qpixmap.cpp.sav      2011-08-23 14:02:27.000000000 +0200
++++ src/gui/image/qpixmap.cpp  2011-11-22 13:06:39.723288001 +0100
+@@ -99,7 +99,7 @@ static bool qt_pixmap_thread_test()
+         return false;
+     }
+ #ifndef Q_WS_WIN
+-    if (qApp->thread() != QThread::currentThread()) {
++    if (!QApplication::testAttribute(Qt::AA_X11InitThreads) && qApp->thread() 
!= QThread::currentThread()) {
+         qWarning("QPixmap: It is not safe to use pixmaps outside the GUI 
thread");
+         return false;
+     }
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to