Accepting request 882892 from X11:Solus

OBS-URL: https://build.opensuse.org/request/show/882892
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/budgie-extras?expand=0&rev=2

budgie-extras-1.1.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:674fdb41a65189efeb00ba085213fdde9a2b7f09f5361a263a2bc11d1ced4159
-size 7387520

budgie-extras-1.1.0.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEHh+wAXyZiorixJimwuqoomrcWe4FAl9j2pkACgkQwuqoomrc
-We5ZqBAAghbyo4HLLfAHyQzkRmMILoeOToLZFwBJl+rkAl7sXbxNRIxDCbE6TidY
-weum13LDojaePunKgDbj429Y6mwdDv+5Z9SuGYltbzn7Q19EH2A38JpaxWCMXsQy
-BoOKpE9488GzRineBY0wpKepv+wN85V/4fdIKM/7M+eg+fL2TeQeek7V60B6UHIx
-uLCkVPClxz1h7RAbRZd/Fy1HjZb1As/JcF/374Ry1lujuDReYuAakK7bJNIPnIFn
-MCWndty6Cwqs/yvekCF+Bmy/HwRfEeP2TXbOm5UE6UkvFuyoGk/Bo4MV86zxpQiX
-YIOaDS17lRHOAkGiAS2Ds9dwrmq8kZJWbPHpXGmI9b0wD7mdlTKzOPrrEvD5YYNZ
-367WvbXFb0fFf2RnDRRGMMK1eHHtvvB+fXfe3ndN/ELX+ly8zkJgrosFFTdb4r/Y
-cutPheuesKV+SbQbt1y18Aah1JpiNePDQCM13/rOF8tus1hBU/emdTZdzs53NBRx
-I6h94vID7NacqW8s9XQTwS+xl6opYxLyzFqYwi3prRpSA2K6aFFQumjW8BTlwSCF
-t11LN6lyQt4SKd4nhvtuRVKTaNVBAdpdy6PlQcbalentVnE5PmjYwjAWXA3cFYTf
-z62Xy+kgMMki6VLWcTUIb7d2otWhQGMudw3BMk7rvtegi9eN9bI=
-=c6LV
------END PGP SIGNATURE-----

budgie-extras-1.2.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa9af5a6665c44adcacd29187dbf4810c82078b0c3aa79b8dbc121b672765733
+size 11293136

budgie-extras-1.2.0.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEHh+wAXyZiorixJimwuqoomrcWe4FAmBQ94cACgkQwuqoomrc
+We4Muw//bDLo2vx9KrDvIptKnst9dSgsmmhE8naU/NGW6Il3Z1IGnaL4U8czUx6x
+MF/2aDeGkGYspLoFbOiPVDtsusvc6kUNJQ28uXSKLQ94BIURflWFsmFxhCvFe8CW
++Vny2UH/aFfWTvRm4xZEg0+tDsxnx8mDDlRlwJ1JOfszEUxqEXCl0lfb/CeIpqmn
+74o+cVU2qDFQb8IvIz76ZCZ0FYuIpzPmO2yJ0Sw3YM8tY5rk4Wk3b6iRl6doWD4U
+waSuxVglbV041NJHazAtlExTJjJRkjD4eR9PhFFOgr2IkG0jYTwx1tlzPU3q4gV9
+wZHsl3IuDB2uoEhFc20CXDa5ntVLOn1fLd/AaR1eu6S3OjdYyhdTHZnKCI0VknMC
+FqgbG6xVqUfqunesLG/WcAva9nHQuowSjz3K08fZMPfbht4ofEsIRHcoPlyXr/+5
+6ISdWubFFw6l6lWqH7XIpJdHe8r365u838bGdVRdNH8aVjgwGeCeRGj7O7lck4AG
+c67UnfAo8MbkKQUkwZZozyucuecy43UOCWwefhQ9GvdzAP4o9e4l/qFWTq+aHPm7
+L9FKPiwsljnksP+ShO6vftSWuhNN88e4wkNMIIaD1tlnuqAFkl1Y1JefqpEjjbkM
+fNYGdzl7hadAwMgVriqtyEjYHSaDokEwO0v71TsoePE1zm+jwm4=
+=nn7o
+-----END PGP SIGNATURE-----

