rpms/kdelibs/F-9 kdelibs-4.2.0-gcc44-misc.patch, NONE, 1.1 kdelibs.spec, 1.380, 1.381 sources, 1.69, 1.70 kdelibs-4.2.0-kded-kdirwatch.patch, 1.1, NONE kdelibs-4.2.0-kded.patch, 1.1, NONE kdelibs-4.2.0-kmainwindow-crash.patch, 1.1, NONE kdelibs-4.2.0-plasma-qt45.patch, 1.1, NONE kdelibs-4.2.0-ssl_proxy.patch, 1.1, NONE kdelibs-4.2.1-kde#917170.patch, 1.1, NONE kdelibs-4.2.1-kde#918403.patch, 1.1, NONE kdelibs-4.2.1-kde#918654.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23958/F-9

Modified Files:
	kdelibs.spec sources 
Added Files:
	kdelibs-4.2.0-gcc44-misc.patch 
Removed Files:
	kdelibs-4.2.0-kded-kdirwatch.patch kdelibs-4.2.0-kded.patch 
	kdelibs-4.2.0-kmainwindow-crash.patch 
	kdelibs-4.2.0-plasma-qt45.patch kdelibs-4.2.0-ssl_proxy.patch 
	kdelibs-4.2.1-kde#917170.patch kdelibs-4.2.1-kde#918403.patch 
	kdelibs-4.2.1-kde#918654.patch 
Log Message:
KDE 4.2.1


kdelibs-4.2.0-gcc44-misc.patch:

--- NEW FILE kdelibs-4.2.0-gcc44-misc.patch ---
diff -up kdelibs-4.2.0/kdeui/util/fixx11h.h.orig kdelibs-4.2.0/kdeui/util/fixx11h.h
--- kdelibs-4.2.0/kdeui/util/fixx11h.h.orig	2008-05-21 13:08:51.000000000 +0200
+++ kdelibs-4.2.0/kdeui/util/fixx11h.h	2009-02-26 12:14:01.000000000 +0100
@@ -251,13 +251,21 @@ const int FontChange = XFontChange;
 #ifndef FIXX11H_index
 #define FIXX11H_index
 inline
+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
+char* Xindex( char* s, int c )
+#else
 char* Xindex( const char* s, int c )
+#endif
     {
     return index( s, c );
     }
 #undef index
 inline
+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
+char* index( char* s, int c )
+#else
 char* index( const char* s, int c )
+#endif
     {
     return Xindex( s, c );
     }
@@ -271,13 +279,21 @@ char* index( const char* s, int c )
 #ifndef FIXX11H_rindex
 #define FIXX11H_rindex
 inline
+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
+char* Xrindex( char* s, int c )
+#else
 char* Xrindex( const char* s, int c )
+#endif
     {
     return rindex( s, c );
     }
 #undef rindex
 inline
+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
+char* rindex( char* s, int c )
+#else
 char* rindex( const char* s, int c )
+#endif
     {
     return Xrindex( s, c );
     }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- kdelibs.spec	24 Feb 2009 04:28:22 -0000	1.380
+++ kdelibs.spec	27 Feb 2009 16:57:30 -0000	1.381
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.2.0
-Release: 15%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -81,23 +81,13 @@
 Patch23: kdelibs-4.2.0-gcc44-workaround.patch
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
+Patch25: kdelibs-4.2.0-gcc44-misc.patch
 
 # upstream
-# 4.3 branch
-Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
-
 # 4.2 branch
-Patch110: kdelibs-4.2.1-kde#917170.patch
-Patch111: kdelibs-4.2.1-kde#918403.patch
-Patch112: kdelibs-4.2.1-kde#918654.patch
-Patch113: kdelibs-4.2.0-kded-kdirwatch.patch
-# 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
-# fix crash in ~KMainWindow triggered by sending messages in KNode (kde#182322)
-# http://websvn.kde.org/?view=rev&revision=918169
-Patch117: kdelibs-4.2.0-kmainwindow-crash.patch
+
+# 4.3 branch
+Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -140,7 +130,7 @@
 BuildRequires: zlib-devel
 BuildRequires: libutempter-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
-%define x_deps libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
+%define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
 BuildRequires: openssh-clients
 BuildRequires: subversion
@@ -227,17 +217,13 @@
 %patch22 -p1 -b .kdepimlibs-cmake
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
+%patch25 -p1 -b .gcc44-misc
 
 # upstream patches
-%patch101 -p1 -b .AllowExternalPaths
-%patch110 -p0 -b .kde#917170
-%patch111 -p0 -b .kde#918403
-%patch112 -p0 -b .kde#918654
-%patch113 -p4 -b .kde#182472
-%patch114 -p3 -b .kde#179934
-%patch115 -p0 -b .kded
-%patch116 -p1 -b .qt45
-%patch117 -p0 -b .kmainwindow-crash
+# 4.2
+
+# 4.3
+%patch200 -p1 -b .AllowExternalPaths
 
 %build
 
@@ -370,9 +356,21 @@
 %exclude %{_kde4_configdir}/kdebugrc
 %exclude %{_kde4_configdir}/ui/ui_standards.rc
 %exclude %{_kde4_appsdir}/kdeui
+%exclude %{_kde4_configdir}/colors/40.colors
+%exclude %{_kde4_configdir}/colors/Rainbow.colors
+%exclude %{_kde4_configdir}/colors/Royal.colors
+%exclude %{_kde4_configdir}/colors/Web.colors
+%exclude %{_kde4_configdir}/ksslcalist
+%exclude %{_kde4_bindir}/preparetips
 
 %files common
 %defattr(-,root,root,-)
+%{_kde4_configdir}/colors/40.colors
+%{_kde4_configdir}/colors/Rainbow.colors
+%{_kde4_configdir}/colors/Royal.colors
+%{_kde4_configdir}/colors/Web.colors
+%{_kde4_configdir}/ksslcalist
+%{_kde4_bindir}/preparetips
 %{_kde4_configdir}/kdebug.areas
 %{_kde4_configdir}/kdebugrc
 %dir %{_kde4_configdir}/ui
@@ -403,6 +401,15 @@
 
 
 %changelog
+* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+- 4.2.1
+
+* Thu Feb 26 2009 Than Ngo <than at redhat.com> 4.2.0-17
+- fix build issue against gcc44
+
+* Wed Feb 25 2009 Than Ngo <than at redhat.com> - 4.2.0-16
+- fix files conflicts with 3.5.x
+
 * Tue Feb 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-15
 - fix crash in ~KMainWindow triggered by sending messages in KNode (kde#182322)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	27 Jan 2009 10:40:00 -0000	1.69
+++ sources	27 Feb 2009 16:57:30 -0000	1.70
@@ -1 +1 @@
-2d830a922195fefe6e073111850247ac  kdelibs-4.2.0.tar.bz2
+3ccc094df33db9d61f5ad065b9b857ac  kdelibs-4.2.1.tar.bz2


--- kdelibs-4.2.0-kded-kdirwatch.patch DELETED ---


--- kdelibs-4.2.0-kded.patch DELETED ---


--- kdelibs-4.2.0-kmainwindow-crash.patch DELETED ---


--- kdelibs-4.2.0-plasma-qt45.patch DELETED ---


--- kdelibs-4.2.0-ssl_proxy.patch DELETED ---


--- kdelibs-4.2.1-kde#917170.patch DELETED ---


--- kdelibs-4.2.1-kde#918403.patch DELETED ---


--- kdelibs-4.2.1-kde#918654.patch DELETED ---