4.14.3-2
- No such signal org::freedesktop::UPower::DeviceAdded(QDBusObjectPath) (#1056769) - use upstream _DEFAULT_SOURCE commit/patch instead
This commit is contained in:
Rex Dieter
parent
9048770b51
commit
76e5f9740b
|
|
@ -0,0 +1,57 @@
|
|||
From 9f372807041ec73cfa69017edfdb739485867d26 Mon Sep 17 00:00:00 2001
|
||||
From: Milian Wolff <mail@milianw.de>
|
||||
Date: Fri, 14 Nov 2014 16:24:52 +0100
|
||||
Subject: [PATCH 11/23] Fix warning: No such signal
|
||||
org::freedesktop::UPower::Device...
|
||||
|
||||
Backport of commit d5f6f40eb8b6a420520cb7c726959048593d2cab in
|
||||
the frameworks repository of solid.
|
||||
|
||||
The signature change can be detected at runtime using Qt's QMetaObject
|
||||
introspection mechanism. That prevents us from emitting the two
|
||||
pesky warnings at runtime, polluting our konsoles.
|
||||
|
||||
Google is full of that warning, and there is also:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1056769
|
||||
|
||||
REVIEW: 121007
|
||||
---
|
||||
solid/solid/backends/upower/upowermanager.cpp | 22 ++++++++++++----------
|
||||
1 file changed, 12 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/solid/solid/backends/upower/upowermanager.cpp b/solid/solid/backends/upower/upowermanager.cpp
|
||||
index 1bfd37a..5012f0b 100644
|
||||
--- a/solid/solid/backends/upower/upowermanager.cpp
|
||||
+++ b/solid/solid/backends/upower/upowermanager.cpp
|
||||
@@ -64,16 +64,18 @@ UPowerManager::UPowerManager(QObject *parent)
|
||||
}
|
||||
|
||||
if (serviceFound) {
|
||||
- connect(&m_manager, SIGNAL(DeviceAdded(QString)),
|
||||
- this, SIGNAL(deviceAdded(QString)));
|
||||
- connect(&m_manager, SIGNAL(DeviceRemoved(QString)),
|
||||
- this, SIGNAL(deviceRemoved(QString)));
|
||||
-
|
||||
- // for UPower >= 0.99.0, changed signature :o/
|
||||
- connect(&m_manager, SIGNAL(DeviceAdded(QDBusObjectPath)),
|
||||
- this, SLOT(onDeviceAdded(QDBusObjectPath)));
|
||||
- connect(&m_manager, SIGNAL(DeviceRemoved(QDBusObjectPath)),
|
||||
- this, SLOT(onDeviceRemoved(QDBusObjectPath)));
|
||||
+ if (m_manager.metaObject()->indexOfSignal("DeviceAdded(QDBusObjectPath)") != -1) {
|
||||
+ // for UPower >= 0.99.0, changed signature :o/
|
||||
+ connect(&m_manager, SIGNAL(DeviceAdded(QDBusObjectPath)),
|
||||
+ this, SLOT(onDeviceAdded(QDBusObjectPath)));
|
||||
+ connect(&m_manager, SIGNAL(DeviceRemoved(QDBusObjectPath)),
|
||||
+ this, SLOT(onDeviceRemoved(QDBusObjectPath)));
|
||||
+ } else {
|
||||
+ connect(&m_manager, SIGNAL(DeviceAdded(QString)),
|
||||
+ this, SIGNAL(deviceAdded(QString)));
|
||||
+ connect(&m_manager, SIGNAL(DeviceRemoved(QString)),
|
||||
+ this, SIGNAL(deviceRemoved(QString)));
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
From 8510661e0b6e79085997c2c2dc6a406113dc61df Mon Sep 17 00:00:00 2001
|
||||
From: Milian Wolff <mail@milianw.de>
|
||||
Date: Mon, 17 Nov 2014 16:13:42 +0100
|
||||
Subject: [PATCH 19/23] Define _DEFAULT_SOURCE together with _BSD_SOURCE.
|
||||
|
||||
This silences the following compile warnings with newer GNU libc:
|
||||
|
||||
warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
|
||||
|
||||
REVIEW: 121147
|
||||
---
|
||||
cmake/modules/FindKDE4Internal.cmake | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
|
||||
index 134d14f..a9aecfd 100644
|
||||
--- a/cmake/modules/FindKDE4Internal.cmake
|
||||
+++ b/cmake/modules/FindKDE4Internal.cmake
|
||||
@@ -1099,7 +1099,7 @@ endif (APPLE)
|
||||
|
||||
if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
|
||||
if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
|
||||
+ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE)
|
||||
set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
|
||||
set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
|
||||
|
||||
@@ -1114,7 +1114,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
|
||||
endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile)
|
||||
endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
if (CMAKE_C_COMPILER MATCHES "icc")
|
||||
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
|
||||
+ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE)
|
||||
set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
|
||||
set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
|
||||
endif (CMAKE_C_COMPILER MATCHES "icc")
|
||||
@@ -1218,7 +1218,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
# It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS})
|
||||
# and also because it is/was needed by glibc for snprintf to be available when building C files.
|
||||
# See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c.
|
||||
- add_definitions (-D_BSD_SOURCE)
|
||||
+ add_definitions (-D_DEFAULT_SOURCE -D_BSD_SOURCE)
|
||||
endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
|
||||
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL GNU)
|
||||
--
|
||||
1.9.3
|
||||
|
||||
17
kdelibs.spec
17
kdelibs.spec
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.14.3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -135,10 +135,6 @@ Patch49: kdelibs-solid_qt_no_debug_output.patch
|
|||
# https://git.reviewboard.kde.org/r/102439/
|
||||
Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
|
||||
|
||||
# glibc-2.20 has deprecated _BSD_SOURCE in favor of _DEFAULT_SOURCE
|
||||
# http://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes
|
||||
Patch51: kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch
|
||||
|
||||
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
|
||||
Patch52: kdelibs-4.10.0-SOLID_UPNP.patch
|
||||
|
||||
|
|
@ -164,6 +160,9 @@ Patch63: kdelibs-4.11.3-klauncher-no-glib.patch
|
|||
Patch64: kdelibs-4.13.2-invokeTerminal.patch
|
||||
|
||||
## upstream
|
||||
# 4.14 branch
|
||||
Patch111: 0011-Fix-warning-No-such-signal-org-freedesktop-UPower-De.patch
|
||||
Patch119: 0019-Define-_DEFAULT_SOURCE-together-with-_BSD_SOURCE.patch
|
||||
|
||||
# revert these commits for
|
||||
#https://bugs.kde.org/315578
|
||||
|
|
@ -379,7 +378,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||
|
||||
# upstreamable patches
|
||||
%patch50 -p1 -b .knewstuff2_gpg2
|
||||
%patch51 -p1 -b .glibc_DEFAULT_SOURCE
|
||||
%patch52 -p1 -b .SOLID_UPNP
|
||||
%patch53 -p1 -b .kjs-s390
|
||||
%patch54 -p1 -b .kjs-locale
|
||||
|
|
@ -390,6 +388,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||
%patch64 -p1 -b .invokeTerminal
|
||||
|
||||
# upstream patches
|
||||
%patch111 -p1 -b .0011
|
||||
%patch119 -p1 -b .0019
|
||||
|
||||
%patch090 -p1 -R -b .return-not-break.-copy-paste-error
|
||||
%patch091 -p1 -R -b .coding-style-fixes.patch
|
||||
%patch092 -p1 -R -b .return-application-icons-properly
|
||||
|
|
@ -725,6 +726,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 21 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.3-2
|
||||
- No such signal org::freedesktop::UPower::DeviceAdded(QDBusObjectPath) (#1056769)
|
||||
- use upstream _DEFAULT_SOURCE commit/patch instead
|
||||
|
||||
* Sat Nov 08 2014 Rex Dieter <rdieter@fedoraproject.org> 4.14.3-1
|
||||
- 4.14.3
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue