rdieter pushed to qt5-qtbase (master). "port qtdbusconnection_no_debug.patch from qt(4)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 25 15:52:36 UTC 2015
>From f97e9b059e7b8f67a8a67fba1038c5a0a5d13a7d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 25 Apr 2015 10:52:29 -0500
Subject: port qtdbusconnection_no_debug.patch from qt(4)
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 021e924..a30e02d 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -37,7 +37,7 @@
Summary: Qt5 - QtBase components
Name: qt5-qtbase
Version: 5.4.1
-Release: 10%{?dist}
+Release: 11%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -76,6 +76,10 @@ Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
# unconditionally enable freetype lcdfilter support
Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch
+# hack out largely useless (to users) warnings about qdbusconnection
+# (often in kde apps), keep an eye on https://git.reviewboard.kde.org/r/103699/
+Patch25: qtbase-opensource-src-5.5.1-qdbusconnection_no_debug.patch
+
# upstreamable patches
# support poll
# https://bugreports.qt-project.org/browse/QTBUG-27195
@@ -346,6 +350,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch4 -p1 -b .QTBUG-35459
%patch12 -p1 -b .enable_ft_lcdfilter
+%patch25 -p1 -b .qdbusconnection_no_debug
#patch50 -p1 -b .poll
%patch51 -p1 -b .QTBUG-42985
@@ -879,6 +884,9 @@ fi
%changelog
+* Sat Apr 25 2015 Rex Dieter <rdieter at fedoraproject.org> 5.4.1-11
+- port qtdbusconnection_no_debug.patch from qt(4)
+
* Fri Apr 17 2015 Rex Dieter <rdieter at fedoraproject.org> 5.4.1-10
- -examples: include %%{_qt5_docdir}/qdoc/examples-manifest.xml (#1212750)
diff --git a/qtbase-opensource-src-5.5.1-qdbusconnection_no_debug.patch b/qtbase-opensource-src-5.5.1-qdbusconnection_no_debug.patch
new file mode 100644
index 0000000..62ac784
--- /dev/null
+++ b/qtbase-opensource-src-5.5.1-qdbusconnection_no_debug.patch
@@ -0,0 +1,14 @@
+diff -up qtbase-opensource-src-5.4.1/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug qtbase-opensource-src-5.4.1/src/dbus/qdbusconnection.cpp
+--- qtbase-opensource-src-5.4.1/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug 2015-02-16 22:56:38.000000000 -0600
++++ qtbase-opensource-src-5.4.1/src/dbus/qdbusconnection.cpp 2015-04-25 10:48:52.099668703 -0500
+@@ -1056,8 +1056,10 @@ public:
+ // make sure this connection is running on the main thread
+ QCoreApplication *instance = QCoreApplication::instance();
+ if (!instance) {
++#ifndef QT_NO_DEBUG
+ qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.",
+ type == SessionBus ? "session" : type == SystemBus ? "system" : "generic");
++#endif
+ } else if (QDBusConnectionPrivate::d(*this)) {
+ QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread());
+ }
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qt5-qtbase.git/commit/?h=master&id=f97e9b059e7b8f67a8a67fba1038c5a0a5d13a7d
More information about the scm-commits
mailing list