rpms/kdebase/F-8 kdebase-3.5.10-libkrdb_dep.patch, NONE, 1.1 kdebase.spec, 1.298, 1.299 kdebase-3.5.9-libkrdb_dep.patch, 1.1, NONE
Kevin Kofler
kkofler at fedoraproject.org
Sun Sep 21 04:57:16 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23164/F-8
Modified Files:
kdebase.spec
Added Files:
kdebase-3.5.10-libkrdb_dep.patch
Removed Files:
kdebase-3.5.9-libkrdb_dep.patch
Log Message:
Sync from kdebase3/devel:
* Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
- fix libkrdb_dep patch not to call runRdb which is not being linked in
- don't apply libkrdb_dep patch on F8-
kdebase-3.5.10-libkrdb_dep.patch:
--- NEW FILE kdebase-3.5.10-libkrdb_dep.patch ---
diff -ur kdebase-3.5.10/kcontrol/colors/colorscm.cpp kdebase-3.5.10-libkrdb_dep/kcontrol/colors/colorscm.cpp
--- kdebase-3.5.10/kcontrol/colors/colorscm.cpp 2007-01-15 12:31:49.000000000 +0100
+++ kdebase-3.5.10-libkrdb_dep/kcontrol/colors/colorscm.cpp 2008-09-21 06:45:19.000000000 +0200
@@ -390,6 +390,7 @@
cfg2.sync();
QApplication::syncX();
+#if 0
// Notify all qt-only apps of the KDE palette changes
uint flags = KRdbExportQtColors;
if ( exportColors )
@@ -403,6 +404,7 @@
#endif
}
runRdb( flags ); // Save the palette to qtrc for KStyles
+#endif
// Notify all KDE applications
KIPC::sendMessageAll(KIPC::PaletteChanged);
diff -ur kdebase-3.5.10/kcontrol/colors/Makefile.am kdebase-3.5.10-libkrdb_dep/kcontrol/colors/Makefile.am
--- kdebase-3.5.10/kcontrol/colors/Makefile.am 2006-03-17 11:17:17.000000000 +0100
+++ kdebase-3.5.10-libkrdb_dep/kcontrol/colors/Makefile.am 2008-09-21 06:44:39.000000000 +0200
@@ -4,7 +4,7 @@
kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp
kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la
+kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
METASOURCES = colorscm.moc widgetcanvas.moc
noinst_HEADERS = colorscm.h widgetcanvas.h
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- kdebase.spec 4 Sep 2008 08:01:47 -0000 1.298
+++ kdebase.spec 21 Sep 2008 04:56:46 -0000 1.299
@@ -14,7 +14,7 @@
%define _with_samba --with-samba
Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdebase3
@@ -85,8 +85,8 @@
# modified version of kubuntu_9915_userdiskmount.diff
# fixes NTFS (#378041) and adds PolicyKit support (#428212)
Patch36: kdebase-3.5.9-userdiskmount.patch
-# don't link kcm_colors against libkrdb
-Patch37: kdebase-3.5.9-libkrdb_dep.patch
+# don't link kcm_colors against libkrdb (and don't call runRdb)
+Patch37: kdebase-3.5.10-libkrdb_dep.patch
# security fixes
@@ -315,7 +315,10 @@
%if 0%{?fedora} > 7
%patch36 -p1 -b .userdiskmount
%endif
+%if "%{name}" != "kdebase"
+# F9+ only - we do want to runRdb on F8
%patch37 -p1 -b .libkrdb_dep
+%endif
%if "%{name}" != "kdebase"
# hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -857,6 +860,10 @@
%changelog
+* Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
+- fix libkrdb_dep patch not to call runRdb which is not being linked in
+- don't apply libkrdb_dep patch on F8-
+
* Thu Aug 28 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-1
- kde-3.5.10
--- kdebase-3.5.9-libkrdb_dep.patch DELETED ---
More information about the scm-commits
mailing list