rpms/kdebase/F-7 kdebase-3.5.8-creategtkrc-gtk212.patch, NONE, 1.1 kdebase-3.5.8-gcc43.patch, NONE, 1.1 kdebase.spec, 1.265, 1.266

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22589

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.8-creategtkrc-gtk212.patch 
	kdebase-3.5.8-gcc43.patch 
Log Message:
rawhide sync


kdebase-3.5.8-creategtkrc-gtk212.patch:

--- NEW FILE kdebase-3.5.8-creategtkrc-gtk212.patch ---
--- branches/KDE/3.5/kdebase/kcontrol/krdb/krdb.cpp	2007/12/31 01:15:31	754980
+++ branches/KDE/3.5/kdebase/kcontrol/krdb/krdb.cpp	2007/12/31 01:18:45	754981
@@ -399,6 +399,7 @@
         t << "  fg[NORMAL] = " << color( group.foreground() ) << endl;
         t << "}" << endl;
         t << endl;
+        t << "widget \"gtk-tooltip\" style \"ToolTip\"" << endl;
         t << "widget \"gtk-tooltips\" style \"ToolTip\"" << endl;
         t << endl;
         

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: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-7/kdebase.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- kdebase.spec	21 Dec 2007 14:34:12 -0000	1.265
+++ kdebase.spec	14 Jan 2008 13:40:56 -0000	1.266
@@ -22,7 +22,7 @@
 %endif
 
 Version: 3.5.8
-Release: 26%{?dist}
+Release: 30%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -96,6 +96,12 @@
 Patch200: kdebase-3.5.7-kde#83974.patch
 # http://bugs.kde.org/show_bug.cgi?id=149045
 Patch201: kdebase-3.5.8-gdm-socket.patch
+# 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
 
@@ -138,10 +144,12 @@
 Requires: findutils
 Requires: mktemp
 Requires: which
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 Requires: xorg-x11-apps
 Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 %endif
+%endif
 
 BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: libxslt-devel libxml2-devel
@@ -311,6 +319,13 @@
 %if 0%{?fedora} > 7
 %patch201 -p1 -b .gdm-socket
 %endif
+%patch202 -p4 -b .gtk212
+%patch203 -p0 -b .gcc43
+
+%if "%{name}" != "kdebase"
+# hacks to omit stuff that doesn't support DO_NOT_COMPILE
+sed -i -e 's|^FONTINST_SUBDIR=kfontinst|#FONTINST_SUBDIR=kfontinst|' kcontrol/Makefile.am
+%endif
 
 # security fixes
 
@@ -335,6 +350,15 @@
 # HACK for rhel4
 #PATH=$PATH:/usr/X11R6/bin; export PATH
 
+%if "%{name}" != "kdebase"
+## I'm pretty sure on these -- Rex 
+export DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
+## add more of these when we're ready to (potentially) break some rawhide deps -- Rex
+#export DO_NOT_COMPILE="$DO_NOT_COMPILE kate konqueror konsole kscreensaver ksysguard kwin"
+## these too?  not sure
+#export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol kdesu kdialog kicker"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -478,9 +502,9 @@
 # remove conflicts with kdebase-workspace
 pushd %{buildroot}%{_bindir}
 rm -f genkdmconf kaccess kappfinder kapplymousetheme kate kbookmarkmerger \
-      kblankscrn.kss kcminit kcminit_startup kcontroledit kdebugdialog \
+      kblankscrn.kss kcheckrunning kcminit kcminit_startup kcontroledit kdebugdialog \
       kdeinstallktheme kdepasswd kdialog kdm kdmctl keditbookmarks \
-      keditfiletype kfind kfmclient khelpcenter khotkeys kinfocenter klipper \
+      keditfiletype kfind kfmclient kfontinst kfontview khelpcenter khotkeys kinfocenter klipper \
       kmenuedit konqueror konsole krandom.kss krandrtray kreadconfig ksmserver \
       ksplashsimple kstart ksysguard ksysguardd ksystraycmd ktip ktrash kwin \
       kwin_killer_helper kwin_rules_dialog kwrite kwriteconfig kxkb \
