From c0cd58cfb11af1889838969609f7fb6a108c155e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 22 Feb 2012 21:07:40 +0000 Subject: main/qt: make qsettings mutex recursive fixes deadlock when starting up rosegarden http://developer.qt.nokia.com/forums/viewthread/10365 --- main/qt/APKBUILD | 2 +- main/qt/qsettings-recursive-global-mutex.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 main/qt/qsettings-recursive-global-mutex.patch diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index 5048583daa..e0773d5e95 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=qt pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform application and UI framework" url="http://qt.nokia.com/" arch="all" diff --git a/main/qt/qsettings-recursive-global-mutex.patch b/main/qt/qsettings-recursive-global-mutex.patch new file mode 100644 index 0000000000..229123c54f --- /dev/null +++ b/main/qt/qsettings-recursive-global-mutex.patch @@ -0,0 +1,17 @@ +Calling qsettings before constructing qapplications causes a dead-lock. + +http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932 +http://developer.qt.nokia.com/forums/viewthread/10365 + + +--- ./src/corelib/io/qsettings.cpp.orig ++++ ./src/corelib/io/qsettings.cpp +@@ -122,7 +122,7 @@ + Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc) + Q_GLOBAL_STATIC(PathHash, pathHashFunc) + Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc) +-Q_GLOBAL_STATIC(QMutex, globalMutex) ++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive)) + static QSettings::Format globalDefaultFormat = QSettings::NativeFormat; + + #ifndef Q_OS_WIN -- cgit v1.2.3