[kdelibs/f16] 4.7.4 disable solid/upnp by default, set env SOLID_UPNP=1 to re-enable (#754530, #758008, kde#259472

[Rex Dieter]

commit bbfaf15b8eb359fc42229febe4f4799a9f81c42d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Dec 1 19:39:46 2011 -0600

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

 .gitignore                     |    4 +++-
 kdelibs-4.7.4-SOLID_UPNP.patch |   16 ++++++++++++++++
 kdelibs.spec                   |   12 ++++++++++--
 sources                        |    2 +-
 4 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c2b015..772e28a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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.4.tar.bz2
+/kdelibs-4.7.80.tar.bz2
diff --git a/kdelibs-4.7.4-SOLID_UPNP.patch b/kdelibs-4.7.4-SOLID_UPNP.patch
new file mode 100644
index 0000000..06d6f86
--- /dev/null
+++ b/kdelibs-4.7.4-SOLID_UPNP.patch
@@ -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
+     }
+ }
diff --git a/kdelibs.spec b/kdelibs.spec
index 7f039cd..7f09213 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -22,8 +22,8 @@
 %define no_libkactivities 1
 
 Summary: KDE Libraries
-Version: 4.7.3
-Release: 5%{?dist}
+Version: 4.7.4
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -124,6 +124,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
@@ -318,6 +321,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
 
@@ -573,6 +577,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 01 2011 Rex Dieter <rdieter at 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 at fedoraproject.org> 4.7.3-5
 - restore halectomy patch (sans fstab-removing pieces)
 
diff --git a/sources b/sources
index 998b056..9d92b1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57fdc211995a6846b15dfdbf40a3e2e3  kdelibs-4.7.3.tar.bz2
+46baa210a6f5a0d6af4b7602a4b00994  kdelibs-4.7.4.tar.bz2