Hrvoje Senjan 2014-09-26 14:36:01 +00:00 committed by Git OBS Bridge
parent 75e314cdc8
commit 35453db475
5 changed files with 39 additions and 1311 deletions

View File

@ -0,0 +1,30 @@
From 3b2d770df42def293dbf4fed6bc2a1431b78490d Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 26 Sep 2014 15:43:22 +0200
Subject: [PATCH 1/1] take the proper default at first start
wallpaper.configuration.Image is empty at first start, but the
image wallpaper object has the proper default
BUG:339414
---
wallpapers/image/imagepackage/contents/ui/main.qml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/wallpapers/image/imagepackage/contents/ui/main.qml b/wallpapers/image/imagepackage/contents/ui/main.qml
index 3ec8391..d81bd29 100644
--- a/wallpapers/image/imagepackage/contents/ui/main.qml
+++ b/wallpapers/image/imagepackage/contents/ui/main.qml
@@ -86,6 +86,9 @@ Rectangle {
}
Component.onCompleted: {
+ if (!configuredImage && imageWallpaper.wallpaperPath) {
+ return;
+ }
imageWallpaper.addUrl(configuredImage)
if (wallpaper.pluginName == "org.kde.slideshow") {
wallpaper.setAction("next", i18nd("plasma_applet_org.kde.image","Next Wallpaper Image"),"user-desktop");
--
2.1.0

View File

@ -0,0 +1,2 @@
# we don't use find_lang macro as it doesn't searches in subdirectories
addFilter("file-not-in-%lang .*")

View File

@ -4,6 +4,10 @@ Fri Sep 26 09:20:21 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 5.0.95: - Update to 5.0.95:
* No changes since previous snapshot * No changes since previous snapshot
- Install translations - Install translations
- Add rpmlintrc file for file-not-in-%lang warnings: we don't use
find_lang macro as it doesn't searches in subdirectories
- Swap wallpaper.diff for 0001-take-the-proper-default-at-first-start.patch
it is a simpler solution (kde#339216, kde#339414)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 23 20:24:35 UTC 2014 - hrvoje.senjan@gmail.com Tue Sep 23 20:24:35 UTC 2014 - hrvoje.senjan@gmail.com

View File

@ -25,14 +25,15 @@ Group: System/GUI/KDE
Url: http://www.kde.org/ Url: http://www.kde.org/
Source: plasma-workspace-%{version}.tar.xz Source: plasma-workspace-%{version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
Source99: %{name}-rpmlintrc
# PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde # PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde
Patch0: 0001-Rename-qdbus-in-startkde.patch Patch0: 0001-Rename-qdbus-in-startkde.patch
# PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8 # PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
Patch1: create_kdehome.patch Patch1: create_kdehome.patch
# PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins # PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins
Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch
# PATCH-FIX_OPENSUSE wallpaper.diff -- kde#339216 # PATCH-FIX_UPSTREAM 0001-take-the-proper-default-at-first-start.patch -- kde#339216, kde#339414
Patch3: wallpaper.diff Patch3: 0001-take-the-proper-default-at-first-start.patch
BuildRequires: alsa-devel BuildRequires: alsa-devel
BuildRequires: baloo5-devel >= 5.0.0 BuildRequires: baloo5-devel >= 5.0.0
BuildRequires: kactivities5-devel >= 5.0.0 BuildRequires: kactivities5-devel >= 5.0.0
@ -306,7 +307,6 @@ workspace. Development files.
%files lang %files lang
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING*
%{_kf5_localedir}/ %{_kf5_localedir}/
%changelog %changelog

File diff suppressed because it is too large Load Diff