Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Wed Jun 3 11:35:57 CEST 2009. -------- --- KDE/kdelibs4/kdelibs4.changes 2009-06-02 23:45:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2009-06-03 08:13:32.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 3 08:11:33 CEST 2009 - beineri@opensuse.org + +- fix previous fix + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.r31635/_old 2009-06-03 11:35:43.000000000 +0200 +++ /var/tmp/diff_new_pack.r31635/_new 2009-06-03 11:35:43.000000000 +0200 @@ -39,7 +39,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.2.88svn973768 -Release: 2 +Release: 3 Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -420,6 +420,8 @@ /usr/share/mime/packages/kde.xml %changelog +* Wed Jun 03 2009 beineri@opensuse.org +- fix previous fix * Tue Jun 02 2009 dmueller@suse.de - restore files that were deleted during last checkin cycle * Wed May 27 2009 dmueller@suse.de ++++++ 4_3_BRANCH.diff ++++++ ++++ 8839 lines (skipped) ++++ between KDE/kdelibs4/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdelibs4/4_3_BRANCH.diff ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.r31635/_old 2009-06-03 11:35:43.000000000 +0200 +++ /var/tmp/diff_new_pack.r31635/_new 2009-06-03 11:35:43.000000000 +0200 @@ -80,11 +80,9 @@ d->createToolBox(); } -Index: plasma/theme.cpp -=================================================================== ---- plasma/theme.cpp.orig -+++ plasma/theme.cpp -@@ -56,7 +56,6 @@ public: +--- plasma/theme.cpp 2009/05/19 13:32:15 1.1 ++++ plasma/theme.cpp 2009/05/19 13:33:31 +@@ -56,7 +56,6 @@ : q(theme), colorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)), buttonColorScheme(QPalette::Active, KColorScheme::Button, KSharedConfigPtr(0)), @@ -92,18 +90,18 @@ defaultWallpaperSuffix(DEFAULT_WALLPAPER_SUFFIX), defaultWallpaperWidth(DEFAULT_WALLPAPER_WIDTH), defaultWallpaperHeight(DEFAULT_WALLPAPER_HEIGHT), -@@ -70,6 +69,10 @@ public: - { +@@ -71,6 +70,10 @@ generalFont = QApplication::font(); cacheTheme = cacheConfig().readEntry("CacheTheme", true); -+ + + KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); + defaultWallpaperTheme = group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME); - } - - ~ThemePrivate() -@@ -360,7 +363,10 @@ void ThemePrivate::setThemeName(const QS ++ + #ifdef Q_WS_X11 + Display *dpy = QX11Info::display(); + int screen = DefaultScreen(dpy); +@@ -380,7 +383,10 @@ cg = config(); } @@ -115,7 +113,7 @@ defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); -@@ -494,6 +500,10 @@ QString Theme::wallpaperPath(const QSize +@@ -515,6 +521,10 @@ } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org