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 <[email protected]> + +- Revert vala path changes + +------------------------------------------------------------------- +Thu Sep 10 16:57:19 UTC 2020 - Callum Farmer <[email protected]> + +- 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 <[email protected]> + +- 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 pkgconfig(libmutter-6)) +BuildRequires: (pkgconfig(libmutter-6) or pkgconfig(libmutter-7)) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(gnome-settings-daemon) BuildRequires: pkgconfig(alsa) @@ -160,11 +148,6 @@ export LANG=en_US.UTF-8 %meson_install -# Correct vala directory -mkdir -pv %{buildroot}%{_datadir}/vala-%{vala_version}/ -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 @@ -194,13 +177,11 @@ %files %license LICENSE LICENSE.LGPL2.1 -%dir %{_datadir}/gnome-session -%dir %{_datadir}/gnome-session/sessions +%{_datadir}/gnome-session %{_bindir}/budgie-* %{_datadir}/applications/budgie-*.desktop %{_datadir}/glib-2.0/schemas/com.solus-project.*.gschema.xml %{_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 @@ -227,7 +208,7 @@ %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %{_datadir}/gir-1.0/Budgie-1.0.gir -%{_datadir}/vala-%{vala_version}/vapi/budgie-1.0.* +%{_datadir}/vala/vapi/budgie-1.0.* %files -n typelib-1_0-Budgie-1_0 %{_libdir}/girepository-1.0/Budgie-1.0.typelib ++++++ nemo-instead-of-nautilus.patch ++++++ --- /var/tmp/diff_new_pack.5Cl8Sf/_old 2020-09-12 00:07:42.520938331 +0200 +++ /var/tmp/diff_new_pack.5Cl8Sf/_new 2020-09-12 00:07:42.520938331 +0200 @@ -39,9 +39,8 @@ index dca91296..c6b5c8c5 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -2,4 +2,4 @@ +@@ -2,3 +2,3 @@ option('with-polkit', type: 'boolean', value: true, description: 'Enable PolKit support') - option('with-bluetooth', type: 'boolean', value: true, description: 'Enable gnome-bluetooth support') option('with-gtk-doc', type: 'boolean', value: true, description: 'Build gtk-doc documentation') -option('with-desktop-icons', type: 'combo', choices: ['nautilus', 'none'], value: 'nautilus', description: 'Desktop icon handling') +option('with-desktop-icons', type: 'combo', choices: ['nemo', 'none'], value: 'nemo', description: 'Desktop icon handling') ++++++ vala-0.49.patch ++++++ >From 4451cc3350b8e2f611061bd968a380106650e30c Mon Sep 17 00:00:00 2001 From: Callum Farmer <[email protected]> Date: Thu, 10 Sep 2020 17:19:11 +0100 Subject: [PATCH] Fix build with vala 0.49 Signed-off-by: Callum Farmer <[email protected]> --- src/appsys/AppSystem.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appsys/AppSystem.vala b/src/appsys/AppSystem.vala index 4224ec64..70d47601 100644 --- a/src/appsys/AppSystem.vala +++ b/src/appsys/AppSystem.vala @@ -70,7 +70,7 @@ public class AppSystem : GLib.Object } private void signal_received(GLib.DBusConnection connection, - string sender, + string? sender, string object_path, string interface_name, string signal_name, --