budgie-extras.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sun Apr  4 10:38:16 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Update to version 1.2.0 "Magic Windows"
+  * QuickChar installation is now easier on other than Debian
+  * Bug fix for the applications menu so that rollover menus 
+    settings is remembered on logon.
+  * The number of cities that our weather applet can now 
+    search has increased from 22.6k to 185k
+  * Applets now support stateless based distros and 
+    the XDG autostart path can both be defined 
+    at compilation time
+  * Bug fix for the brightness applet to not change 
+    the popup width when percentage changes between 100% and 0%
+  * Translations have been updated from all our 
+    Transifex translators
+  * Take-a-break applet now depends on libnotify-dev
+- Remove executable-location.patch: upstreamed
+
 -------------------------------------------------------------------
 Wed Feb 17 11:13:22 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 

budgie-extras.spec

@@ -15,8 +15,9 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 Name:           budgie-extras
-Version:        1.1.0
+Version:        1.2.0
 Release:        0
 Summary:        Additional Budgie Desktop enhancements for user experience
 License:        GPL-3.0-or-later
@@ -26,28 +27,27 @@ Source:         %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 Source1:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
 # PATCH-FIX-OPENSUSE Change all shebang lines to /usr/bin/python3
-Patch:          python3-shebangs.patch
+Patch0:         python3-shebangs.patch
-# PATCH-FIX-OPENSUSE Correct location of executable in desktop file
-Patch1:         executable-location.patch
 Patch2:         xdg-config.patch
+BuildRequires:  fdupes
+BuildRequires:  intltool
 BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  vala
-BuildRequires:  intltool
-BuildRequires:  fdupes
 BuildRequires:  pkgconfig(budgie-1.0)
 BuildRequires:  pkgconfig(gee-0.8)
-BuildRequires:  pkgconfig(granite)
-BuildRequires:  pkgconfig(libsoup-2.4)
-BuildRequires:  pkgconfig(json-glib-1.0)
-BuildRequires:  pkgconfig(libgnome-menu-3.0)
-BuildRequires:  pkgconfig(libwnck-3.0)
-BuildRequires:  pkgconfig(keybinder-3.0)
 BuildRequires:  pkgconfig(gnome-settings-daemon)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(keybinder-3.0)
+BuildRequires:  pkgconfig(libgnome-menu-3.0)
+BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libnm)
 BuildRequires:  pkgconfig(libnma)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libwnck-3.0)
 BuildRequires:  pkgconfig(plank)
-BuildRequires:  pkgconfig(libhandy-1)
 # All applets
 Recommends:     budgie-app-launcher-applet
 Recommends:     budgie-brightness-controller-applet
@@ -81,6 +81,7 @@ Additional Budgie Desktop enhancements for the user experience
 
 %package -n budgie-app-launcher-applet
 Summary:        App Launcher applet
+Group:          System/GUI/Other
 Requires:       python3-gobject-Gdk
 
 %description -n budgie-app-launcher-applet
@@ -88,6 +89,7 @@ App Launcher is a Budgie Desktop applet for productivity. This applet lists your
 
 %package -n budgie-brightness-controller-applet
 Summary:        Brightness controller applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 
 %description -n budgie-brightness-controller-applet
@@ -95,9 +97,10 @@ Brightness Controller is a Budgie Desktop applet for productivity.
 
 %package -n budgie-clockworks-applet
 Summary:        Clockworks applet
+Group:          System/GUI/Other
 Requires:       python3-CairoSVG
-Requires: python3-gobject-Gdk
 Requires:       python3-Pillow
+Requires:       python3-gobject-Gdk
 Requires:       python3-svgwrite
 
 %description -n budgie-clockworks-applet
@@ -107,6 +110,7 @@ Timezones can be looked up from the applet's popup menu.
 
 %package -n budgie-countdown-applet
 Summary:        Countdown applet
+Group:          System/GUI/Other
 Requires:       python3-gobject-Gdk
 Requires:       python3-psutil
 Requires:       sound-theme-freedesktop
@@ -119,6 +123,7 @@ The applet also offers the option to overrule possible user settings on suspend,
 
 %package -n budgie-dropby-applet
 Summary:        DropBy applet
+Group:          System/GUI/Other
 Requires:       python3-gobject-Gdk
 Requires:       python3-psutil
 Requires:       python3-pyudev
