rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed 

since new plasma allows to define default wallpaper, new kde-setting
  is required
This commit is contained in:
Than Ngo 2009-01-16 12:14:14 +00:00
parent 27471c5936
commit 08100005f0
2 changed files with 6 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
kdelibs-4.1.85-plasma-default-wallpaper.patch
View File

@ -1,45 +0,0 @@
diff -ur kdelibs-4.1.85/plasma/theme.cpp kdelibs-4.1.85-plasma-default-wallpaper/plasma/theme.cpp
--- kdelibs-4.1.85/plasma/theme.cpp 2008-12-10 17:12:25.000000000 +0100
+++ kdelibs-4.1.85-plasma-default-wallpaper/plasma/theme.cpp 2008-12-19 02:26:06.000000000 +0100
@@ -111,6 +111,7 @@
KColorScheme buttonColorScheme;
KConfigGroup cfg;
QFont generalFont;
+ QString globalDefaultWallpaper;
QString defaultWallpaperTheme;
QString defaultWallpaperSuffix;
int defaultWallpaperWidth;
@@ -293,6 +294,10 @@
//kDebug() << "we're going for..." << colorsFile << "*******************";
// load the wallpaper settings, if any
+ KSharedConfigPtr config = KSharedConfig::openConfig("plasmarc");
+ KConfigGroup group = KConfigGroup(config, "Defaults");
+ d->globalDefaultWallpaper = group.readEntry("wallpaper", (const char *) 0);
+
QString metadataPath(KStandardDirs::locate("data", "desktoptheme/" + theme + "/metadata.desktop"));
KConfig metadata(metadataPath);
KConfigGroup cg;
@@ -306,8 +311,8 @@
cg = d->config();
}
- d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", DEFAULT_WALLPAPER_THEME);
- d->defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX);
+ d->defaultWallpaperTheme = cg.readEntry("defaultWallpaperTheme", d->globalDefaultWallpaper.isEmpty() ? DEFAULT_WALLPAPER_THEME : (const char *) 0);
+ d->defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", d->globalDefaultWallpaper.isEmpty() ? DEFAULT_WALLPAPER_SUFFIX : (const char *) 0);
d->defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH);
d->defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT);
@@ -399,7 +404,10 @@
QString fullPath;
QString image = d->defaultWallpaperTheme;
- image.append("/contents/images/%1x%2").append(d->defaultWallpaperSuffix);
+ if (image.isEmpty() && !d->globalDefaultWallpaper.isEmpty())
+ image = d->globalDefaultWallpaper;
+ else
+ image.append("/contents/images/%1x%2").append(d->defaultWallpaperSuffix);
QString defaultImage = image.arg(d->defaultWallpaperWidth).arg(d->defaultWallpaperHeight);
if (size.isValid()) {

10
kdelibs.spec
View File

@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.96
Release: 8%{?dist}
Release: 9%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -76,8 +76,6 @@ Patch14: kdelibs-4.0.85-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
Patch18: kdelibs-4.1.72-kstandarddirs.patch
Patch20: kdelibs-4.1.70-cmake.patch
# allows to define a default wallpaper via plasmarc:wallpaper
Patch21: kdelibs-4.1.85-plasma-default-wallpaper.patch
Patch22: kdelibs-4.1.96-cmake.patch
# upstream
@ -205,7 +203,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch14 -p1 -b .libexecdir
%patch18 -p1 -b .kstandarddirs
%patch20 -p1 -b .xxcmake
%patch21 -p1 -b .plasma-default-wallpaper
%patch22 -p1 -b .kdepimlibs-cmake
# upstream patches
@ -371,6 +368,11 @@ rm -rf %{buildroot}
%changelog
* Fri Jan 16 2009 Than Ngo <than@redhat.com> - 4.1.96-9
- drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed
since new plasma allows to define default wallpaper, new kde-setting
is required
* Fri Jan 16 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.96-8
- rebuild for new OpenSSL