rpms/kdelibs/devel kdelibs-4.4.92-icon-name-qt47.patch, NONE, 1.1 .cvsignore, 1.96, 1.97 kdelibs.spec, 1.640, 1.641 sources, 1.115, 1.116 kdelibs-4.4.90-icon-name-qt47.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Wed Jul 7 17:00:45 UTC 2010


Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23943

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.4.92-icon-name-qt47.patch 
Removed Files:
	kdelibs-4.4.90-icon-name-qt47.patch 
Log Message:
* Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.92-1
- 4.5 RC2 (4.4.92)


kdelibs-4.4.92-icon-name-qt47.patch:
 kstatusnotifieritem.cpp |    7 -------
 1 file changed, 7 deletions(-)

--- NEW FILE kdelibs-4.4.92-icon-name-qt47.patch ---
diff -up kdelibs-4.4.92/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47 kdelibs-4.4.92/kdeui/notifications/kstatusnotifieritem.cpp
--- kdelibs-4.4.92/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47	2010-07-07 04:41:53.000000000 -0500
+++ kdelibs-4.4.92/kdeui/notifications/kstatusnotifieritem.cpp	2010-07-07 11:59:21.460922763 -0500
@@ -65,12 +65,6 @@ protected:
     virtual QString iconNameForAction(QAction *action)
     {
         KIcon icon(action->icon());
-#if QT_VERSION >= 0x040701
-        // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP.
-        // If you get a build error here, you need to update your pre-release
-        // of Qt 4.7.
-        return icon.isNull() ? QString() : icon.name();
-#else
         // Qt 4.6: If the icon was created by us, via our engine, serializing it
         // will let us get to the name.
         if (!icon.isNull()) {
@@ -94,7 +88,6 @@ protected:
         }
         
         return QString();
-#endif
     }
 };
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- .cvsignore	25 Jun 2010 11:14:29 -0000	1.96
+++ .cvsignore	7 Jul 2010 17:00:43 -0000	1.97
@@ -1 +1 @@
-kdelibs-4.4.90.tar.bz2
+kdelibs-4.4.92.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -p -r1.640 -r1.641
--- kdelibs.spec	25 Jun 2010 16:20:30 -0000	1.640
+++ kdelibs.spec	7 Jul 2010 17:00:44 -0000	1.641
@@ -7,7 +7,7 @@
 %define apidocs 1
 
 Summary: KDE Libraries
-Version: 4.4.90
+Version: 4.4.92
 Release: 1%{?dist}
 
 Name: kdelibs
@@ -75,7 +75,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 Patch27: kdelibs-4.4.80-no_rpath.patch
 # TEMPORARY WORKAROUND! QIcon::name() does not exists in Qt 4.7 TP
 # TODO: remove by final Qt 4.7!!!
-Patch28: kdelibs-4.4.90-icon-name-qt47.patch
+Patch28: kdelibs-4.4.92-icon-name-qt47.patch
 
 # upstreamable
 
@@ -446,6 +446,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.92-1
+- 4.5 RC2 (4.4.92)
+
 * Fri Jun 25 2010 Jaroslav Reznik <jreznik at redhat.com> - 6:4.4.90-1
 - 4.5 RC1 (4.4.90)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- sources	25 Jun 2010 11:14:38 -0000	1.115
+++ sources	7 Jul 2010 17:00:44 -0000	1.116
@@ -1 +1 @@
-c19cc1a2488fd7fd5543ff0061de9087  kdelibs-4.4.90.tar.bz2
+8eecaa9564b82041002f91d011c46cc7  kdelibs-4.4.92.tar.bz2


--- kdelibs-4.4.90-icon-name-qt47.patch DELETED ---



More information about the scm-commits mailing list