packages: kde4-kdelibs/kde4-kdelibs.spec, kde4-kdelibs/kde4-kdelibs-devicem...

[cactus]

Author: cactus                       Date: Fri Aug  5 08:52:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; added patch4 - assertion on solid/devicemanager

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs.spec (1.252 -> 1.253) , kde4-kdelibs-devicemanager_remove.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.252 packages/kde4-kdelibs/kde4-kdelibs.spec:1.253
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.252	Wed Aug  3 08:08:38 2011
+++ packages/kde4-kdelibs/kde4-kdelibs.spec	Fri Aug  5 10:52:39 2011
@@ -18,7 +18,7 @@
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
 Version:	4.7.0
-Release:	2
+Release:	3
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 Patch1:		%{name}-cacert.patch
 Patch2:		%{name}-findlzmafix.patch
 Patch3:		%{name}-aboutPLD.patch
+Patch4:		%{name}-devicemanager_remove.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -236,6 +237,7 @@
 %patch1 -p0
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
@@ -1116,6 +1118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.253  2011/08/05 08:52:39  cactus
+- rel 3; added patch4 - assertion on solid/devicemanager
+
 Revision 1.252  2011/08/03 06:08:38  baggins
 - release 2
 

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-devicemanager_remove.patch
diff -u /dev/null packages/kde4-kdelibs/kde4-kdelibs-devicemanager_remove.patch:1.1
--- /dev/null	Fri Aug  5 10:52:44 2011
+++ packages/kde4-kdelibs/kde4-kdelibs-devicemanager_remove.patch	Fri Aug  5 10:52:39 2011
@@ -0,0 +1,12 @@
+--- kdelibs-4.7.0/solid/solid/devicemanager.cpp.orig	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.7.0/solid/solid/devicemanager.cpp	2011-08-05 10:32:24.438894392 +0200
+@@ -197,8 +197,7 @@
+         // Ok, this one was requested somewhere was valid
+         // and now becomes magically invalid!
+ 
+-        if (dev) {
+-            Q_ASSERT(dev->backendObject()!=0);
++        if (dev && dev->backendObject()!=0) {
+             dev->setBackendObject(0);
+             Q_ASSERT(dev->backendObject()==0);
+         }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.252&r2=1.253&f=u