4.7.4
disable solid/upnp by default, set env SOLID_UPNP=1 to re-enable (#754530, #758008, kde#259472)
This commit is contained in:
parent
0daefb6f30
commit
bbfaf15b8e
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,4 @@
|
|||||||
/kdelibs-4.7.2.tar.bz2
|
/kdelibs-4.6.5.tar.bz2
|
||||||
/kdelibs-4.7.3.tar.bz2
|
/kdelibs-4.7.3.tar.bz2
|
||||||
|
/kdelibs-4.7.4.tar.bz2
|
||||||
|
/kdelibs-4.7.80.tar.bz2
|
||||||
|
16
kdelibs-4.7.4-SOLID_UPNP.patch
Normal file
16
kdelibs-4.7.4-SOLID_UPNP.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff -up kdelibs-4.7.4/solid/solid/managerbase.cpp.UPNP kdelibs-4.7.4/solid/solid/managerbase.cpp
|
||||||
|
--- kdelibs-4.7.4/solid/solid/managerbase.cpp.UPNP 2011-12-01 19:22:43.644706401 -0600
|
||||||
|
+++ kdelibs-4.7.4/solid/solid/managerbase.cpp 2011-12-01 19:29:11.825853422 -0600
|
||||||
|
@@ -80,7 +80,11 @@ void Solid::ManagerBasePrivate::loadBack
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# if defined (HUPNP_FOUND)
|
||||||
|
- m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
|
||||||
|
+ bool solidUpnpEnabled
|
||||||
|
+ = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
|
||||||
|
+ if (solidUpnpEnabled) {
|
||||||
|
+ m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
|
||||||
|
+ }
|
||||||
|
# endif
|
||||||
|
}
|
||||||
|
}
|
12
kdelibs.spec
12
kdelibs.spec
@ -22,8 +22,8 @@
|
|||||||
%define no_libkactivities 1
|
%define no_libkactivities 1
|
||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.7.3
|
Version: 4.7.4
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -124,6 +124,9 @@ Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
|
|||||||
# https://git.reviewboard.kde.org/r/101231/
|
# https://git.reviewboard.kde.org/r/101231/
|
||||||
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
||||||
|
|
||||||
|
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
|
||||||
|
Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
|
||||||
|
|
||||||
## upstream
|
## upstream
|
||||||
|
|
||||||
## security fix
|
## security fix
|
||||||
@ -318,6 +321,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
# upstreamable patches
|
# upstreamable patches
|
||||||
%patch50 -p1 -b .knewstuff2_gpg2
|
%patch50 -p1 -b .knewstuff2_gpg2
|
||||||
%patch51 -p1 -b .uri_mimetypes
|
%patch51 -p1 -b .uri_mimetypes
|
||||||
|
%patch52 -p1 -b .SOLID_UPNP
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
|
||||||
@ -573,6 +577,10 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 01 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.4-1
|
||||||
|
- 4.7.4
|
||||||
|
- disable solid/upnp by default, set env SOLID_UPNP=1 to re-enable (#754530, #758008, kde#259472)
|
||||||
|
|
||||||
* Wed Nov 16 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.3-5
|
* Wed Nov 16 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.3-5
|
||||||
- restore halectomy patch (sans fstab-removing pieces)
|
- restore halectomy patch (sans fstab-removing pieces)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user