Hello community,
here is the log from the commit of package plasma5-openSUSE for openSUSE:Factory checked in at 2014-10-25 08:33:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.plasma5-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-openSUSE"
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-openSUSE/plasma5-openSUSE.changes 2014-10-01 11:22:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.plasma5-openSUSE.new/plasma5-openSUSE.changes 2014-10-25 11:16:02.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Oct 17 21:13:43 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Activate contrast effect for the plasma theme
+- Don't hardcode colorscheme within kdeglobals, this is redundant
+ with Plasma5 mechanism, and also has bad side-effect where users
+ can't change the scheme
+- Forward-port plasma-change-defaults.diff from kdebase4-openSUSE;
+ in adition to adjusting the patch for Plasma5, also change the
+ default launcher to Application Menu aka Kicker
+
+-------------------------------------------------------------------
New:
----
plasma-change-defaults.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.aBDSiX/_old 2014-10-25 11:16:03.000000000 +0200
+++ /var/tmp/diff_new_pack.aBDSiX/_new 2014-10-25 11:16:03.000000000 +0200
@@ -26,9 +26,15 @@
Url: http://www.opensuse.org/
Source: plasma5-openSUSE-%{version}.tar.xz
Source2: oS.diff
+Source3: plasma-change-defaults.diff
+BuildRequires: extra-cmake-modules
+BuildRequires: kdelibs4support-devel
BuildRequires: kf5-filesystem
BuildRequires: oxygen-icon-theme
+BuildRequires: plasma5-desktop
+BuildRequires: plasma5-desktop-branding-upstream
BuildRequires: plasma5-workspace
+BuildRequires: update-desktop-files
Requires: plasma5-desktop-branding-openSUSE
Requires: plasma5-workspace-branding-openSUSE
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,7 +48,7 @@
PreReq: %fillup_prereq
Requires: plasma5-desktop
Requires: plasma5-workspace-branding-openSUSE = %{version}
-Requires: ksplashx-branding-openSUSE = %{version}
+Requires: plasma5-workspace-branding-openSUSE = %{version}
Requires: susegreeter-branding-openSUSE = %{version}
Requires: wallpaper-branding-openSUSE = %{version}
Supplements: packageand(plasma5-desktop:branding-openSUSE)
@@ -59,8 +65,11 @@
Supplements: packageand(plasma5-workspace:branding-openSUSE)
Provides: plasma5-workspace-branding = %{_plasma5_branding_version}
Conflicts: otherproviders(plasma5-workspace-branding)
-Requires: wallpaper-branding-openSUSE
+Conflicts: plasma5-desktop-branding-upstream
Requires: plasma5-workspace
+Requires: wallpaper-branding-openSUSE
+Conflicts: kdebase4-openSUSE
+Conflicts: kdebase4-workspace-branding-openSUSE
%description -n plasma5-workspace-branding-openSUSE
This package contains all run-time dependencies of KDE applications.
@@ -69,11 +78,16 @@
%setup -q -n %{name}
%build
- #cmake_kf5 -d build
- #make_jobs
+ pushd greeter
+ %cmake_kf5 -d build
+ %make_jobs
+ popd
%install
- #kf5_makeinstall -C build
+ pushd greeter
+ %kf5_makeinstall -C build
+ popd
+ %suse_update_desktop_file -u %{buildroot}%{_kf5_applicationsdir}/SUSEgreeter.desktop System Documentation
mv config-files/COPYING .
cp -a config-files/* %{buildroot}
cp /usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/splash/Splash.qml %{buildroot}%{_kf5_plasmadir}/look-and-feel/org.openSUSE.desktop/contents/splash/
@@ -82,6 +96,13 @@
ln -s ../../org.kde.breeze.desktop/contents/components .
patch -p0 < %{SOURCE2}
popd
+ pushd %{buildroot}%{_kf5_plasmadir}
+ mkdir -p %{buildroot}%{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/
+ cp %{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js %{buildroot}%{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js
+ mkdir -p %{buildroot}%{_kf5_plasmadir}/shells/org.kde.plasma.desktop/contents/
+ cp %{_kf5_plasmadir}/shells/org.kde.plasma.desktop/contents/layout.js %{buildroot}%{_kf5_plasmadir}/shells/org.kde.plasma.desktop/contents/layout.js
+ patch -p0 < %{SOURCE3}
+ popd
%files
%defattr(-,root,root)
@@ -94,7 +115,12 @@
%config %{_kf5_configdir}/kdeglobals
%{_kf5_servicesdir}/
%{_kf5_sharedir}/color-schemes/
+%{_kf5_sharedir}/icons/*/*/*/*.*
%{_kf5_plasmadir}/
+%{_kf5_sharedir}/SUSEgreeter
+%{_kf5_bindir}/SUSEgreeter
+%{_kf5_applicationsdir}/SUSEgreeter.desktop
+%{_kf5_configdir}/autostart/SUSEgreeter.desktop
%files -n plasma5-desktop-branding-openSUSE
%defattr(-,root,root)
++++++ plasma-change-defaults.diff ++++++
--- ./layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js 2011-05-20 22:32:08.000000000 +0200
+++ ./layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js 2011-10-13 13:12:19.877173319 +0200
@@ -25,11 +25,11 @@ if (freeEdges["bottom"] == true) {
panel.location = "top";
}
-panel.height = screenGeometry(panel.screen).height > 1024 ? 35 : 27
+panel.height = screenGeometry(panel.screen).height > 899 ? 35 : 27
-var kickoff = panel.addWidget("org.kde.plasma.kickoff")
-kickoff.currentConfigGroup = ["Shortcuts"]
-kickoff.writeConfig("global", "Alt+F1")
+var kicker = panel.addWidget("org.kde.plasma.kicker")
+kicker.currentConfigGroup = ["Shortcuts"]
+kicker.writeConfig("global", "Alt+F1")
//panel.addWidget("org.kde.plasma.showActivityManager")
panel.addWidget("org.kde.plasma.pager")
--- ./shells/org.kde.plasma.desktop/contents/layout.js 2011-05-20 22:32:08.000000000 +0200
+++ ./shells/org.kde.plasma.desktop/contents/layout.js 2011-10-13 13:03:13.251007088 +0200
@@ -1,3 +1,29 @@
+function widgetExists(name)
+{
+ var widgets = knownWidgetTypes;
+ for (i in widgets) {
+ if (widgets[i] == name) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+var topLeftScreen = 0
+var rect = screenGeometry(0)
+
+// find our "top left" screen to put the folderview on it
+for (var i = 1; i < screenCount; ++i) {
+ var g = screenGeometry(i)
+
+ if (g.x <= rect.x && g.top >= rect.top) {
+ rect = g
+ topLeftScreen = i
+ }
+}
+
+var hasFolderview = widgetExists("org.kde.plasma.folder");
loadTemplate("org.kde.plasma.desktop.defaultPanel")
@@ -7,6 +33,12 @@ for (var i = 0; i < screenCount; ++i) {
print(desktopsArray.length);
for( var j = 0; j < desktopsArray.length; j++) {
desktopsArray[j].wallpaperPlugin = 'org.kde.image';
+
+ if (hasFolderview && i == topLeftScreen) {
+ var folderview = desktopsArray[j].addWidget("org.kde.plasma.folder")
+ folderview.writeConfig("url", "desktop:/")
+ }
+
//var clock = desktopsArray[j].addWidget("org.kde.plasma.analogclock");
}
}
++++++ plasma5-openSUSE-13.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma5-openSUSE/config-files/etc/xdg/kdeglobals new/plasma5-openSUSE/config-files/etc/xdg/kdeglobals
--- old/plasma5-openSUSE/config-files/etc/xdg/kdeglobals 2014-09-24 19:34:50.000000000 +0200
+++ new/plasma5-openSUSE/config-files/etc/xdg/kdeglobals 2014-10-17 23:57:08.000000000 +0200
@@ -2,99 +2,7 @@
rule_1=redirect,,help.opensuse.org,,irc,irc.opensuse.org,,true
rule_count=1
-[ColorEffects:Disabled]
-Color=112,111,110
-ColorAmount=0
-ColorEffect=0
-ContrastAmount=0.55
-ContrastEffect=1
-IntensityAmount=0.05
-IntensityEffect=2
-
-[ColorEffects:Inactive]
-ChangeSelectionColor=true
-Color=112,111,110
-ColorAmount=0
-ColorEffect=2
-ContrastAmount=0.1
-ContrastEffect=2
-Enable=true
-IntensityAmount=0
-IntensityEffect=0
-
-[Colors:Button]
-BackgroundAlternate=224,223,222
-BackgroundNormal=236,235,235
-DecorationFocus=53,185,171
-DecorationHover=53,185,171
-ForegroundActive=101,97,49
-ForegroundInactive=106,105,105
-ForegroundLink=17,174,0
-ForegroundNegative=191,3,3
-ForegroundNeutral=176,128,0
-ForegroundNormal=20,19,18
-ForegroundPositive=0,110,40
-ForegroundVisited=155,82,94
-
-[Colors:Selection]
-BackgroundAlternate=62,138,204
-BackgroundNormal=0,164,137
-DecorationFocus=53,185,171
-DecorationHover=53,185,171
-ForegroundActive=255,249,126
-ForegroundInactive=128,193,87
-ForegroundLink=0,49,110
-ForegroundNegative=156,14,14
-ForegroundNeutral=255,224,68
-ForegroundNormal=255,255,255
-ForegroundPositive=68,136,68
-ForegroundVisited=69,40,134
-
-[Colors:Tooltip]
-BackgroundAlternate=33,164,223
-BackgroundNormal=23,63,79
-DecorationFocus=53,185,171
-DecorationHover=53,185,171
-ForegroundActive=147,143,72
-ForegroundInactive=136,135,134
-ForegroundLink=0,87,174
-ForegroundNegative=191,3,3
-ForegroundNeutral=176,128,0
-ForegroundNormal=255,255,255
-ForegroundPositive=0,110,40
-ForegroundVisited=100,74,155
-
-[Colors:View]
-BackgroundAlternate=248,247,246
-BackgroundNormal=255,255,255
-DecorationFocus=53,185,171
-DecorationHover=53,185,171
-ForegroundActive=160,160,40
-ForegroundInactive=117,116,116
-ForegroundLink=0,164,137
-ForegroundNegative=191,3,3
-ForegroundNeutral=176,128,0
-ForegroundNormal=20,19,18
-ForegroundPositive=0,164,137
-ForegroundVisited=155,82,94
-
-[Colors:Window]
-BackgroundAlternate=218,217,216
-BackgroundNormal=232,231,231
-DecorationFocus=53,185,171
-DecorationHover=53,185,171
-ForegroundActive=23,136,26
-ForegroundInactive=106,105,105
-ForegroundLink=85,140,29
-ForegroundNegative=191,3,3
-ForegroundNeutral=176,128,0
-ForegroundNormal=20,19,18
-ForegroundPositive=41,94,25
-ForegroundVisited=155,82,94
-
[General]
-ColorScheme=openSUSE
-Name=openSUSE
shadeSortColumn=true
BrowserApplication=firefox
@@ -103,14 +11,6 @@
contrast=5
LookAndFeelPackage=org.openSUSE.desktop
-[WM]
-activeBackground=0,164,137
-activeBlend=0,164,137
-activeForeground=255,255,255
-inactiveBackground=232,231,231
-inactiveBlend=232,231,231
-inactiveForeground=20,19,18
-
[Paths]
Trash=$HOME/Desktop/Trash/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma5-openSUSE/config-files/etc/xdg/ksplashrc new/plasma5-openSUSE/config-files/etc/xdg/ksplashrc
--- old/plasma5-openSUSE/config-files/etc/xdg/ksplashrc 2014-03-02 19:49:52.000000000 +0100
+++ new/plasma5-openSUSE/config-files/etc/xdg/ksplashrc 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-[KSplash]
-Theme=ksplashx-suse
-
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/128x128/apps/SUSEgreeter.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/128x128/apps/SUSEgreeter.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/128x128/apps/Support.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/128x128/apps/Support.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/128x128/apps/mycomp.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/128x128/apps/mycomp.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/16x16/apps/SUSEgreeter.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/16x16/apps/SUSEgreeter.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/16x16/apps/Support.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/16x16/apps/Support.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/16x16/apps/mycomp.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/16x16/apps/mycomp.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/32x32/apps/SUSEgreeter.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/32x32/apps/SUSEgreeter.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/32x32/apps/Support.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/32x32/apps/Support.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/32x32/apps/mycomp.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/32x32/apps/mycomp.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/48x48/apps/SUSEgreeter.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/48x48/apps/SUSEgreeter.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/48x48/apps/Support.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/48x48/apps/Support.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/48x48/apps/mycomp.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/48x48/apps/mycomp.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/64x64/apps/SUSEgreeter.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/64x64/apps/SUSEgreeter.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/64x64/apps/Support.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/64x64/apps/Support.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/hicolor/64x64/apps/mycomp.png and new/plasma5-openSUSE/config-files/usr/share/icons/hicolor/64x64/apps/mycomp.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/oxygen/128x128/places/start-here-branding.png and new/plasma5-openSUSE/config-files/usr/share/icons/oxygen/128x128/places/start-here-branding.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/oxygen/16x16/places/start-here-branding.png and new/plasma5-openSUSE/config-files/usr/share/icons/oxygen/16x16/places/start-here-branding.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/oxygen/32x32/places/start-here-branding.png and new/plasma5-openSUSE/config-files/usr/share/icons/oxygen/32x32/places/start-here-branding.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/oxygen/48x48/places/start-here-branding.png and new/plasma5-openSUSE/config-files/usr/share/icons/oxygen/48x48/places/start-here-branding.png differ
Files old/plasma5-openSUSE/config-files/usr/share/icons/oxygen/64x64/places/start-here-branding.png and new/plasma5-openSUSE/config-files/usr/share/icons/oxygen/64x64/places/start-here-branding.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma5-openSUSE/config-files/usr/share/icons/oxygen/scalable/places/start-here-branding.svg new/plasma5-openSUSE/config-files/usr/share/icons/oxygen/scalable/places/start-here-branding.svg
--- old/plasma5-openSUSE/config-files/usr/share/icons/oxygen/scalable/places/start-here-branding.svg 1970-01-01 01:00:00.000000000 +0100
+++ new/plasma5-openSUSE/config-files/usr/share/icons/oxygen/scalable/places/start-here-branding.svg 2014-03-02 19:49:52.000000000 +0100
@@ -0,0 +1,480 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+