commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-11-03 15:32:05 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3463 (New) Package is "budgie-desktop" Tue Nov 3 15:32:05 2020 rev:12 rq:845528 version:10.5.1+21060898 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-10-24 15:18:34.320292908 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3463/budgie-desktop.changes 2020-11-03 15:32:05.856930305 +0100 @@ -1,0 +2,7 @@ +Mon Nov 2 19:30:54 UTC 2020 - Callum Farmer + +- Update to version 10.5.1+21060898: + * Consolidate WindowType checking code into Abomination. +- Cleaned nemo-instead-of-nautilus.patch + +--- Old: budgie-desktop-10.5.1+9197f3f0.tar.xz New: budgie-desktop-10.5.1+21060898.tar.xz Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.un4kXt/_old 2020-11-03 15:32:06.656930952 +0100 +++ /var/tmp/diff_new_pack.un4kXt/_new 2020-11-03 15:32:06.660930956 +0100 @@ -16,7 +16,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: budgie-desktop -Version:10.5.1+9197f3f0 +Version:10.5.1+21060898 Release:0 Summary:GTK3 Desktop Environment License:GPL-2.0-or-later AND LGPL-2.1-or-later ++ budgie-desktop-10.5.1+9197f3f0.tar.xz -> budgie-desktop-10.5.1+21060898.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-desktop-10.5.1+9197f3f0/src/abomination/abomination.vala new/budgie-desktop-10.5.1+21060898/src/abomination/abomination.vala --- old/budgie-desktop-10.5.1+9197f3f0/src/abomination/abomination.vala 2020-10-19 14:55:41.0 +0200 +++ new/budgie-desktop-10.5.1+21060898/src/abomination/abomination.vala 2020-10-20 15:47:36.0 +0200 @@ -91,14 +91,11 @@ * add_app will add a running application based on the provided window */ public void add_app(Wnck.Window window) { - if ( - (window.get_window_type() == Wnck.WindowType.DESKTOP) || // Desktop-mode (like Nautilus' Desktop Icons) - (window.get_window_type() == Wnck.WindowType.DOCK) // Like Budgie Panel - ) { + if (is_disallowed_window_type(window)) { // Disallowed type return; } - if (window.is_skip_tasklist()) { + if (window.is_skip_pager() || window.is_skip_tasklist()) { // Skip pager or tasklist return; } @@ -147,6 +144,23 @@ }); } + // is_disallowed_window_type will check if this specified window is a disallowed type + public bool is_disallowed_window_type(Wnck.Window window) { + Wnck.WindowType win_type = window.get_window_type(); // Get the window type + + if ( + (win_type == Wnck.WindowType.DESKTOP) || // Desktop-mode (like Nautilus' Desktop Icons) + (win_type == Wnck.WindowType.DIALOG) || // Dialogs + (win_type == Wnck.WindowType.DOCK) || // Like Budgie Panel + (win_type == Wnck.WindowType.SPLASHSCREEN) || // Splash screens + (win_type == Wnck.WindowType.UTILITY) // Utility like a control on an emulator + ) { + return true; + } else { + return false; + } + } + /** * remove_app will remove a running application based on the provided window */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/DesktopHelper.vala new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/DesktopHelper.vala --- old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/DesktopHelper.vala 2020-10-19 14:55:41.0 +0200 +++ new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/DesktopHelper.vala 2020-10-20 15:47:36.0 +0200 @@ -70,7 +70,7 @@ public List get_stacked_for_classgroup(Wnck.ClassGroup class_group) { List list = new List(); screen.get_windows_stacked().foreach((window) => { - if (window.get_class_group()
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-10-24 15:18:00 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3463 (New) Package is "budgie-desktop" Sat Oct 24 15:18:00 2020 rev:11 rq:843653 version:10.5.1+9197f3f0 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-09-22 21:12:05.263976977 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3463/budgie-desktop.changes 2020-10-24 15:18:34.320292908 +0200 @@ -1,0 +2,15 @@ +Fri Oct 23 16:20:54 UTC 2020 - Callum Farmer + +- Update to version 10.5.1+9197f3f0: + * Support to set XDG directory + * Fix build with vala 0.49 + * Changes and fixes in Budgie Menu + * Update translations +- Removed vala-0.49.patch: contained in upstream +- Removed Revert-GNOME-3.38-support.patch: end of Leap 15.2 support +- Rebased nemo-instead-of-nautilus.patch +- Updated BuildRequires: + * pkgconfig(libmutter-5/6/7) >> pkgconfig(libmutter-6/7) +- Follow UsrEtc move for autostart desktop files + +--- Old: Revert-GNOME-3.38-support.patch budgie-desktop-10.5.1+1ed6276b.tar.xz vala-0.49.patch New: budgie-desktop-10.5.1+9197f3f0.tar.xz Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.fRFoJ3/_old 2020-10-24 15:18:35.016293568 +0200 +++ /var/tmp/diff_new_pack.fRFoJ3/_new 2020-10-24 15:18:35.020293572 +0200 @@ -15,13 +15,8 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%if !0%{?is_backports} -%define brandingsuffix openSUSE -%else -%define brandingsuffix SLE -%endif Name: budgie-desktop -Version:10.5.1+1ed6276b +Version:10.5.1+9197f3f0 Release:0 Summary:GTK3 Desktop Environment License:GPL-2.0-or-later AND LGPL-2.1-or-later @@ -35,10 +30,6 @@ Patch: desktop-override.patch # PATCH-FIX-OPENSUSE: Use nemo instead of nautilus for desktop icons Patch1: nemo-instead-of-nautilus.patch -# PATCH-FIX-UPSTREAM gh#solus-project/budgie-desktop#2029 -Patch2: vala-0.49.patch -# PATCH-FIX-OPENSUSE Re-add Leap 15.2 support -Patch3: Revert-GNOME-3.38-support.patch BuildRequires: intltool BuildRequires: meson >= 0.41.2 BuildRequires: pkgconfig @@ -62,7 +53,7 @@ BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vapigen) >= 0.28 -BuildRequires: (pkgconfig(libmutter-5) or pkgconfig(libmutter-6) or pkgconfig(libmutter-7)) +BuildRequires: (pkgconfig(libmutter-6) or pkgconfig(libmutter-7)) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(gnome-settings-daemon) BuildRequires: pkgconfig(alsa) @@ -78,7 +69,6 @@ Recommends: NetworkManager-applet Recommends: gnome-backgrounds Recommends: budgie-desktop-doc -Recommends: budgie-desktop-branding-%{brandingsuffix} %define vala_version %(rpm -q --queryformat='%%{VERSION}' vala | sed 's/\.[0-9]*$//g') %description @@ -147,13 +137,9 @@ %setup -q %patch -p1 %patch1 -p1 -%patch2 -p1 -if pkg-config --max-version 3.36 gnome-desktop-3.0; then -%patch3 -p1 -fi %build -%meson +%meson -Dwith-stateless=true -Dxdg-appdir=%{_distconfdir}/xdg/autostart %meson_build %install @@ -166,7 +152,7 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop # nemo autostart -cp %{SOURCE3} %{buildroot}%{_sysconfdir}/xdg/autostart +cp %{SOURCE3} %{buildroot}%{_distconfdir}/xdg/autostart %find_lang %{name} @@ -198,9 +184,9 @@ %{_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 -%{_sysconfdir}/xdg/autostart/budgie-desktop-nemo-autostart.desktop +%{_distconfdir}/xdg/autostart/budgie-desktop-screensaver.desktop +%{_distconfdir}/xdg/autostart/budgie-desktop-nm-applet.desktop +%{_distconfdir}/xdg/autostart/budgie-desktop-nemo-autostart.desktop %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %files -n libraven0 ++ budgie-desktop-10.5.1+1ed6276b.tar.xz -> budgie-desktop-10.5.1+9197f3f0.tar.xz ++ 159727 lines of diff (skipped) ++ budgie-desktop-nemo-autostart.desktop ++ --- /var/tmp/diff_new_pack.fRFoJ3/_old 2020-10-24 15:18:35.532294057 +0200 +++ /var/tmp/diff_new_pack.fRFoJ3/_new 2020-10-24 15:18:35.532294057 +0200 @@ -7,4 +7,3 @@ AutostartCondition=GSettings org.nemo.desktop show-desktop-icons X-GNOME-AutoRestart=true NoDisplay=true - ++
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-09-22 21:11:40 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.4249 (New) Package is "budgie-desktop" Tue Sep 22 21:11:40 2020 rev:10 rq:835892 version:10.5.1+1ed6276b Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-09-15 16:27:19.426541275 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.4249/budgie-desktop.changes 2020-09-22 21:12:05.263976977 +0200 @@ -1,0 +2,5 @@ +Sat Sep 19 16:19:03 UTC 2020 - Callum Farmer + +- Use a better format for testing gnome versions + +--- Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.55gpOf/_old 2020-09-22 21:12:06.183977783 +0200 +++ /var/tmp/diff_new_pack.55gpOf/_new 2020-09-22 21:12:06.187977787 +0200 @@ -20,7 +20,6 @@ %else %define brandingsuffix SLE %endif -%define gnome_version %(rpm -q --queryformat='%%{VERSION}' libgnome-desktop-3-devel | sed 's/\.[0-9]*$//g') Name: budgie-desktop Version:10.5.1+1ed6276b Release:0 @@ -149,9 +148,9 @@ %patch -p1 %patch1 -p1 %patch2 -p1 -%if "%{gnome_version}" < "3.36" +if pkg-config --max-version 3.36 gnome-desktop-3.0; then %patch3 -p1 -%endif +fi %build %meson
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-09-15 16:26:51 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.4249 (New) Package is "budgie-desktop" Tue Sep 15 16:26:51 2020 rev:9 rq:834311 version:10.5.1+1ed6276b Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-09-12 00:07:37.236933275 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.4249/budgie-desktop.changes 2020-09-15 16:27:19.426541275 +0200 @@ -1,0 +2,12 @@ +Sun Sep 13 18:07:42 UTC 2020 - Callum Farmer + +- Add budgie-desktop-branding to Recommends + +--- +Sat Sep 12 10:00:37 UTC 2020 - Callum Farmer + +- Add patch Revert-GNOME-3.38-support.patch: Leap 15.2 only +- Updated BuildRequires: + * pkgconfig(libmutter-6/7) >> pkgconfig(libmutter-5/6/7) + +--- New: Revert-GNOME-3.38-support.patch Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.n2m2iB/_old 2020-09-15 16:27:20.054541876 +0200 +++ /var/tmp/diff_new_pack.n2m2iB/_new 2020-09-15 16:27:20.058541880 +0200 @@ -15,8 +15,12 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - - +%if !0%{?is_backports} +%define brandingsuffix openSUSE +%else +%define brandingsuffix SLE +%endif +%define gnome_version %(rpm -q --queryformat='%%{VERSION}' libgnome-desktop-3-devel | sed 's/\.[0-9]*$//g') Name: budgie-desktop Version:10.5.1+1ed6276b Release:0 @@ -34,6 +38,8 @@ Patch1: nemo-instead-of-nautilus.patch # PATCH-FIX-UPSTREAM gh#solus-project/budgie-desktop#2029 Patch2: vala-0.49.patch +# PATCH-FIX-OPENSUSE Re-add Leap 15.2 support +Patch3: Revert-GNOME-3.38-support.patch BuildRequires: intltool BuildRequires: meson >= 0.41.2 BuildRequires: pkgconfig @@ -57,7 +63,7 @@ BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vapigen) >= 0.28 -BuildRequires: (pkgconfig(libmutter-6) or pkgconfig(libmutter-7)) +BuildRequires: (pkgconfig(libmutter-5) or pkgconfig(libmutter-6) or pkgconfig(libmutter-7)) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(gnome-settings-daemon) BuildRequires: pkgconfig(alsa) @@ -73,6 +79,7 @@ Recommends: NetworkManager-applet Recommends: gnome-backgrounds Recommends: budgie-desktop-doc +Recommends: budgie-desktop-branding-%{brandingsuffix} %define vala_version %(rpm -q --queryformat='%%{VERSION}' vala | sed 's/\.[0-9]*$//g') %description @@ -138,7 +145,13 @@ %lang_package %prep -%autosetup -p1 +%setup -q +%patch -p1 +%patch1 -p1 +%patch2 -p1 +%if "%{gnome_version}" < "3.36" +%patch3 -p1 +%endif %build %meson ++ Revert-GNOME-3.38-support.patch ++ 6024 lines (skipped)
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-09-12 00:07:27 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.4249 (New) Package is "budgie-desktop" Sat Sep 12 00:07:27 2020 rev:8 rq:833543 version:10.5.1+1ed6276b Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-09-06 21:38:59.445735630 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.4249/budgie-desktop.changes 2020-09-12 00:07:37.236933275 +0200 @@ -1,0 +2,29 @@ +Thu Sep 10 17:03:31 UTC 2020 - Callum Farmer + +- Revert vala path changes + +--- +Thu Sep 10 16:57:19 UTC 2020 - Callum Farmer + +- Add patch vala-0.49.patch: fixes build with vala 0.49 + (gh#solus-project/budgie-desktop#2029) + +--- +Wed Sep 9 13:23:37 UTC 2020 - Callum Farmer + +- Update to git version 10.5.1+1ed6276b: + * Prevents keeping a load of patches, 10.5.2 might be ages away + * Added support for GNOME 3.38 + * Removed support for GNOME 3.34 and below +- Removed patches: + * support-libmutter6.patch + * Rework-grab-and-ungrab-keys.patch + * mutter-3-35-91.patch + * gnome-coexistance.patch + * replace-na-tray-with-carbontray.patch + * clean-up-carbontray.patch + * fix-integration-issues-with-carbontray.patch +- Updated BuildRequires: + * pkgconfig(libmutter-5/6) >> pkgconfig(libmutter-6/7) + +--- Old: Rework-grab-and-ungrab-keys.patch budgie-desktop-10.5.1.tar.xz budgie-desktop-10.5.1.tar.xz.asc budgie-desktop.keyring clean-up-carbontray.patch fix-integration-issues-with-carbontray.patch gnome-coexistance.patch mutter-3-35-91.patch replace-na-tray-with-carbontray.patch support-libmutter6.patch New: budgie-desktop-10.5.1+1ed6276b.tar.xz vala-0.49.patch Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.5Cl8Sf/_old 2020-09-12 00:07:42.468938282 +0200 +++ /var/tmp/diff_new_pack.5Cl8Sf/_new 2020-09-12 00:07:42.468938282 +0200 @@ -18,34 +18,22 @@ Name: budgie-desktop -Version:10.5.1 +Version:10.5.1+1ed6276b Release:0 Summary:GTK3 Desktop Environment License:GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/Other URL:https://getsol.us/solus/experiences/ -Source: https://github.com/solus-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz -Source1: https://github.com/solus-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc -Source2:%{name}.keyring +Source: %{name}-%{version}.tar.xz +#Source1: https://github.com/solus-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc +#Source2:%{name}.keyring Source3:budgie-desktop-nemo-autostart.desktop -# PATCH-FIX-UPSTREAM: Add support for mutter 3.36 gh#solus-project/budgie-desktop#1918 -Patch: support-libmutter6.patch -# PATCH-FIX-UPSTREAM: Resolve losing keyboard shortcuts on login gh#solus-project/budgie-desktop#1907 -Patch1: Rework-grab-and-ungrab-keys.patch -# PATCH-FIX-UPSTREAM: Add support for mutter 3.35.91 gh#solus-project/budgie-desktop#1939 -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 +Patch: desktop-override.patch # PATCH-FIX-OPENSUSE: Use nemo instead of nautilus for desktop icons -Patch5: nemo-instead-of-nautilus.patch -# PATCH-FIX-UPSTREAM: gh#solus-project/budgie-desktop#1998 -- Fixes boo#1176016 -Patch6: replace-na-tray-with-carbontray.patch -# PATCH-FIX-UPSTREAM: gh#solus-project/budgie-desktop#2002 -- Fixes boo#1176016 -Patch7: clean-up-carbontray.patch -# PATCH-FIX-UPSTREAM: gh#solus-project/budgie-desktop#2009 -- Fixes boo#1176016 -Patch8: fix-integration-issues-with-carbontray.patch +Patch1: nemo-instead-of-nautilus.patch +# PATCH-FIX-UPSTREAM gh#solus-project/budgie-desktop#2029 +Patch2: vala-0.49.patch BuildRequires: intltool BuildRequires: meson >= 0.41.2 BuildRequires: pkgconfig @@ -69,7 +57,7 @@ BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vapigen) >= 0.28 -BuildRequires: (pkgconfig(libmutter-5) or
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-09-06 21:37:20 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399 (New) Package is "budgie-desktop" Sun Sep 6 21:37:20 2020 rev:7 rq:832518 version:10.5.1 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-09-01 20:10:13.224672446 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399/budgie-desktop.changes 2020-09-06 21:38:59.445735630 +0200 @@ -1,0 +2,11 @@ +Sat Sep 5 17:10:21 UTC 2020 - Callum Farmer + +- Add patches to fix boo#1176016: + * replace-na-tray-with-carbontray.patch +(gh#solus-project/budgie-desktop#1998) + * clean-up-carbontray.patch +(gh#solus-project/budgie-desktop#2002) + * fix-integration-issues-with-carbontray.patch +(gh#solus-project/budgie-desktop#2009) + +--- New: clean-up-carbontray.patch fix-integration-issues-with-carbontray.patch replace-na-tray-with-carbontray.patch Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.9ilLhr/_old 2020-09-06 21:39:00.045735926 +0200 +++ /var/tmp/diff_new_pack.9ilLhr/_new 2020-09-06 21:39:00.045735926 +0200 @@ -40,6 +40,12 @@ Patch4: desktop-override.patch # PATCH-FIX-OPENSUSE: Use nemo instead of nautilus for desktop icons Patch5: nemo-instead-of-nautilus.patch +# PATCH-FIX-UPSTREAM: gh#solus-project/budgie-desktop#1998 -- Fixes boo#1176016 +Patch6: replace-na-tray-with-carbontray.patch +# PATCH-FIX-UPSTREAM: gh#solus-project/budgie-desktop#2002 -- Fixes boo#1176016 +Patch7: clean-up-carbontray.patch +# PATCH-FIX-UPSTREAM: gh#solus-project/budgie-desktop#2009 -- Fixes boo#1176016 +Patch8: fix-integration-issues-with-carbontray.patch BuildRequires: intltool BuildRequires: meson >= 0.41.2 BuildRequires: pkgconfig ++ clean-up-carbontray.patch ++ >From a0eeae723af06e8cbb02ed9a7356fae8f4f3842e Mon Sep 17 00:00:00 2001 From: Campbell Jones Date: Mon, 6 Jul 2020 13:22:21 -0400 Subject: [PATCH] Clean up carbontray code and add copyright headers --- src/applets/tray/TrayApplet.vala| 5 +-- src/applets/tray/carbontray/child.c | 56 --- src/applets/tray/carbontray/child.h | 15 ++- src/applets/tray/carbontray/tray.c | 70 - src/applets/tray/carbontray/tray.h | 19 ++-- 5 files changed, 111 insertions(+), 54 deletions(-) diff --git a/src/applets/tray/TrayApplet.vala b/src/applets/tray/TrayApplet.vala index 62a92fd7..22fd6c3d 100644 --- a/src/applets/tray/TrayApplet.vala +++ b/src/applets/tray/TrayApplet.vala @@ -1,7 +1,7 @@ /* * This file is part of budgie-desktop * - * Copyright © 2015-2019 Budgie Desktop Developers + * Copyright © 2015-2020 Budgie Desktop Developers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -131,8 +131,7 @@ public class TrayApplet : Budgie.Applet { [ModuleInit] -public void peas_register_types(TypeModule module) -{ +public void peas_register_types(TypeModule module) { // boilerplate - all modules need this var objmodule = module as Peas.ObjectModule; objmodule.register_extension_type(typeof(Budgie.Plugin), typeof(TrayPlugin)); diff --git a/src/applets/tray/carbontray/child.c b/src/applets/tray/carbontray/child.c index eb7fa832..ba46c810 100644 --- a/src/applets/tray/carbontray/child.c +++ b/src/applets/tray/carbontray/child.c @@ -1,3 +1,18 @@ +/* + * This file is part of budgie-desktop + * + * Copyright © 2015-2020 Budgie Desktop Developers + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This file's contents largely use xfce4-panel as a reference, which is licensed under the terms of the GNU GPL v2. + * Additional notes were taken from na-tray, the previous system tray for Budgie, which is part of MATE Desktop + * and licensed under the terms of the GNU GPL v2. + */ + #include "child.h" #include "tray.h" @@ -20,26 +35,39 @@ G_DEFINE_TYPE(CarbonChild, carbon_child, GTK_TYPE_SOCKET) // public method implementations CarbonChild* carbon_child_new(int size, GdkScreen *screen, Window iconWindow) { -CarbonChild *self = g_object_new(carbon_child_get_type(), NULL); -self->preferredWidth = size; - self->preferredHeight = size; - - if
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-09-01 20:09:52 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399 (New) Package is "budgie-desktop" Tue Sep 1 20:09:52 2020 rev:6 rq:830934 version:10.5.1 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-08-31 16:49:52.340343428 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399/budgie-desktop.changes 2020-09-01 20:10:13.224672446 +0200 @@ -1,0 +2,7 @@ +Mon Aug 31 21:55:03 UTC 2020 - Callum Farmer + +- Add nemo-instead-of-nautilus.patch: Nautilus doesn't have support + for desktop icons anymore +- Add nemo to Requires for desktop icons + +--- New: budgie-desktop-nemo-autostart.desktop nemo-instead-of-nautilus.patch Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.5bUbMS/_old 2020-09-01 20:10:14.000672809 +0200 +++ /var/tmp/diff_new_pack.5bUbMS/_new 2020-09-01 20:10:14.004672811 +0200 @@ -27,6 +27,7 @@ Source: https://github.com/solus-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/solus-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc Source2:%{name}.keyring +Source3:budgie-desktop-nemo-autostart.desktop # PATCH-FIX-UPSTREAM: Add support for mutter 3.36 gh#solus-project/budgie-desktop#1918 Patch: support-libmutter6.patch # PATCH-FIX-UPSTREAM: Resolve losing keyboard shortcuts on login gh#solus-project/budgie-desktop#1907 @@ -37,6 +38,8 @@ Patch3: gnome-coexistance.patch # PATCH-FIX-OPENSUSE: Create a clean separation between Budgie and GNOME desktops Patch4: desktop-override.patch +# PATCH-FIX-OPENSUSE: Use nemo instead of nautilus for desktop icons +Patch5: nemo-instead-of-nautilus.patch BuildRequires: intltool BuildRequires: meson >= 0.41.2 BuildRequires: pkgconfig @@ -71,6 +74,7 @@ Requires: gnome-settings-daemon Requires: gnome-control-center Requires: budgie-screensaver +Requires: nemo Recommends: gnome-software Recommends: NetworkManager-applet Recommends: gnome-backgrounds @@ -143,7 +147,7 @@ %autosetup -p1 %build -%meson -Dwith-desktop-icons=none +%meson %meson_build %install @@ -160,6 +164,9 @@ touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop +# nemo autostart +cp %{SOURCE3} %{buildroot}%{_sysconfdir}/xdg/autostart + %find_lang %{name} %post @@ -194,6 +201,7 @@ %{_libdir}/budgie-desktop %{_sysconfdir}/xdg/autostart/budgie-desktop-screensaver.desktop %{_sysconfdir}/xdg/autostart/budgie-desktop-nm-applet.desktop +%{_sysconfdir}/xdg/autostart/budgie-desktop-nemo-autostart.desktop %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %files -n libraven0 ++ budgie-desktop-nemo-autostart.desktop ++ [Desktop Entry] Type=Application Name=Nemo Comment=Start Nemo desktop at log in Exec=nemo-desktop OnlyShowIn=Budgie; AutostartCondition=GSettings org.nemo.desktop show-desktop-icons X-GNOME-AutoRestart=true NoDisplay=true ++ nemo-instead-of-nautilus.patch ++ >From fad652f4140b0165d6fb9c67f6817fc37374a707 Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Mon, 31 Aug 2020 17:04:09 +0100 Subject: [PATCH 1/5] Update meson.build --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 3c4c6ac1..eda57368 100644 --- a/meson.build +++ b/meson.build @@ -101,8 +101,8 @@ cdata.set_quoted('LOCALEDIR', localedir) cdata.set_quoted('PACKAGE_URL', 'https://budgie-desktop.org') with_desktop_icons = get_option('with-desktop-icons') -if with_desktop_icons == 'nautilus' -warning('You must have Nautilus 3.26 or older for desktop icons with Budgie') +if with_desktop_icons == 'nemo' +warning('You must have Nemo for desktop icons with Budgie') endif with_stateless = get_option('with-stateless') -- 2.26.2.windows.1 >From eea4eebe774a97e4d3ce9738d92b990063e0160a Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Mon, 31 Aug 2020 17:04:41 +0100 Subject: [PATCH 2/5] Update meson_options.txt --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index dca91296..c6b5c8c5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,4 +2,4 @@ option('with-polkit', type: 'boolean', value: true, description:
commit budgie-desktop for openSUSE:Factory
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 + +- Add desktop-override.patch from Debian: fixes overlap between + Budgie and GNOME in gschema + +--- +Sat Aug 29 12:04:30 UTC 2020 - Callum Farmer + +- Add budgie-screensaver to Requires +- Change gnome-software from Requires to Recommends: + * Asked for by S. B. + +--- 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 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'
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-08-14 09:33:26 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399 (New) Package is "budgie-desktop" Fri Aug 14 09:33:26 2020 rev:4 rq:826273 version:10.5.1 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-08-13 10:25:35.37082 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399/budgie-desktop.changes 2020-08-14 09:34:37.696438368 +0200 @@ -1,0 +2,8 @@ +Thu Aug 13 11:55:45 UTC 2020 - Callum Farmer + +- Change gnome-control-center from Recommends to Requires: + * Needed for changing desktop background +- Add gnome-software to Requires: + * Needed for links in gnome-control-center + +--- Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.DFXL4d/_old 2020-08-14 09:34:38.176438614 +0200 +++ /var/tmp/diff_new_pack.DFXL4d/_new 2020-08-14 09:34:38.180438617 +0200 @@ -67,10 +67,11 @@ Requires: ibus Requires: gnome-session-core Requires: gnome-settings-daemon +Requires: gnome-control-center +Requires: gnome-software #Recommends: gnome-screensaver Recommends: NetworkManager-applet Recommends: gnome-backgrounds -Recommends: gnome-control-center Recommends: budgie-desktop-doc %define vala_version %(rpm -q --queryformat='%%{VERSION}' vala | sed 's/\.[0-9]*$//g')
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-08-13 10:19:14 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399 (New) Package is "budgie-desktop" Thu Aug 13 10:19:14 2020 rev:3 rq:826117 version:10.5.1 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-08-12 10:32:36.488155509 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399/budgie-desktop.changes 2020-08-13 10:25:35.37082 +0200 @@ -1,0 +2,7 @@ +Wed Aug 12 22:04:27 UTC 2020 - Callum Farmer + +- Add gnome-session-core as a dependency +- Spec file cleanups +- Correct URL + +--- Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.76k9dw/_old 2020-08-13 10:25:37.498899935 +0200 +++ /var/tmp/diff_new_pack.76k9dw/_new 2020-08-13 10:25:37.502899935 +0200 @@ -23,7 +23,7 @@ Summary:GTK3 Desktop Environment License:GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/Other -URL:https://solus-project.com/budgie/ +URL:https://getsol.us/solus/experiences/ Source: https://github.com/solus-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/solus-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc Source2:%{name}.keyring @@ -58,19 +58,20 @@ BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vapigen) >= 0.28 +BuildRequires: (pkgconfig(libmutter-5) or pkgconfig(libmutter-6)) +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(gnome-settings-daemon) +BuildRequires: pkgconfig(alsa) Requires: typelib-1_0-PeasGtk-1_0 Requires: typelib-1_0-Budgie-1_0 Requires: ibus +Requires: gnome-session-core Requires: gnome-settings-daemon #Recommends: gnome-screensaver Recommends: NetworkManager-applet Recommends: gnome-backgrounds Recommends: gnome-control-center Recommends: budgie-desktop-doc -BuildRequires: (pkgconfig(libmutter-5) or pkgconfig(libmutter-6)) -BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(gnome-settings-daemon) -BuildRequires: pkgconfig(alsa) %define vala_version %(rpm -q --queryformat='%%{VERSION}' vala | sed 's/\.[0-9]*$//g') %description @@ -154,6 +155,7 @@ mv %{buildroot}%{_datadir}/vala/* %{buildroot}%{_datadir}/vala-%{vala_version}/ rm -Rf %{buildroot}%{_datadir}/vala/ +# update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop @@ -189,7 +191,7 @@ %{_datadir}/icons/hicolor/scalable/*/*.svg %{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/budgie-desktop.desktop -%{_libdir}/budgie-desktop/ +%{_libdir}/budgie-desktop %{_sysconfdir}/xdg/autostart/budgie-desktop-nm-applet.desktop %ghost %{_sysconfdir}/alternatives/default-xsession.desktop @@ -206,8 +208,7 @@ %{_libdir}/libbudgie-private.so.* %files devel -%dir %{_includedir}/budgie-desktop -%{_includedir}/budgie-desktop/*.h +%{_includedir}/budgie-desktop %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %{_datadir}/gir-1.0/Budgie-1.0.gir @@ -217,7 +218,7 @@ %{_libdir}/girepository-1.0/Budgie-1.0.typelib %files doc -%{_datadir}/gtk-doc/html/budgie-desktop/ +%{_datadir}/gtk-doc/html/budgie-desktop %files lang -f %{name}.lang
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-08-12 10:29:20 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399 (New) Package is "budgie-desktop" Wed Aug 12 10:29:20 2020 rev:2 rq:825762 version:10.5.1 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-08-10 15:02:25.948140959 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3399/budgie-desktop.changes 2020-08-12 10:32:36.488155509 +0200 @@ -1,0 +2,28 @@ +Tue Aug 11 10:39:42 UTC 2020 - Callum Farmer + +- Remove gnome-session dependency + +--- +Mon Aug 10 20:02:33 UTC 2020 - Callum Farmer + +- Fix desktop icons + +--- +Mon Aug 10 19:15:07 UTC 2020 - Callum Farmer + +- Add patches: + * Rework-grab-and-ungrab-keys.patch (gh#solus-project/budgie-desktop#1907) + * mutter-3-35-91.patch (gh#solus-project/budgie-desktop#1939) + * gnome-coexistance.patch (gh#solus-project/budgie-desktop#1984) +- Remove old %post and %postun +- Add new Requires: + * ibus + * typelib-1_0-PeasGtk-1_0 + * typelib-1_0-Budgie-1_0 + +--- +Mon Aug 10 14:27:48 UTC 2020 - Callum Farmer + +- Add xsession update-alternatives + +--- New: Rework-grab-and-ungrab-keys.patch gnome-coexistance.patch mutter-3-35-91.patch Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.mvAmiz/_old 2020-08-12 10:32:42.256159963 +0200 +++ /var/tmp/diff_new_pack.mvAmiz/_new 2020-08-12 10:32:42.256159963 +0200 @@ -29,6 +29,12 @@ Source2:%{name}.keyring # PATCH-FIX-UPSTREAM: Add support for mutter 3.36 gh#solus-project/budgie-desktop#1918 Patch: support-libmutter6.patch +# PATCH-FIX-UPSTREAM: Resolve losing keyboard shortcuts on login gh#solus-project/budgie-desktop#1907 +Patch1: Rework-grab-and-ungrab-keys.patch +# PATCH-FIX-UPSTREAM: Add support for mutter 3.35.91 gh#solus-project/budgie-desktop#1939 +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 BuildRequires: intltool BuildRequires: meson >= 0.41.2 BuildRequires: pkgconfig @@ -52,7 +58,9 @@ BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vapigen) >= 0.28 -Requires: gnome-session +Requires: typelib-1_0-PeasGtk-1_0 +Requires: typelib-1_0-Budgie-1_0 +Requires: ibus Requires: gnome-settings-daemon #Recommends: gnome-screensaver Recommends: NetworkManager-applet @@ -131,7 +139,7 @@ %autosetup -p1 %build -%meson +%meson -Dwith-desktop-icons=none %meson_build %install @@ -146,17 +154,19 @@ mv %{buildroot}%{_datadir}/vala/* %{buildroot}%{_datadir}/vala-%{vala_version}/ rm -Rf %{buildroot}%{_datadir}/vala/ +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop +ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop + %find_lang %{name} -%if 0%{?suse_version} < 1500 %post -%glib2_gsettings_schema_post -%icon_theme_cache_post +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/budgie-desktop.desktop 20 %postun -%glib2_gsettings_schema_post -%icon_theme_cache_postun -%endif +[ -f %{_datadir}/xsessions/budgie-desktop.desktop ] || %{_sbindir}/update-alternatives \ + --remove default-xsession.desktop %{_datadir}/xsessions/budgie-desktop.desktop %post -n libraven0 -p /sbin/ldconfig %postun -n libraven0 -p /sbin/ldconfig @@ -177,9 +187,11 @@ %{_datadir}/glib-2.0/schemas/20_solus-project.budgie.wm.gschema.override %{_datadir}/gnome-session/sessions/budgie-desktop.session %{_datadir}/icons/hicolor/scalable/*/*.svg +%{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/budgie-desktop.desktop %{_libdir}/budgie-desktop/ %{_sysconfdir}/xdg/autostart/budgie-desktop-nm-applet.desktop +%ghost %{_sysconfdir}/alternatives/default-xsession.desktop %files -n libraven0 %{_libdir}/libraven.so.* ++ Rework-grab-and-ungrab-keys.patch ++ >From 05b4694887fd072316470c570fbe4b4257a5f4f3 Mon Sep 17 00:00:00 2001 From: David Mohammed Date: Sun, 3 Nov 2019 21:37:34 + Subject: [PATCH 1/3] Rework grab and ungrab keys --- src/wm/shim.vala | 96
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2018-05-13 16:05:22 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new (New) Package is "budgie-desktop" Sun May 13 16:05:22 2018 rev:7 rq:606366 version:10.4 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2017-12-03 10:13:18.847222795 +0100 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new/budgie-desktop.changes 2018-05-13 16:05:23.701609605 +0200 @@ -1,0 +2,9 @@ +Sun Apr 15 20:16:38 UTC 2018 - matthias.elias...@gmail.com + +- Add support-libmutter2.patch: This to support the version of + mutter in openSUSE:Factory. +- Change copyright year to 2018 +- Change licenses to SPDX-3.0 version +- Modernize spec-file with spec-cleaner + +--- New: support-libmutter2.patch Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.NGZTPx/_old 2018-05-13 16:05:24.389584506 +0200 +++ /var/tmp/diff_new_pack.NGZTPx/_new 2018-05-13 16:05:24.393584360 +0200 @@ -1,7 +1,7 @@ # # spec file for package budgie-desktop # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013-2016 Ikey Doherty# # All modifications and additions to the file contributed by third parties @@ -21,18 +21,18 @@ Version:10.4 Release:0 Summary:GTK3 Desktop Environment -License:GPL-2.0+ AND LGPL-2.1 +License:GPL-2.0-or-later AND LGPL-2.1-only Group: System/GUI/Other -Url:https://solus-project.com/budgie/ +URL:https://solus-project.com/budgie/ Source: https://github.com/budgie-desktop/budgie-desktop/releases/download/v%{version}/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM: temp patch for sandbox changes in Meson 0.43.0. # Proper fix is in upstream master (gh#budgie-desktop/budgie-desktop#1194). Patch0: fix-meson-build.patch -BuildRequires: gtk-doc +Patch1: support-libmutter2.patch BuildRequires: intltool BuildRequires: meson >= 0.41.2 -BuildRequires: pkg-config -BuildRequires: vala >= 0.28 +BuildRequires: pkgconfig +BuildRequires: sassc BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) @@ -41,30 +41,28 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(ibus-1.0) BuildRequires: pkgconfig(libgnome-menu-3.0) BuildRequires: pkgconfig(libpeas-gtk-1.0) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libwnck-3.0) -%if 0%{?suse_version} > 1320 -BuildRequires: pkgconfig(libmutter-1) -%else -BuildRequires: pkgconfig(libmutter) -%endif -BuildRequires: sassc BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) - -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(vapigen) >= 0.28 Requires: gnome-session Requires: gnome-settings-daemon - #Recommends: gnome-screensaver Recommends: NetworkManager-applet Recommends: gnome-backgrounds Recommends: gnome-control-center +%if 0%{?suse_version} > 1500 +BuildRequires: pkgconfig(libmutter-2) +%else +BuildRequires: pkgconfig(libmutter) +%endif %description Budgie Desktop is the flagship desktop for the Solus Operating System. @@ -122,6 +120,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 cp -r src/gvc subprojects %build @@ -137,6 +136,7 @@ %find_lang %{name} +%if 0%{?suse_version} < 1500 %post %glib2_gsettings_schema_post %icon_theme_cache_post @@ -144,19 +144,17 @@ %postun %glib2_gsettings_schema_post %icon_theme_cache_postun +%endif %post -n libraven0 -p /sbin/ldconfig %postun -n libraven0 -p /sbin/ldconfig - %post -n libbudgietheme0 -p /sbin/ldconfig %postun -n libbudgietheme0 -p /sbin/ldconfig - %post -n libbudgie-plugin0 -p /sbin/ldconfig %postun -n libbudgie-plugin0 -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-,root,root) -%doc LICENSE LICENSE.LGPL2.1 +%license LICENSE LICENSE.LGPL2.1 %dir %{_datadir}/gnome-session %dir %{_datadir}/gnome-session/sessions %{_bindir}/budgie-* @@ -169,15 +167,12 @@ %{_sysconfdir}/xdg/autostart/budgie-desktop-nm-applet.desktop %files -n libraven0 -%defattr(-,root,root) %{_libdir}/libraven.so.* %files -n libbudgietheme0 -%defattr(-,root,root)
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2017-12-03 10:13:18 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new (New) Package is "budgie-desktop" Sun Dec 3 10:13:18 2017 rev:6 rq:547494 version:10.4 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2017-09-20 17:09:41.398901964 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new/budgie-desktop.changes 2017-12-03 10:13:18.847222795 +0100 @@ -1,0 +2,6 @@ +Thu Nov 30 02:35:20 UTC 2017 - qantas94he...@gmail.com + +- Add fix-meson-build.patch: fixes gvc subproject sandbox issue + with Meson 0.43.0 + +--- New: fix-meson-build.patch Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.nQvOvb/_old 2017-12-03 10:13:19.463200400 +0100 +++ /var/tmp/diff_new_pack.nQvOvb/_new 2017-12-03 10:13:19.463200400 +0100 @@ -21,10 +21,13 @@ Version:10.4 Release:0 Summary:GTK3 Desktop Environment -License:GPL-2.0+ and LGPL-2.1 +License:GPL-2.0+ AND LGPL-2.1 Group: System/GUI/Other Url:https://solus-project.com/budgie/ Source: https://github.com/budgie-desktop/budgie-desktop/releases/download/v%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM: temp patch for sandbox changes in Meson 0.43.0. +# Proper fix is in upstream master (gh#budgie-desktop/budgie-desktop#1194). +Patch0: fix-meson-build.patch BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: meson >= 0.41.2 @@ -118,6 +121,8 @@ %prep %setup -q +%patch0 -p1 +cp -r src/gvc subprojects %build %meson ++ fix-meson-build.patch ++ Index: budgie-desktop-10.4/subprojects/gvc/meson.build === --- budgie-desktop-10.4.orig/subprojects/gvc/meson.build +++ budgie-desktop-10.4/subprojects/gvc/meson.build @@ -15,17 +15,17 @@ libgvc_deps = [ ] libgvc_sources = [ -'../../src/gvc/gvc-channel-map.c', -'../../src/gvc/gvc-mixer-card.c', -'../../src/gvc/gvc-mixer-control.c', -'../../src/gvc/gvc-mixer-event-role.c', -'../../src/gvc/gvc-mixer-sink.c', -'../../src/gvc/gvc-mixer-sink-input.c', -'../../src/gvc/gvc-mixer-source.c', -'../../src/gvc/gvc-mixer-source-output.c', -'../../src/gvc/gvc-mixer-stream.c', -'../../src/gvc/gvc-mixer-ui-device.c', -'../../src/gvc/test-audio-device-selection.c', +'gvc-channel-map.c', +'gvc-mixer-card.c', +'gvc-mixer-control.c', +'gvc-mixer-event-role.c', +'gvc-mixer-sink.c', +'gvc-mixer-sink-input.c', +'gvc-mixer-source.c', +'gvc-mixer-source-output.c', +'gvc-mixer-stream.c', +'gvc-mixer-ui-device.c', +'test-audio-device-selection.c', ] libgvc = static_library( @@ -35,7 +35,6 @@ libgvc = static_library( include_directories: [ include_directories('.'), include_directories(join_paths('..', '..')), -include_directories(join_paths('..', '..', 'src', 'gvc')), ], c_args: [ '-DG_LOG_DOMAIN="Gvc"', @@ -51,6 +50,5 @@ link_libgvc = declare_dependency( include_directories: [ include_directories('.'), include_directories(join_paths('..', '..')), -include_directories(join_paths('..', '..', 'src', 'gvc')), ], )
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2017-09-20 17:09:40 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new (New) Package is "budgie-desktop" Wed Sep 20 17:09:40 2017 rev:5 rq:527108 version:10.4 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2017-08-21 11:37:32.154012099 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new/budgie-desktop.changes 2017-09-20 17:09:41.398901964 +0200 @@ -1,0 +2,5 @@ +Mon Sep 18 18:30:34 UTC 2017 - mailaen...@opensuse.org + +- Update pkgconfig libmutter-0 to libmutter-1 + +--- Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.OpjvQE/_old 2017-09-20 17:09:42.190790490 +0200 +++ /var/tmp/diff_new_pack.OpjvQE/_new 2017-09-20 17:09:42.194789926 +0200 @@ -44,7 +44,7 @@ BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libwnck-3.0) %if 0%{?suse_version} > 1320 -BuildRequires: pkgconfig(libmutter-0) +BuildRequires: pkgconfig(libmutter-1) %else BuildRequires: pkgconfig(libmutter) %endif
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2017-08-21 11:37:31 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new (New) Package is "budgie-desktop" Mon Aug 21 11:37:31 2017 rev:4 rq:517752 version:10.4 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2017-08-16 16:23:13.353298787 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new/budgie-desktop.changes 2017-08-21 11:37:32.154012099 +0200 @@ -1,0 +2,5 @@ +Sun Aug 20 07:39:58 UTC 2017 - mailaen...@opensuse.org + +- Drop sed fix bdugie-desktop typo (resolved upstream) + +--- Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.S3R2LH/_old 2017-08-21 11:37:32.973896789 +0200 +++ /var/tmp/diff_new_pack.S3R2LH/_new 2017-08-21 11:37:32.985895101 +0200 @@ -119,9 +119,6 @@ %prep %setup -q -# Already fixed upstream -sed -i 's/bdugie-desktop.types/budgie-desktop.types/' docs/meson.build - %build %meson %meson_build
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2017-08-16 16:19:34 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new (New) Package is "budgie-desktop" Wed Aug 16 16:19:34 2017 rev:3 rq:517082 version:10.4 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2017-07-26 13:06:09.154837839 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new/budgie-desktop.changes 2017-08-16 16:23:13.353298787 +0200 @@ -1,0 +2,8 @@ +Tue Aug 15 18:12:38 UTC 2017 - mailaen...@opensuse.org + +- Update to version 10.4 "Irish Summer" +- Drop upstream gtk-3.22.14+raven-crash-fix.patch +- Drop upstream meson-0.41.patch +- Drop upstream 0001-wm-Default-to-an-empty-rpath.patch + +--- Old: 0001-wm-Default-to-an-empty-rpath.patch budgie-desktop-10.3.1.tar.xz gtk-3.22.14+raven-crash-fix.patch meson-0.41.patch New: budgie-desktop-10.4.tar.xz Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.Be0fEE/_old 2017-08-16 16:23:25.507592702 +0200 +++ /var/tmp/diff_new_pack.Be0fEE/_new 2017-08-16 16:23:25.511592140 +0200 @@ -1,8 +1,8 @@ # # spec file for package budgie-desktop # -# Copyright (c) 2013-2016 Ikey Doherty# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2013-2016 Ikey Doherty # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,13 @@ Name: budgie-desktop -Version:10.3.1 +Version:10.4 Release:0 -License:GPL-2.0+ and LGPL-2.1 Summary:GTK3 Desktop Environment -Url:https://solus-project.com/budgie/ +License:GPL-2.0+ and LGPL-2.1 Group: System/GUI/Other +Url:https://solus-project.com/budgie/ Source: https://github.com/budgie-desktop/budgie-desktop/releases/download/v%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM https://github.com/budgie-desktop/budgie-desktop/commit/b07359f5c14185126ac6d780c44b25fe325c2cba -Patch1: gtk-3.22.14+raven-crash-fix.patch -# PATCH-FIX-UPSTREAM https://github.com/budgie-desktop/budgie-desktop/pull/1056 -Patch2: meson-0.41.patch -# PATCH-FIX-UPSTREAM https://github.com/budgie-desktop/budgie-desktop/commit/932cd0c656bb8134a290316274f5d698e47d1a27 -patch3: 0001-wm-Default-to-an-empty-rpath.patch BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: meson >= 0.41.2 @@ -54,14 +48,15 @@ %else BuildRequires: pkgconfig(libmutter) %endif +BuildRequires: sassc BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: gnome-settings-daemon Requires: gnome-session +Requires: gnome-settings-daemon #Recommends: gnome-screensaver Recommends: NetworkManager-applet @@ -84,8 +79,8 @@ %package devel Summary:Development files for the Budgie Desktop Group: Development/Libraries/GNOME -Requires: typelib_1_0-Budgie-0_1 = %{version}-%{release} Requires: %{name} = %{version}-%{release} +Requires: typelib_1_0-Budgie-0_1 = %{version}-%{release} %description devel This package provides development files required for software to be @@ -123,9 +118,6 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 # Already fixed upstream sed -i 's/bdugie-desktop.types/budgie-desktop.types/' docs/meson.build ++ budgie-desktop-10.3.1.tar.xz -> budgie-desktop-10.4.tar.xz ++ 90642 lines of diff (skipped)
commit budgie-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2017-07-26 13:06:07 Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new (New) Package is "budgie-desktop" Wed Jul 26 13:06:07 2017 rev:2 rq:512568 version:10.3.1 Changes: --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2017-07-25 11:39:55.108389720 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new/budgie-desktop.changes 2017-07-26 13:06:09.154837839 +0200 @@ -1,0 +2,5 @@ +Mon Jul 24 02:16:59 UTC 2017 - matcher...@gmail.com + +- fix empty rpath 0001-wm-Default-to-an-empty-rpath.patch + +--- New: 0001-wm-Default-to-an-empty-rpath.patch Other differences: -- ++ budgie-desktop.spec ++ --- /var/tmp/diff_new_pack.MZm1gC/_old 2017-07-26 13:06:09.758752638 +0200 +++ /var/tmp/diff_new_pack.MZm1gC/_new 2017-07-26 13:06:09.762752074 +0200 @@ -29,6 +29,8 @@ Patch1: gtk-3.22.14+raven-crash-fix.patch # PATCH-FIX-UPSTREAM https://github.com/budgie-desktop/budgie-desktop/pull/1056 Patch2: meson-0.41.patch +# PATCH-FIX-UPSTREAM https://github.com/budgie-desktop/budgie-desktop/commit/932cd0c656bb8134a290316274f5d698e47d1a27 +patch3: 0001-wm-Default-to-an-empty-rpath.patch BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: meson >= 0.41.2 @@ -123,6 +125,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Already fixed upstream sed -i 's/bdugie-desktop.types/budgie-desktop.types/' docs/meson.build ++ 0001-wm-Default-to-an-empty-rpath.patch ++ >From 932cd0c656bb8134a290316274f5d698e47d1a27 Mon Sep 17 00:00:00 2001 From: Ikey DohertyDate: Tue, 18 Apr 2017 01:49:18 +0100 Subject: [PATCH 1/5] wm: Default to an empty rpath Signed-off-by: Ikey Doherty --- src/wm/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wm/meson.build b/src/wm/meson.build index ae13e5e..c41a029 100644 --- a/src/wm/meson.build +++ b/src/wm/meson.build @@ -43,6 +43,8 @@ budgie_wm_vala_args = [ '--vapidir', dir_libconfig, ] +rpath = '' + if dep_mutter.version().version_compare('>=3.21.0') rpath = dep_mutter.get_pkgconfig_variable('typelibdir') budgie_wm_vala_args += ['--girdir', rpath] -- 2.9.4