Hello community, here is the log from the commit of package kdelibs3 checked in at Fri Nov 3 19:02:51 CET 2006. -------- --- KDE/kdelibs3/kdelibs3.changes 2006-10-31 16:53:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs3/kdelibs3.changes 2006-11-03 15:33:51.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 3 15:32:59 CET 2006 - stbinner@suse.de + +- also search $XDG_DATA_DIRS/pixmaps for icons for now (#209385) + +------------------------------------------------------------------- New: ---- xdgdata-pixmap.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.Te2Vf4/_old 2006-11-03 19:02:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Te2Vf4/_new 2006-11-03 19:02:37.000000000 +0100 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.5 -Release: 20 +Release: 22 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.Te2Vf4/_old 2006-11-03 19:02:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Te2Vf4/_new 2006-11-03 19:02:37.000000000 +0100 @@ -21,7 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.5 -Release: 20 +Release: 22 Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons Provides: kdelibs3_base = 3.3 @@ -102,6 +102,7 @@ Patch112: xinerama.patch Patch113: kremoteencoding-utf8.diff Patch114: no-progress-for-beagle-status-query.diff +Patch115: xdgdata-pixmap.diff %description This package contains kdelibs, one of the basic packages of the K @@ -271,6 +272,7 @@ %patch112 -p 1 %patch113 %patch114 +%patch115 tar xfvj %SOURCE12 # # define KDE version exactly @@ -742,6 +744,8 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Fri Nov 03 2006 - stbinner@suse.de +- also search $XDG_DATA_DIRS/pixmaps for icons for now (#209385) * Tue Oct 31 2006 - coolo@suse.de - update 3_5_BRANCH.diff - even more KHTML fixes ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.Te2Vf4/_old 2006-11-03 19:02:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Te2Vf4/_new 2006-11-03 19:02:37.000000000 +0100 @@ -16,7 +16,7 @@ License: BSD License and BSD-like, Other License(s), see package Group: System/GUI/KDE Version: 3.5.5 -Release: 21 +Release: 24 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++ xdgdata-pixmap.diff ++++++ --- kdecore/kiconloader.cpp.sav 2006-10-04 17:37:59.000000000 +0200 +++ kdecore/kiconloader.cpp 2006-11-03 12:33:21.000000000 +0100 @@ -246,6 +246,8 @@ void KIconLoader::init( const QString& _ dirs += d->mpDirs->resourceDirs("pixmap"); dirs += d->mpDirs->resourceDirs("xdgdata-icon"); dirs += "/usr/share/pixmaps"; + // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. + dirs += d->mpDirs->resourceDirs("xdgdata-pixmap"); for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) d->mpDirs->addResourceDir("appicon", *it); --- kdecore/kicontheme.cpp.sav 2006-09-01 13:20:53.000000000 +0200 +++ kdecore/kicontheme.cpp 2006-11-03 12:35:01.000000000 +0100 @@ -108,6 +108,8 @@ KIconTheme::KIconTheme(const QString& na icnlibs = KGlobal::dirs()->resourceDirs("icon"); icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-icon"); icnlibs += "/usr/share/pixmaps"; + // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. + icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap"); for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { cDir = *it + name + "/"; @@ -471,6 +473,8 @@ QStringList KIconTheme::list() QStringList icnlibs = KGlobal::dirs()->resourceDirs("icon"); icnlibs += (KGlobal::dirs()->resourceDirs("xdgdata-icon")); icnlibs += "/usr/share/pixmaps"; + // These are not in the icon spec, but e.g. GNOME puts some icons there anyway. + icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap"); QStringList::ConstIterator it; for (it=icnlibs.begin(); it!=icnlibs.end(); ++it) { --- kdecore/kstandarddirs.cpp.sav 2006-08-24 15:38:00.000000000 +0200 +++ kdecore/kstandarddirs.cpp 2006-11-03 12:36:15.000000000 +0100 @@ -100,7 +100,7 @@ static const char* const types[] = {"htm "wallpaper", "lib", "pixmap", "templates", "module", "qtplugins", "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu", - "xdgdata-icon", "xdgconf-autostart", + "xdgdata-icon", "xdgconf-autostart", "xdgdata-pixmap", "kcfg", "emoticons", 0 }; static int tokenize( QStringList& token, const QString& str, @@ -1058,6 +1058,8 @@ QString KStandardDirs::kde_default(const return "applications/"; if (!strcmp(type, "xdgdata-icon")) return "icons/"; + if (!strcmp(type, "xdgdata-pixmap")) + return "pixmaps/"; if (!strcmp(type, "xdgdata-dirs")) return "desktop-directories/"; if (!strcmp(type, "xdgconf-menu")) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org