@@ -133,12 +138,14 @@ The info shows the free space on the volume.
 
 %package daemon
 Summary:        Daemon for Budgie Extras
+Group:          System/GUI/Other
 
 %description daemon
 This on logon process manages keyboard shortcuts delivered via .bde files for various extras-plugins.
 
 %package -n budgie-fuzzyclock-applet
 Summary:        Fuzzyclock Applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 
 %description -n budgie-fuzzyclock-applet
@@ -146,9 +153,10 @@ This applet shows the time in a Fuzzy Way.
 
 %package -n budgie-hotcorners-applet
 Summary:        Hotcorners applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
-Requires: dconf
 Requires:       budgie-screensaver
+Requires:       dconf
 Requires:       libnotify-tools
 Requires:       xdotool
 
@@ -159,6 +167,7 @@ This is the new Vala-based hotcorners applet.
 
 %package -n budgie-kangaroo-applet
 Summary:        Kangaroo applet
+Group:          System/GUI/Other
 Requires:       python3-gobject-Gdk
 Requires:       python3-psutil
 Requires:       xdg-utils
@@ -169,6 +178,7 @@ Kangaroo is an applet for quick & easy browsing, across (possibly) many director
 
 %package -n budgie-keyboard-autoswitch-applet
 Summary:        Keyboard autoswitch applet
+Group:          System/GUI/Other
 Requires:       python3-gobject-Gdk
 Requires:       python3-psutil
 Requires:       wmctrl
@@ -188,6 +198,7 @@ Subsequently, simply set a different layout, with the application's window in fr
 
 %package -n budgie-network-manager-applet
 Summary:        Network manager applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 
 %description -n budgie-network-manager-applet
@@ -195,6 +206,7 @@ This is a fork of Wingpanel Network Indicator, ported to budgie desktop
 
 %package -n budgie-previews
 Summary:        Previews applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-daemon
 Requires:       xinput
 Requires:       xprintidle
@@ -204,6 +216,7 @@ Provides window previews capabilities for the Budgie Desktop
 
 %package -n budgie-quickchar
 Summary:        Quickchar applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-daemon
 Requires:       python3-gobject-Gdk
 Requires:       python3-pyperclip
@@ -224,6 +237,7 @@ QuickChar is activated via the Budgie Menu.
 
 %package -n budgie-quicknote-applet
 Summary:        Quicknote applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 
 %description -n budgie-quicknote-applet
@@ -233,6 +247,7 @@ QuickNote autosaves the text while writing, and comes with a ten- level undo/red
 
 %package -n budgie-recentlyused-applet
 Summary:        Recently Used applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 Requires:       xdg-utils
 
