From 90b700be51d1c289ed990b4ab26b0810849a5d77 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Mar 2016 11:48:46 -0600 Subject: [PATCH] 5.6.0-0.40.rc - respin QTBUG-51649 patch - %build: use -dbus-runtime unconditionally - drop (unused) build deps: atspi, dbus, networkmanager --- ...ll-pending-call-with-error-if-disconn.patch | 14 ++++++++++++++ qt5-qtbase.spec | 18 ++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/QTBUG-51649-QtDBus-finish-all-pending-call-with-error-if-disconn.patch b/QTBUG-51649-QtDBus-finish-all-pending-call-with-error-if-disconn.patch index a3794b8..bf13f57 100644 --- a/QTBUG-51649-QtDBus-finish-all-pending-call-with-error-if-disconn.patch +++ b/QTBUG-51649-QtDBus-finish-all-pending-call-with-error-if-disconn.patch @@ -140,3 +140,17 @@ index a53ba32..720e484 100644 -- 2.5.0 +diff -up qtbase-opensource-src-5.6.0-rc/src/dbus/dbus_minimal_p.h.QTBUG-51649 qtbase-opensource-src-5.6.0-rc/src/dbus/dbus_minimal_p.h +--- qtbase-opensource-src-5.6.0-rc/src/dbus/dbus_minimal_p.h.QTBUG-51649 2016-02-18 01:24:38.000000000 -0600 ++++ qtbase-opensource-src-5.6.0-rc/src/dbus/dbus_minimal_p.h 2016-03-11 11:40:11.176244645 -0600 +@@ -99,8 +99,10 @@ typedef dbus_uint32_t dbus_bool_t; + /* dbus-shared.h */ + #define DBUS_SERVICE_DBUS "org.freedesktop.DBus" + #define DBUS_PATH_DBUS "/org/freedesktop/DBus" ++#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local" + #define DBUS_INTERFACE_DBUS "org.freedesktop.DBus" + #define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable" ++#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local" + #define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties" + + #define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */ diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 7a1b4bb..a71ea9c 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -48,7 +48,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.6.0 -Release: 0.39.%{prerelease}%{?dist} +Release: 0.40.%{prerelease}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -158,11 +158,6 @@ BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: libtiff-devel BuildRequires: pkgconfig(alsa) -# http://bugzilla.redhat.com/1196359 -%if 0%{?fedora} || 0%{?rhel} > 6 -%global dbus -dbus-linked -BuildRequires: pkgconfig(dbus-1) -%endif BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gl) @@ -173,7 +168,6 @@ BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(ice) pkgconfig(sm) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(NetworkManager) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) %if 0%{?fedora} @@ -193,7 +187,6 @@ Provides: bundled(libxkbcommon) = 0.4.1 BuildRequires: pkgconfig(xkeyboard-config) %if 0%{?fedora} || 0%{?rhel} > 6 %define egl 1 -BuildRequires: pkgconfig(atspi-2) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glesv2) @@ -369,7 +362,7 @@ RPM macros for building Qt5 packages. %patch54 -p1 -b .arm %patch55 -p1 -b .QTBUG-51648 ## FTBFS, omit for now -#patch56 -p1 -b .QTBUG-51649 +%patch56 -p1 -b .QTBUG-51649 %patch57 -p1 -b .QTBUG-51676 %patch100 -p1 -b .sqrt @@ -468,7 +461,7 @@ export MAKEFLAGS="%{?_smp_mflags}" -release \ -shared \ -accessibility \ - %{?dbus}%{!?dbus:-dbus} \ + -dbus-runtime \ -fontconfig \ -glib \ -gtkstyle \ @@ -972,6 +965,11 @@ fi %changelog +* Fri Mar 11 2016 Rex Dieter 5.6.0-0.40.rc +- respin QTBUG-51649 patch +- %%build: use -dbus-runtime unconditionally +- drop (unused) build deps: atspi, dbus, networkmanager + * Thu Mar 10 2016 Rex Dieter 5.6.0-0.39.rc - candidate fixes for various QtDBus deadlocks (QTBUG-51648,QTBUG-51676)