Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-08-31 16:49:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "budgie-desktop" Mon Aug 31 16:49:16 2020 rev:5 rq:830518 version:10.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-08-14 09:34:37.696438368 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399/budgie-desktop.changes 2020-08-31 16:49:52.340343428 +0200 @@ -1,0 +2,13 @@ +Sat Aug 29 21:34:45 UTC 2020 - Callum Farmer <[email protected]> + +- Add desktop-override.patch from Debian: fixes overlap between + Budgie and GNOME in gschema + +------------------------------------------------------------------- +Sat Aug 29 12:04:30 UTC 2020 - Callum Farmer <[email protected]> + +- Add budgie-screensaver to Requires +- Change gnome-software from Requires to Recommends: + * Asked for by S. B. <[email protected]> + +------------------------------------------------------------------- New: ---- desktop-override.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ budgie-desktop.spec ++++++ --- /var/tmp/diff_new_pack.quUiJw/_old 2020-08-31 16:49:54.656344551 +0200 +++ /var/tmp/diff_new_pack.quUiJw/_new 2020-08-31 16:49:54.660344553 +0200 @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -35,6 +35,8 @@ Patch2: mutter-3-35-91.patch # PATCH-FIX-UPSTREAM: Allow budgie-desktop and gnome-shell to coexist gh#solus-project/budgie-desktop#1984 Patch3: gnome-coexistance.patch +# PATCH-FIX-OPENSUSE: Create a clean separation between Budgie and GNOME desktops +Patch4: desktop-override.patch BuildRequires: intltool BuildRequires: meson >= 0.41.2 BuildRequires: pkgconfig @@ -68,8 +70,8 @@ Requires: gnome-session-core Requires: gnome-settings-daemon Requires: gnome-control-center -Requires: gnome-software -#Recommends: gnome-screensaver +Requires: budgie-screensaver +Recommends: gnome-software Recommends: NetworkManager-applet Recommends: gnome-backgrounds Recommends: budgie-desktop-doc @@ -148,9 +150,6 @@ export LANG=en_US.UTF-8 %meson_install -# GNOME Screensaver missing in openSUSE -rm %{buildroot}/%{_sysconfdir}/xdg/autostart/budgie-desktop-screensaver.desktop - # Correct vala directory mkdir -pv %{buildroot}%{_datadir}/vala-%{vala_version}/ mv %{buildroot}%{_datadir}/vala/* %{buildroot}%{_datadir}/vala-%{vala_version}/ @@ -193,6 +192,7 @@ %{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/budgie-desktop.desktop %{_libdir}/budgie-desktop +%{_sysconfdir}/xdg/autostart/budgie-desktop-screensaver.desktop %{_sysconfdir}/xdg/autostart/budgie-desktop-nm-applet.desktop %ghost %{_sysconfdir}/alternatives/default-xsession.desktop ++++++ desktop-override.patch ++++++ https://sources.debian.org/src/budgie-desktop/10.5.1+git20200715-2/debian/patches/desktop-override.patch/ Description: Reinstate desktop overrides Upstream no longer wants to use desktop overrides. Reinstate these for Debian & Ubuntu to ensure clean separation from Budgie and GNOME desktops Author: David Mohammed <[email protected]> Forwarded: not-needed Last-Update: 2019-03-09 Index: budgie-desktop-10.5~git20190308/src/wm/20_solus-project.budgie.wm.gschema.override =================================================================== --- budgie-desktop-10.5~git20190308.orig/src/wm/20_solus-project.budgie.wm.gschema.override +++ budgie-desktop-10.5~git20190308/src/wm/20_solus-project.budgie.wm.gschema.override @@ -1,7 +1,7 @@ -[org.gnome.mutter] +[org.gnome.mutter:Budgie] edge-tiling = true attach-modal-dialogs = true -[org.gnome.desktop.wm.preferences] +[org.gnome.desktop.wm.preferences:Budgie] button-layout = 'appmenu:minimize,maximize,close'