@@ -241,6 +256,7 @@ Show (Gtk applications') recently used items in a menu.
 
 %package -n budgie-rotation-lock-applet
 Summary:        Rotationlock applet
+Group:          System/GUI/Other
 Requires:       python3-gobject-Gdk
 
 %description -n budgie-rotation-lock-applet
@@ -248,6 +264,7 @@ RotationLock is a simple applet that lets you toggle the "Rotation Lock" feature
 
 %package -n budgie-showtime-applet
 Summary:        Showtime applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 Requires:       dconf
 
@@ -257,10 +274,11 @@ Textcolor of both can be set separately from the applet's menu.
 
 %package -n budgie-takeabreak-applet
 Summary:        Takeabreak applet
-Requires: python3-gobject-Gdk
+Group:          System/GUI/Other
 Requires:       iceauth
-Requires: sessreg
+Requires:       python3-gobject-Gdk
 Requires:       rgb
+Requires:       sessreg
 Requires:       xcmsdb
 Requires:       xgamma
 Requires:       xhost
@@ -282,6 +300,7 @@ The applet can be accessed quickly from the panel to temporarily switch it off.
 
 %package -n budgie-trash-applet
 Summary:        Trash applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 
 %description -n budgie-trash-applet
@@ -289,6 +308,7 @@ Trash is a Budgie Desktop applet for productivity.
 
 %package -n budgie-visualspace-applet
 Summary:        Visualspace applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 
 %description -n budgie-visualspace-applet
@@ -297,6 +317,7 @@ The applet includes a menu to navigate to either one of the windows or their cor
 
 %package -n budgie-wallstreet
 Summary:        Wallstreet applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 
 %description -n budgie-wallstreet
@@ -304,6 +325,7 @@ Budgie WallStreet is a mini-app to switch wallpapers on regular intervalls.
 
 %package -n budgie-weathershow-applet
 Summary:        Weathershow applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 Requires:       dconf
 Requires:       procps
@@ -313,10 +335,12 @@ WeatherShowII is a completely rewritten version of the existing python WeatherSh
 
 %package -n budgie-window-mover-applet
 Summary:        Window Mover applet
+Group:          System/GUI/Other
 Requires:       dconf
 Requires:       python3-gobject-Gdk
 Requires:       python3-psutil
 Requires:       wmctrl
+Requires:       xdotool
 Requires:       xdpyinfo
 Requires:       xev
 Requires:       xlsatoms
@@ -325,15 +349,15 @@ Requires: xlsfonts
 Requires:       xprop
 Requires:       xvinfo
 Requires:       xwininfo
-Requires: xdotool
 
 %description -n budgie-window-mover-applet
 Budgie WindoMover is an application (applet) to quickly move windows to any of the other workspaces.
 
 %package -n budgie-window-shuffler
 Summary:        Window shuffler applet
-Requires: budgie-extras-lang
+Group:          System/GUI/Other
 Requires:       budgie-extras-daemon
+Requires:       budgie-extras-lang
 Requires:       xdpyinfo
 Requires:       xev
 Requires:       xlsatoms
@@ -348,6 +372,7 @@ GUI and keyboard friendly window arranger for the budgie desktop
 
 %package -n budgie-workspace-overview-applet
 Summary:        Workspace Overview applet
+Group:          System/GUI/Other
 Requires:       python3-gobject-Gdk
 Requires:       python3-psutil
 Requires:       wmctrl
@@ -365,6 +390,7 @@ An applet to have quick access to all windows across all workspaces
 
 %package -n budgie-workspace-stopwatch-applet
 Summary:        Workspace stopwatch applet
+Group:          System/GUI/Other
 Requires:       python3-gobject-Gdk
 
 %description -n budgie-workspace-stopwatch-applet
@@ -373,6 +399,7 @@ Workspaces can be freely named, custom names and all data are rmembered, also af
 
 %package -n budgie-workspace-wallpaper-applet
 Summary:        Workspace Wallpaper applet
+Group:          System/GUI/Other
 Requires:       budgie-extras-lang
 
 %description -n budgie-workspace-wallpaper-applet
@@ -433,7 +460,7 @@ Budgie Wallpaper Workspace Switcher is an application (applet) to show a differe
 %{_libdir}/budgie-extras-daemon
 %{_datadir}/budgie-extras-daemon
 %{_bindir}/budgie-extras-daemon
-%{_mandir}/man1/budgie-extras-daemon.1.gz
+%{_mandir}/man1/budgie-extras-daemon.1%{?ext_man}
 %{_distconfdir}/xdg/autostart/budgie-extras-daemon.desktop
 
 %files -n budgie-app-launcher-applet
@@ -496,7 +523,7 @@ Budgie Wallpaper Workspace Switcher is an application (applet) to show a differe
 %{_datadir}/applications/quickchar.desktop
 %{_distconfdir}/xdg/autostart/quickchar-autostart.desktop
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.quickchar.gschema.xml
-%{_mandir}/man1/quickchar.1.gz
+%{_mandir}/man1/quickchar.1%{?ext_man}
 
 %files -n budgie-quicknote-applet
 %{_datadir}/pixmaps/budgie-quicknote-symbolic.svg
@@ -554,6 +581,7 @@ Budgie Wallpaper Workspace Switcher is an application (applet) to show a differe
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.windowshuffler.gschema.xml
 %{_distconfdir}/xdg/autostart/shufflerdaemon-autostart.desktop
 %{_distconfdir}/xdg/autostart/shufflergui-autostart.desktop
+%{_distconfdir}/xdg/autostart/layoutspopup-autostart.desktop
 
 %files -n budgie-workspace-overview-applet
 %{_datadir}/pixmaps/ws*-symbolic.svg

executable-location.patch

@@ -1,90 +0,0 @@
-From 485df21d0225df72b50db062b6ca97d53fa6ce7c Mon Sep 17 00:00:00 2001
-From: Callum Farmer <callumjfarmer13@gmail.com>
-Date: Sat, 26 Sep 2020 14:15:39 +0100
-Subject: [PATCH] Don't hardcode the path to the QuickChar install
-
----
- budgie-quickchar/quickchar/data/meson.build                              |  9 +++--
- ...quickchar.desktop => quickchar.desktop.in} |  2 +-
- budgie-quickchar/quickchar/data/subst.py                                 | 34 +++++++++++++++++++
- 3 files changed, 41 insertions(+), 4 deletions(-)
- rename budgie-quickchar/quickchar/data/{quickchar.desktop => quickchar.desktop.in} (78%)
- create mode 100644 budgie-quickchar/quickchar/data/subst.py
-
-diff --git a/budgie-quickchar/quickchar/data/meson.build b/budgie-quickchar/quickchar/data/meson.build
-index 76cada6..8bfd416 100644
---- a/budgie-quickchar/quickchar/data/meson.build
-+++ b/budgie-quickchar/quickchar/data/meson.build
-@@ -9,9 +9,13 @@ install_data(
-     install_dir: join_paths(sysconfdir, 'xdg', 'autostart')
- )
- 
--install_data(
--    'quickchar.desktop',
--    install_dir: join_paths(datadir, 'applications')
-+substprog = find_program('subst.py')
-+desktopfile = custom_target('desktopfile',
-+  output : 'quickchar.desktop',
-+  input : 'quickchar.desktop.in',
-+  command : [substprog, '@INPUT@', pkgdatadir, '@OUTPUT@'],
-+  install : true,
-+  install_dir : join_paths(datadir, 'applications')
- )
- 
- install_data(
-diff --git a/budgie-quickchar/quickchar/data/quickchar.desktop b/budgie-quickchar/quickchar/data/quickchar.desktop.in
-similarity index 78%
-rename from budgie-quickchar/quickchar/data/quickchar.desktop
-rename to budgie-quickchar/quickchar/data/quickchar.desktop.in
-index 04ed7cd..d3e80b9 100644
---- a/budgie-quickchar/quickchar/data/quickchar.desktop
-+++ b/budgie-quickchar/quickchar/data/quickchar.desktop.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Type=Application
- Name=QuickChar Control
--Exec=/usr/lib/quickchar/quickchar control
-+Exec=PATH_LOC/quickchar control
- Icon=gnome-characters
- Categories=GNOME;GTK;Utility;
- Keywords=characters;unicode;punctuation;letters;
-diff --git a/budgie-quickchar/quickchar/data/subst.py b/budgie-quickchar/quickchar/data/subst.py
-new file mode 100644
-index 0000000..1f159c4
---- /dev/null
-+++ b/budgie-quickchar/quickchar/data/subst.py
-@@ -0,0 +1,34 @@
-+#!/usr/bin/python3
-+
-+import os
-+import subprocess
-+import sys
-+
-+inputfile = sys.argv[1]
-+replacetext = sys.argv[2]
-+outputfile = sys.argv[3]
-+args = len(sys.argv)
-+if args == 5:
-+    podir = sys.argv[4]
-+
-+# Read in the file
-+with open(inputfile, 'r') as file:
-+    filedata = file.read()
-+
-+# Replace the target string
-+filedata = filedata.replace('PATH_LOC', replacetext)
-+
-+# Write the file out again
-+if args == 5:
-+    staging = "staging"
-+else:
-+    staging = ""
-+with open(outputfile + staging, 'w') as file:
-+    file.write(filedata)
-+
-+if args == 5:
-+    subprocess.run(['intltool-merge',
-+                    '--desktop-style',
-+                    podir,
-+                    outputfile + staging,
-+                    outputfile])

xdg-config.patch

@@ -1,80 +1,18 @@
-From b37307248abfba6215677b662fe7abc39ec73ec8 Mon Sep 17 00:00:00 2001
+From 4e5d5149f7fc67408c994e84a1cf0ccf74f82289 Mon Sep 17 00:00:00 2001
-From: Callum Farmer <callumjfarmer13@gmail.com>
+From: Algent Albrahimi <46356616+algent-al@users.noreply.github.com>
-Date: Sat, 24 Oct 2020 11:57:03 +0100
+Date: Sun, 21 Mar 2021 23:38:47 +0100
-Subject: [PATCH] Make xdg directory configurable
+Subject: [PATCH] Add layoutspopup-autostart to configurable xdg dir (#382)
 
 ---
- budgie-extras-daemon/src/meson.build    |  2 +-
+ budgie-window-shuffler/data/meson.build | 2 +-
- budgie-visualspace/data/meson.build     |  3 +--
+ 1 file changed, 1 insertion(+), 1 deletion(-)
- budgie-wallstreet/data/meson.build      |  2 +-
- budgie-window-shuffler/data/meson.build |  4 ++--
- budgie-wpreviews/data/meson.build       |  5 ++---
- meson.build                             | 14 ++++++++++++++
- meson_options.txt                       |  2 ++
- 7 files changed, 23 insertions(+), 9 deletions(-)
 
-diff --git a/budgie-extras-daemon/src/meson.build b/budgie-extras-daemon/src/meson.build
-index f176202..8592222 100644
---- a/budgie-extras-daemon/src/meson.build
-+++ b/budgie-extras-daemon/src/meson.build
-@@ -6,7 +6,8 @@
-     output : 'budgie-extras-daemon.desktop',
-     command : [intltool, '--desktop-style', podir, '@INPUT@', '@OUTPUT@'],
-     install : true,
--    install_dir : join_paths(get_option('sysconfdir'), 'xdg', 'autostart'))
-+    install_dir : xdg_appdir
-+)
-
- subdir('config')
-
-
-diff --git a/budgie-visualspace/data/meson.build b/budgie-visualspace/data/meson.build
-index bc3734a..2eb22f9 100644
---- a/budgie-visualspace/data/meson.build
-+++ b/budgie-visualspace/data/meson.build
-@@ -4,7 +4,6 @@ install_data(
-     install_dir: PIXMAPS_DIR
- )
- 
--AUTOSTART_LOC=join_paths(sysconfdir, 'xdg', 'autostart')
- substprog = find_program('subst.py')
- 
- mytarget = custom_target('autoworkspace',
-@@ -12,5 +11,5 @@ mytarget = custom_target('autoworkspace',
-   input : 'visualspace-autostart.desktop.in',
-   command : [substprog, '@INPUT@', LIB_INSTALL_DIR, '@OUTPUT@'],
-   install : true,
--  install_dir : AUTOSTART_LOC
-+  install_dir : xdg_appdir
- )
-diff --git a/budgie-wallstreet/data/meson.build b/budgie-wallstreet/data/meson.build
-index 213823a..63478b2 100644
---- a/budgie-wallstreet/data/meson.build
-+++ b/budgie-wallstreet/data/meson.build
-@@ -9,7 +9,7 @@ mytargeta = custom_target('wallstreetautostart',
-   input : 'wallstreet-autostart.desktop.in',
-   command : [substprog, '@INPUT@', LIB_INSTALL_DIR, '@OUTPUT@', podir],
-   install : true,
--  install_dir : join_paths(sysconfdir, 'xdg', 'autostart')
-+  install_dir : xdg_appdir
- )
- 
- mytargetw = custom_target('wallstreetcontrols',
 diff --git a/budgie-window-shuffler/data/meson.build b/budgie-window-shuffler/data/meson.build
-index efe9476..7ca7961 100644
+index 543964d..0725d6f 100644
 --- a/budgie-window-shuffler/data/meson.build
 +++ b/budgie-window-shuffler/data/meson.build
-@@ -13,7 +13,7 @@ shufflertargetauto = custom_target('shufflerautostart',
+@@ -29,7 +29,7 @@ shufflerlayoutstargetauto = custom_target('layoutsautostart',
-   input : 'shufflerdaemon-autostart.desktop.in',
+   input : 'layoutspopup-autostart.desktop.in',
-   command : [substprog, '@INPUT@', LIB_INSTALL_DIR, '@OUTPUT@', podir],
-   install : true,
--  install_dir : join_paths(sysconfdir, 'xdg', 'autostart')
-+  install_dir : xdg_appdir
- )
- 
- shufflerguitargetauto = custom_target('shufflerguiautostart',
-@@ -21,7 +21,7 @@ shufflerguitargetauto = custom_target('shufflerguiautostart',
-   input : 'shufflergui-autostart.desktop.in',
    command : [substprog, '@INPUT@', LIB_INSTALL_DIR, '@OUTPUT@', podir],
    install : true,
 -  install_dir : join_paths(sysconfdir, 'xdg', 'autostart')
@@ -82,89 +20,3 @@ index efe9476..7ca7961 100644
  )
  
  shufflertargetw = custom_target('shufflercontrols',
-diff --git a/budgie-wpreviews/data/meson.build b/budgie-wpreviews/data/meson.build
-index c2ac8f8..9571b84 100644
---- a/budgie-wpreviews/data/meson.build
-+++ b/budgie-wpreviews/data/meson.build
-@@ -49,14 +49,13 @@ mytarget4a = custom_target('preview_currentforward_grave',
-   install_dir : BDE_LOC
- )
- 
--AUTOSTART_LOC=join_paths(sysconfdir, 'xdg', 'autostart')
- 
- mytarget5 = custom_target('preview_creator',
-   output : 'previews-creator-autostart.desktop',
-   input : 'previews-creator-autostart.desktop.in',
-   command : [substprog, '@INPUT@', LIB_INSTALL_DIR, '@OUTPUT@'],
-   install : true,
--  install_dir : AUTOSTART_LOC
-+  install_dir : xdg_appdir
- )
- 
- mytarget6 = custom_target('previews_daemon',
-@@ -64,7 +63,7 @@ mytarget6 = custom_target('previews_daemon',
-   input : 'previews-daemon-autostart.desktop.in',
-   command : [substprog, '@INPUT@', LIB_INSTALL_DIR, '@OUTPUT@'],
-   install : true,
--  install_dir : AUTOSTART_LOC
-+  install_dir : xdg_appdir
- )
- 
- APP_LOC=join_paths(datadir, 'applications')
-diff --git a/meson.build b/meson.build
-index 5b2d958..ca50d90 100644
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,20 @@ conf.set_quoted('PREVIEWS_DIR', join_paths(libdir, PREVIEWS))
- WSWITCHER = 'budgie-wswitcher'
- conf.set_quoted('WSWITCHER_DIR', join_paths(PLUGINS_INSTALL_DIR, WSWITCHER))
- 
-+with_stateless = get_option('with-stateless')
-+if with_stateless == true
-+    warning('Only use stateless option with a supported OS like Solus')
-+endif
-+
-+xdg_appdir = get_option('xdg-appdir')
-+if xdg_appdir == ''
-+    if with_stateless == true
-+        xdg_appdir = join_paths(datadir, 'xdg', 'autostart')
-+    else
-+        xdg_appdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
-+    endif
-+endif
-+
- 
- config_h = configure_file(
- 	output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index 6820986..0fe925d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -28,3 +28,5 @@ option('build-applications-menu', type: 'boolean', value: false, description: 'B
- option('build-network-manager', type: 'boolean', value: false, description: 'Build network-manager applet')
- option('build-window-shuffler', type: 'boolean', value: false, description: 'Build window shuffler')
- option('with-zeitgeist', type : 'boolean', value : 'true', description : 'Add Zeitgeist support')
-+option('with-stateless', type: 'boolean', value: false, description: 'Enable stateless XDG paths')
-+option('xdg-appdir', type: 'string', description: 'XDG autostart path')
-From 53a059ba556fc6fc6a6d46eab0cd22e289879d98 Mon Sep 17 00:00:00 2001
-From: Callum Farmer <gmbr3@opensuse.org>
-Date: Wed, 17 Feb 2021 10:43:37 +0000
-Subject: [PATCH] Make xdg directory configurable
-
----
- budgie-quickchar/quickchar/data/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/budgie-quickchar/quickchar/data/meson.build b/budgie-quickchar/quickchar/data/meson.build
-index 5aabd3d..2023529 100644
---- a/budgie-quickchar/quickchar/data/meson.build
-+++ b/budgie-quickchar/quickchar/data/meson.build
-@@ -6,7 +6,7 @@ install_data(
- 
- install_data(
-     'quickchar-autostart.desktop',
--    install_dir: join_paths(sysconfdir, 'xdg', 'autostart')
-+    install_dir: xdg_appdir
- )
- 
- substprog = find_program('subst.py')