rpms/kdelibs/devel kdelibs-4.2.0-plasma-qt45.patch, NONE, 1.1 kdelibs.spec, 1.433, 1.434

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22340

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.0-plasma-qt45.patch 
Log Message:
make plasma working better with qt4.5


kdelibs-4.2.0-plasma-qt45.patch:

--- NEW FILE kdelibs-4.2.0-plasma-qt45.patch ---
diff -up kdelibs-4.2.0/plasma/extender.cpp.orig kdelibs-4.2.0/plasma/extender.cpp
--- kdelibs-4.2.0/plasma/extender.cpp.orig	2009-02-12 21:55:46.000000000 +0100
+++ kdelibs-4.2.0/plasma/extender.cpp	2009-02-12 21:56:54.000000000 +0100
@@ -467,6 +467,9 @@ void ExtenderPrivate::updateBorders()
 
 void ExtenderPrivate::adjustSizeHints()
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(4, 90, 0))
+    return;
+#endif
     //FIXME: what happens in this function are some nasty workarounds for a bug in qt4.4's QGL.
     //Alexis has told me they are working on a fix for qt4.5, so this can be removed once the bug
     //has been fixed in Qt.


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- kdelibs.spec	6 Feb 2009 17:46:22 -0000	1.433
+++ kdelibs.spec	12 Feb 2009 22:24:21 -0000	1.434
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -91,6 +91,7 @@
 # http://bugs.kde.org/179934
 Patch114: kdelibs-4.2.0-ssl_proxy.patch
 Patch115: kdelibs-4.2.0-kded.patch
+Patch116: kdelibs-4.2.0-plasma-qt45.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -226,6 +227,7 @@
 %patch113 -p4 -b .kde#182472
 %patch114 -p3 -b .kde#179934
 %patch115 -p0 -b .kded
+%patch116 -p1 -b .qt45
 
 %build
 
@@ -391,6 +393,9 @@
 
 
 %changelog
+* Thu Feb 12 2009 Than Ngo <than at redhat.com> - 4.2.0-11
+- make plasma working better with qt4.5
+
 * Fri Feb 06 2009 Than Ngo <than at redhat.com> - 4.2.0-10
 - Fix duplicated applications in the K menu and in keditfiletype