File avoid-dbus-deadlock.diff of Package libQtWebKit-devel
--- configure
+++ configure
@@ -434,7 +434,7 @@
unset QTDIR
# the minimum version of libdbus-1 that we require:
-MIN_DBUS_1_VERSION=0.62
+MIN_DBUS_1_VERSION=0.93
# initalize internal variables
CFG_CONFIGURE_EXIT_ON_ERROR=yes
--- src/dbus/dbus.pro
+++ src/dbus/dbus.pro
@@ -58,7 +58,6 @@
qdbusutil.cpp \
qdbusintrospection.cpp \
qdbusabstractadaptor.cpp \
- qdbusthread.cpp \
qdbusinternalfilters.cpp \
qdbusmetaobject.cpp \
qdbusxmlgenerator.cpp \
--- src/dbus/qdbusintegrator.cpp
+++ src/dbus/qdbusintegrator.cpp
@@ -877,7 +877,7 @@
: QObject(p), ref(1), mode(InvalidMode), connection(0), server(0), busService(0),
rootNode(QString(QLatin1Char('/')))
{
- static const bool threads = qDBusInitThreads();
+ static const bool threads = q_dbus_threads_init_default();
static const bool debugging = !qgetenv("QDBUS_DEBUG").isEmpty();
Q_UNUSED(threads)
--- src/dbus/qdbus_symbols_p.h
+++ src/dbus/qdbus_symbols_p.h
@@ -325,6 +325,9 @@
DEFINEFUNC(dbus_bool_t , dbus_type_is_fixed, (int typecode),
(typecode), return)
+/* dbus-thread.h */
+DEFINEFUNC(dbus_bool_t , dbus_threads_init_default, (), (), return)
+
QT_END_NAMESPACE
#endif