[gnome-backgrounds/wip/exalm/dark: 8/8] Group light/dark wallpapers together

[Alexander Mikhaylenko <alexm src gnome org>]

commit 5f7e8a8864b6c3c7b573f9413d8939f449329dde
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Sun Dec 12 23:54:26 2021 +0500

    Group light/dark wallpapers together
    
    Get rid of the animated adwaita wallpaper, split it into light and dark
    versions. Turn every separate dark version into <filename-dark>.

 backgrounds/adwaita-timed.xml.in     | 33 ---------------
 backgrounds/adwaita.xml.in           |  3 +-
 backgrounds/gnome-backgrounds.xml.in | 82 ++++++------------------------------
 backgrounds/meson.build              |  8 +---
 4 files changed, 17 insertions(+), 109 deletions(-)
---
diff --git a/backgrounds/adwaita.xml.in b/backgrounds/adwaita.xml.in
index 78f670f..4de08ac 100644
--- a/backgrounds/adwaita.xml.in
+++ b/backgrounds/adwaita.xml.in
@@ -3,7 +3,8 @@
 <wallpapers>
   <wallpaper deleted="false">
     <name>Default Background</name>
-    <filename>@datadir@/backgrounds/gnome/adwaita-timed.xml</filename>
+    <filename>@BACKGROUNDDIR@/adwaita-l.jpg</filename>
+    <filename-dark>@BACKGROUNDDIR@/adwaita-d.jpg</filename-dark>
     <options>zoom</options>
     <shade_type>solid</shade_type>
     <pcolor>#3465a4</pcolor>
diff --git a/backgrounds/gnome-backgrounds.xml.in b/backgrounds/gnome-backgrounds.xml.in
index f08f1b3..1f7a601 100644
--- a/backgrounds/gnome-backgrounds.xml.in
+++ b/backgrounds/gnome-backgrounds.xml.in
@@ -4,88 +4,52 @@
        <wallpaper deleted="false">
                <name>2</name>
                <filename>@BACKGROUNDDIR@/blobs-l.svg</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
-       <wallpaper deleted="false">
-               <name>2</name>
-               <filename>@BACKGROUNDDIR@/blobs-d.svg</filename>
+               <filename-dark>@BACKGROUNDDIR@/blobs-d.svg</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
 
-       <wallpaper deleted="false">
-               <name>3</name>
-               <filename>@BACKGROUNDDIR@/brush-strokes-d.jpg</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
        <wallpaper deleted="false">
                <name>3</name>
                <filename>@BACKGROUNDDIR@/brush-strokes-l.jpg</filename>
+               <filename-dark>@BACKGROUNDDIR@/brush-strokes-d.jpg</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
 
-       <wallpaper deleted="false">
-               <name>4</name>
-               <filename>@BACKGROUNDDIR@/disco-d.jpg</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
        <wallpaper deleted="false">
                <name>4</name>
                <filename>@BACKGROUNDDIR@/disco-l.jpg</filename>
+               <filename-dark>@BACKGROUNDDIR@/disco-d.jpg</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
 
-       <wallpaper deleted="false">
-               <name>5</name>
-               <filename>@BACKGROUNDDIR@/truchet-d.jpg</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
        <wallpaper deleted="false">
                <name>5</name>
                <filename>@BACKGROUNDDIR@/truchet-l.jpg</filename>
+               <filename-dark>@BACKGROUNDDIR@/truchet-d.jpg</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
-       
-       <wallpaper deleted="false">
-               <name>6</name>
-               <filename>@BACKGROUNDDIR@/pixels-d.png</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
+
        <wallpaper deleted="false">
                <name>6</name>
                <filename>@BACKGROUNDDIR@/pixels-l.png</filename>
+               <filename-dark>@BACKGROUNDDIR@/pixels-d.png</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
-       
-       <wallpaper deleted="false">
-               <name>7</name>
-               <filename>@BACKGROUNDDIR@/symbolics-d.png</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
+
        <wallpaper deleted="false">
                <name>7</name>
                <filename>@BACKGROUNDDIR@/symbolics-l.png</filename>
+               <filename-dark>@BACKGROUNDDIR@/symbolics-d.png</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
@@ -98,47 +62,29 @@
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
-       
-       <wallpaper deleted="false">
-               <name>9</name>
-               <filename>@BACKGROUNDDIR@/wood-d.jpg</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
+
        <wallpaper deleted="false">
                <name>9</name>
                <filename>@BACKGROUNDDIR@/wood-l.jpg</filename>
+               <filename-dark>@BACKGROUNDDIR@/wood-d.jpg</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
-       
-               <wallpaper deleted="false">
-               <name>10</name>
-               <filename>@BACKGROUNDDIR@/libadwaita-d.jpg</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
+
        <wallpaper deleted="false">
                <name>10</name>
                <filename>@BACKGROUNDDIR@/libadwaita-l.jpg</filename>
+               <filename-dark>@BACKGROUNDDIR@/libadwaita-d.jpg</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
        </wallpaper>
-       
-                       <wallpaper deleted="false">
-               <name>11</name>
-               <filename>@BACKGROUNDDIR@/drool-d.svg</filename>
-               <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-       </wallpaper>
+
        <wallpaper deleted="false">
                <name>11</name>
                <filename>@BACKGROUNDDIR@/drool-l.svg</filename>
+               <filename-dark>@BACKGROUNDDIR@/drool-d.svg</filename-dark>
                <options>zoom</options>
     <pcolor>#ffffff</pcolor>
     <scolor>#000000</scolor>
diff --git a/backgrounds/meson.build b/backgrounds/meson.build
index f7f6464..f8e1136 100644
--- a/backgrounds/meson.build
+++ b/backgrounds/meson.build
@@ -2,12 +2,6 @@ dataconf = configuration_data()
 dataconf.set('BACKGROUNDDIR', backgrounddir)
 dataconf.set('datadir', datadir)
 
-adwaita_timed = configure_file(
-  input: 'adwaita-timed.xml.in',
-  output: 'adwaita-timed.xml',
-  configuration: dataconf
-)
-
 backgrounds = [
   'adwaita-d.jpg',
   'adwaita-l.jpg',
@@ -32,7 +26,7 @@ backgrounds = [
   'wood-l.jpg'
 ]
 
-install_data([adwaita_timed] + backgrounds, install_dir: backgrounddir)
+install_data(backgrounds, install_dir: backgrounddir)
 
 foreach metadata : ['gnome-backgrounds.xml', 'adwaita.xml']
   configure_file(