@@ -495,6 +519,7 @@
 rm -f %{buildroot}%{_datadir}/config.kcfg/klaunch.kcfg
 rm -f %{buildroot}%{_datadir}/config.kcfg/konqueror.kcfg
 rm -f %{buildroot}%{_datadir}/config.kcfg/kwin.kcfg
+rm -f %{buildroot}%{_datadir}/config/klipperrc
 rm -f %{buildroot}%{_datadir}/config/kshorturifilterrc
 rm -f %{buildroot}%{_datadir}/xsessions/kde.desktop
 # remove docs
@@ -690,6 +715,17 @@
 %{_bindir}/nspluginscan
 %{_bindir}/nspluginviewer
 %{_bindir}/startkde
+# these just moved out of kdebase3 -- Rex
+%{_bindir}/kcheckrunning
+%{_bindir}/kdesktop
+%{_bindir}/kdesktop_lock
+%{_bindir}/kdm_config
+%{_bindir}/kdm_greet
+%{_bindir}/kfontinst
+%{_bindir}/kfontview
+%{_bindir}/krootimage
+%{_bindir}/kwebdesktop
+# 
 %{_datadir}/autostart/*
 %{_datadir}/desktop-directories/*
 %{_datadir}/locale/*/entry.desktop
@@ -698,10 +734,6 @@
 %{_datadir}/templates/*
 %{_datadir}/templates/.source/*
 %{_datadir}/wallpapers/*
-%else
-# We don't have kdebase-extras in kdebase3
-%{_bindir}/kpager
-%{_bindir}/kpersonalizer
 %endif
 
 %config(noreplace) /etc/xdg/menus/*
@@ -712,19 +744,12 @@
 %{_bindir}/extensionproxy
 %{_bindir}/kasbar
 %{_bindir}/kcheckpass
-%{_bindir}/kcheckrunning
 %{_bindir}/kcontrol
 %{_bindir}/kdcop
 %{_bindir}/kdeeject
 %{_bindir}/kdeprintfax
-%{_bindir}/kdesktop
-%{_bindir}/kdesktop_lock
 %{_bindir}/kdesu
 %{_bindir}/kdesud
-%{_bindir}/kdm_config
-%{_bindir}/kdm_greet
-%{_bindir}/kfontinst
-%{_bindir}/kfontview
 %{_bindir}/khc_docbookdig.pl
 %{_bindir}/khc_htdig.pl
 %{_bindir}/khc_htsearch.pl
@@ -740,11 +765,9 @@
 %{_bindir}/kpm
 %{_bindir}/kprinter
 %{_bindir}/krdb
-%{_bindir}/krootimage
 %{_bindir}/ksplash
-%{_bindir}/kwebdesktop
 %{_bindir}/mailsettings
-%{_libdir}/libkdeinit_*.so
+%{_libdir}/libkdeinit_*.*
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
 %{_datadir}/applications/*/*
@@ -769,6 +792,7 @@
 %endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
+%exclude %{_libdir}/libkdeinit_*.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -782,10 +806,24 @@
 %dir %{_includedir}/kde/ksplash
 %{_includedir}/kde/ksplash/*
 %{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
+%exclude %{_libdir}/libkdeinit_*.*
 
 
 %changelog
+* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-30
+- f9+: omit kcontrol/kfontinst
+
+* Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-29
+- f9+: omit conflicts w/kdebase-workspace-4.0.0
+- f9+: DO_NOT_COMPILE="kappfinder kdesktop klipper kdm kmenuedit kpager kpersonalizer kscreensaver ktip nsplugins"
+- include %%_libdir/libkdeinit_*.* only in main pkg (not -libs or -devel)
+
+* 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+
+
 * Fri Dec 21 2007 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.8-26
 - fix kded crash on logout (#426459)