Tumbleweed wallpaper refresh

Makefile

@@ -5,7 +5,7 @@ THEME=openSUSE
 all: info openSUSE.d
 
 info:
-	echo "Make sure to have rsvg-view and GraphicsMagick installed"
+	echo "Make sure to have rsvg-view, GraphicsMagick and optipng installed"
 
 openSUSE.d: gfxboot.d gnome.d grub2.d icewm.d libreoffice.d wallpaper.d yast.d plymouth.d
 
@@ -67,25 +67,26 @@ libreoffice.d:
 	mkdir -p openSUSE/libreoffice/program
 	cp -r libreoffice/flat_logo.svg libreoffice/sofficerc libreoffice/shell openSUSE/libreoffice/program/
 	rsvg-convert libreoffice/intro.svg -o openSUSE/libreoffice/program/intro.png
+	optipng -o7 openSUSE/libreoffice/program/intro.png
 
 libreoffice.d_clean:
 	rm -rf openSUSE/libreoffice
 
 CLEAN_DEPS+=libreoffice.d_clean
 
 wallpaper.d:
+# We're now using single 4096x4096 wallpaper which is then scaled/zoomed-in as needed
+# https://github.com/openSUSE/branding/issues/161
 	mkdir -p openSUSE/wallpapers openSUSE/wallpapers/openSUSEdefault/contents/images
-	for size in 5120x3200 3840x2400 1280x1024 1600x1200 1920x1080 1920x1200 1350x1080 1440x1080; do \
-		rsvg-convert raw-theme-drop/desktop-$${size}.svg -o openSUSE/wallpapers/openSUSEdefault/contents/images/$${size}.png; \
-		optipng -o5 openSUSE/wallpapers/openSUSEdefault/contents/images/$${size}.png; \
-	done
-	for size in 1600x1200 1920x1200 1920x1080; do \
-		cp wallpapers/default-$${size}.png.desktop openSUSE/wallpapers; \
-		sed "s:@VERSION@:${VERSION}:g;s:@VERSION_NO_DOT@:${VERSION_NO_DOT}:g" wallpapers/openSUSE-$${size}.png.desktop.in > openSUSE/wallpapers/openSUSE${VERSION_NO_DOT}-$${size}.png.desktop; \
-		ln -sf openSUSE${VERSION_NO_DOT}-$${size}.png openSUSE/wallpapers/default-$${size}.png; \
-		ln -sf openSUSEdefault/contents/images/$${size}.png openSUSE/wallpapers/openSUSE${VERSION_NO_DOT}-$${size}.png; \
-	done
-	ln -s contents/images/1920x1200.png openSUSE/wallpapers/openSUSEdefault/screenshot.png
+	rsvg-convert raw-theme-drop/default-dark.svg -o openSUSE/wallpapers/openSUSEdefault/contents/images/default-dark.png
+	rsvg-convert raw-theme-drop/default.svg -o openSUSE/wallpapers/openSUSEdefault/contents/images/default.png
+	optipng -o5 openSUSE/wallpapers/openSUSEdefault/contents/images/default-dark.png
+	optipng -o5 openSUSE/wallpapers/openSUSEdefault/contents/images/default.png
+
+	cp -p kde-workspace/metadata.json openSUSE/wallpapers/openSUSEdefault/metadata.json
+
+# Screenshot.png has 1600x1200 resolution (50:50 blend of dark and light variants)
+	cp -p raw-theme-drop/screenshot.png openSUSE/wallpapers/openSUSEdefault/screenshot.png
 	cp -p kde-workspace/metadata.json openSUSE/wallpapers/openSUSEdefault/metadata.json
 
 wallpaper.d_clean:

gnome/openSUSE-default-static.xml

@@ -1,16 +1,13 @@
-<background>
- <static>
-  <!-- 100 days -->
-  <duration>8640000.0</duration>
-  <file>
-   <size width="1280" height="1024">/usr/share/wallpapers/openSUSEdefault/contents/images/1280x1024.png</size>
-   <size width="1600" height="1200">/usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.png</size>
-   <size width="1920" height="1080">/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1080.png</size>
-   <size width="1920" height="1200">/usr/share/wallpapers/openSUSEdefault/contents/images/1920x1200.png</size>
-   <size width="1350" height="1080">/usr/share/wallpapers/openSUSEdefault/contents/images/1350x1080.png</size>
-   <size width="1440" height="1080">/usr/share/wallpapers/openSUSEdefault/contents/images/1440x1080.png</size>
-   <size width="3840" height="2400">/usr/share/wallpapers/openSUSEdefault/contents/images/3840x2400.png</size>
-   <size width="5120" height="3200">/usr/share/wallpapers/openSUSEdefault/contents/images/5120x3200.png</size>
-  </file>
- </static>
-</background>
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Default Background</name>
+    <filename>/usr/share/wallpapers/openSUSEdefault/contents/images/default.png</filename>
+    <filename-dark>/usr/share/wallpapers/openSUSEdefault/contents/images/default-dark.png</filename-dark>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#63bbb2ff</pcolor>
+    <scolor>#0c2a27ff</scolor>
+  </wallpaper>
+</wallpapers>