rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable solid/upnp by default, set env SOLID_UPNP=1 to re-enable (#754530, #758008, kde#259472)

This commit is contained in:
Rex Dieter 2011-12-01 19:43:03 -06:00
parent 3d3282dafe
commit b2d388a10a
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kdelibs-4.7.4-SOLID_UPNP.patch Normal file
View 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
}
}

9
kdelibs.spec
View File

@ -20,7 +20,7 @@
Summary: KDE Libraries
Version: 4.7.80
Release: 2%{?dist}
Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@ -121,6 +121,9 @@ Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
# https://git.reviewboard.kde.org/r/101231/
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
## security fix
@ -312,6 +315,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstreamable patches
%patch50 -p1 -b .knewstuff2_gpg2
%patch51 -p1 -b .uri_mimetypes
%patch52 -p1 -b .SOLID_UPNP
# upstream patches
@ -566,6 +570,9 @@ rm -rf %{buildroot}
%changelog
* Thu Dec 01 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.80-3
- disable solid/upnp by default, set env SOLID_UPNP=1 to re-enable (#754530, #758008, kde#259472)
* Tue Nov 29 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.80-2
- drop kactivities conditional