diff --git a/plasma6-openSUSE.changes b/plasma6-openSUSE.changes index e58a5a3..ab5a9b5 100644 --- a/plasma6-openSUSE.changes +++ b/plasma6-openSUSE.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Oct 22 14:08:21 UTC 2024 - Fabian Vogt + +- Update to 6.2.2 + +------------------------------------------------------------------- +Thu Oct 17 11:07:06 UTC 2024 - Antonio Larrosa + +- Remove sddmtheme.diff patch and replace it with sed so it can + find out an available wallpaper from a list and use it since + Leap 16.0 doesn't have a 1920x1080.png wallpaper. + ------------------------------------------------------------------- Tue Oct 15 16:53:45 UTC 2024 - Fabian Vogt diff --git a/plasma6-openSUSE.spec b/plasma6-openSUSE.spec index 5363c24..d9b6088 100644 --- a/plasma6-openSUSE.spec +++ b/plasma6-openSUSE.spec @@ -20,7 +20,7 @@ # Plasma 6 pulls in Qt 5 as well, tell qml-autoreqprov what to use %global __qml_requires_opts --qtver 6 -%global plasma_version 6.2.1 +%global plasma_version 6.2.2 Name: plasma6-openSUSE Version: 84.87~git20240313T170730~9c664b7 Release: 0 @@ -32,9 +32,6 @@ URL: https://github.com/openSUSE/plasma-openSUSE # fixes directly. For files that diverge too much from upstream, # the .tar is the right place. Source: plasma-opensuse-%{version}.tar.xz -# Diff between /usr/share/sddm/themes/breeze-openSUSE -# and /usr/share/sddm/themes/breeze -Source3: sddmtheme.diff # Diff between /usr/share/plasma/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js # and /usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel/contents/layout.js Source4: panel.diff @@ -106,7 +103,19 @@ rsync -av --ignore-existing %{_kf6_plasmadir}/look-and-feel/org.kde.breeze.deskt # Same for the SDDM theme rsync -av --ignore-existing %{_datadir}/sddm/themes/breeze/ %{buildroot}%{_datadir}/sddm/themes/breeze-openSUSE/ pushd %{buildroot}%{_datadir}/sddm/themes/breeze-openSUSE -patch -p2 -i %{SOURCE3} +wpset=0 +for wp in 1920x1080.{png,jpg} 1920x1200.{png,jpg} default.{png,jpg} ; do + if [ -f "/usr/share/wallpapers/openSUSEdefault/contents/images/$wp" ]; then + sed -i -e "s,^background=.*$,background=/usr/share/wallpapers/openSUSEdefault/contents/images/$wp," theme.conf + wpset=1 + break; + fi +done + +if [ "$wpset" != 1 ]; then + echo "Error setting sddm wallpaper" + exit 1 +fi popd # Same for the default panel diff --git a/sddmtheme.diff b/sddmtheme.diff deleted file mode 100644 index fab9c0f..0000000 --- a/sddmtheme.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/breeze/theme.conf b/breeze-openSUSE/theme.conf -index 35c2a13..4d0709a 100644 ---- a/breeze/theme.conf -+++ b/breeze-openSUSE/theme.conf -@@ -5,5 +5,5 @@ - type=image - color=#1d99f3 - fontSize=10 --background=/usr/share/wallpapers/Next/contents/images/5120x2880.png -+background=/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.png - needsFullUserModel=false