rpms/kdebase3/devel kdebase-3.5.8-gcc43.patch, NONE, 1.1 kdebase3.spec, 1.15, 1.16

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3560/devel

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.8-gcc43.patch 
Log Message:
* Sat Jan 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-28
- apply upstream build fix for GCC 4.3 (--enable-final macro redefinition)

kdebase-3.5.8-gcc43.patch:

--- NEW FILE kdebase-3.5.8-gcc43.patch ---
Index: kcontrol/konqhtml/appearance.cpp
===================================================================
--- kcontrol/konqhtml/appearance.cpp	(Revision 727633)
+++ kcontrol/konqhtml/appearance.cpp	(Revision 727634)
@@ -357,6 +357,11 @@
 
     updateGUI();
     emit changed( useDefaults );
+
+#undef SET_GROUP
+#undef READ_NUM
+#undef READ_ENTRY
+#undef READ_LIST
 }
 
 void KAppearanceOptions::defaults()
Index: kcontrol/konqhtml/htmlopts.cpp
===================================================================
--- kcontrol/konqhtml/htmlopts.cpp	(Revision 727633)
+++ kcontrol/konqhtml/htmlopts.cpp	(Revision 727634)
@@ -277,6 +277,10 @@
     m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) );
 
 	 emit changed( useDefaults );
+
+#undef READ_ENTRY
+#undef READ_BOOL
+#undef SET_GROUP
 }
 
 void KMiscHTMLOptions::defaults()


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdebase3.spec	31 Dec 2007 03:19:40 -0000	1.15
+++ kdebase3.spec	5 Jan 2008 11:56:05 -0000	1.16
@@ -22,7 +22,7 @@
 %endif
 
 Version: 3.5.8
-Release: 27%{?dist}
+Release: 28%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -99,6 +99,9 @@
 # http://websvn.kde.org/?view=rev&revision=754981
 # Fix createGtkrc to set tooltip colors also for GTK+ 2.12+.
 Patch202: kdebase-3.5.8-creategtkrc-gtk212.patch
+# http://websvn.kde.org/?view=rev&revision=727634
+# GCC 4.3 build fix (--enable-final macro redefinition) by Dirk Müller
+Patch203: kdebase-3.5.8-gcc43.patch
 
 # security fixes
 
@@ -315,6 +318,7 @@
 %patch201 -p1 -b .gdm-socket
 %endif
 %patch202 -p4 -b .gtk212
+%patch203 -p0 -b .gcc43
 
 # security fixes
 
@@ -790,6 +794,9 @@
 
 
 %changelog
+* Sat Jan 05 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-28
+- apply upstream build fix for GCC 4.3 (--enable-final macro redefinition)
+
 * Mon Dec 31 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-27
 - fix createGtkrc to set tooltip colors also for GTK+ 2.12+