From e04257822db8216ef7cd3b23f11bd9b9117b40b7 Mon Sep 17 00:00:00 2001 From: madnessday666 Date: Fri, 1 Mar 2024 18:35:44 +0300 Subject: [PATCH] wayfire: update to 0.8.0 --- .../patches/forcefullscreen-crash.patch | 50 ------------------- srcpkgs/wayfire-plugins-extra/template | 4 +- .../fix_duplicate_installation_manpage.patch | 9 ++++ .../fix_return_value_of_git_commands.patch | 13 +++++ srcpkgs/wayfire/template | 12 ++--- srcpkgs/wcm/template | 6 +-- srcpkgs/wf-config/template | 4 +- srcpkgs/wf-shell/template | 9 ++-- 8 files changed, 39 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch mode change 100644 => 100755 srcpkgs/wayfire-plugins-extra/template create mode 100755 srcpkgs/wayfire/patches/fix_duplicate_installation_manpage.patch create mode 100644 srcpkgs/wayfire/patches/fix_return_value_of_git_commands.patch mode change 100644 => 100755 srcpkgs/wayfire/template mode change 100644 => 100755 srcpkgs/wcm/template mode change 100644 => 100755 srcpkgs/wf-config/template mode change 100644 => 100755 srcpkgs/wf-shell/template diff --git a/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch b/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch deleted file mode 100644 index 5b6bcc4c4c2f8c..00000000000000 --- a/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c321dda631026485d767f7125e80e5f5d7ad5b35 Mon Sep 17 00:00:00 2001 -From: Scott Moreau -Date: Tue, 16 Feb 2021 04:49:52 -0700 -Subject: [PATCH] force-fullscreen: Fix crash when closing fullscreened - surfaces (#79) - -Introduced by a change in core, rework things to make it not crash -when closing a view. ---- - src/force-fullscreen.cpp | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/force-fullscreen.cpp b/src/force-fullscreen.cpp -index 364f239..894c403 100644 ---- a/src/force-fullscreen.cpp -+++ b/src/force-fullscreen.cpp -@@ -41,11 +41,23 @@ class fullscreen_subsurface : public wf::surface_interface_t, - - fullscreen_subsurface(wayfire_view view) : - wf::surface_interface_t(), wf::compositor_surface_t() -- {} -+ { -+ view->connect_signal("subsurface-removed", &on_subsurface_removed); -+ } - - ~fullscreen_subsurface() - {} - -+ wf::signal_connection_t on_subsurface_removed = [&] (auto data) -+ { -+ auto ev = static_cast(data); -+ if ((ev->subsurface.get() == this) && _mapped) -+ { -+ _mapped = false; -+ wf::emit_map_state_change(this); -+ } -+ }; -+ - void on_pointer_enter(int x, int y) override - { - wf::get_core().set_cursor("default"); -@@ -295,8 +307,6 @@ class wayfire_force_fullscreen : public wf::plugin_interface_t - - if (background->black_border) - { -- wf::emit_map_state_change(background->black_border); -- background->black_border->_mapped = false; - view->remove_subsurface(background->black_border); - background->black_border = nullptr; - } diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template old mode 100644 new mode 100755 index 97170bfcdf9807..4ece0743c47985 --- a/srcpkgs/wayfire-plugins-extra/template +++ b/srcpkgs/wayfire-plugins-extra/template @@ -1,6 +1,6 @@ # Template file for 'wayfire-plugins-extra' pkgname=wayfire-plugins-extra -version=0.7.5 +version=0.8.0 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" @@ -11,7 +11,7 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://wayfire.org/" distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz" -checksum=70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840 +checksum=6871f19c79dc9d9c965229f958da79eebbc7ff54ebc8ba0b97c514aaaf36cd3b post_install() { vlicense LICENSE diff --git a/srcpkgs/wayfire/patches/fix_duplicate_installation_manpage.patch b/srcpkgs/wayfire/patches/fix_duplicate_installation_manpage.patch new file mode 100755 index 00000000000000..7e6bdb961221c4 --- /dev/null +++ b/srcpkgs/wayfire/patches/fix_duplicate_installation_manpage.patch @@ -0,0 +1,9 @@ +--- /wayfire-0.8.0/man/meson.build 2024-02-29 23:16:03.213261265 +0300 +@@ -1,7 +1,5 @@ + configure_file(input: 'wayfire.1.in', + output: 'wayfire.1', +- install: true, +- install_dir: 'man', + configuration: conf_data) + + install_man(join_paths(meson.project_build_root(), 'man', 'wayfire.1')) diff --git a/srcpkgs/wayfire/patches/fix_return_value_of_git_commands.patch b/srcpkgs/wayfire/patches/fix_return_value_of_git_commands.patch new file mode 100644 index 00000000000000..e030129ec42623 --- /dev/null +++ b/srcpkgs/wayfire/patches/fix_return_value_of_git_commands.patch @@ -0,0 +1,13 @@ +--- /wayfire-0.8.0/meson.build ++++ /wayfire-0.8.0/meson.build +@@ -86,8 +86,8 @@ + version = '"@0@"'.format(meson.project_version()) + git = find_program('git', native: true, required: false) + if git.found() +- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: true) +- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: true) ++ git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false) ++ git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false) + if git_commit.returncode() == 0 and git_branch.returncode() == 0 + version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format( + meson.project_version(), diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template old mode 100644 new mode 100755 index 42caa0af15b160..829af2d237c5d4 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,13 +1,13 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.7.5 -revision=2 -_utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac +version=0.8.0 +revision=1 +_utils_commit=08553c418f164bf5e84613d27447a32e380b75f0 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403 create_wrksrc=yes build_wrksrc="${pkgname}-${version}" build_style=meson -configure_args="-Dprint_trace=false" +configure_args="-Dprint_trace=false --wrap-mode=default" hostmakedepends="pkg-config wayland-devel" makedepends="wf-config-devel wlroots0.16-devel cairo-devel pango-devel $(vopt_if image 'libjpeg-turbo-devel libpng-devel')" @@ -19,8 +19,8 @@ homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/v${version}.tar.gz https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz" -checksum="ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e - bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f +checksum="3b67dd03a9370a0c0a2d9b98d77d9184d62b25ca13844cfdbb0cac788cb9d4b6 + a271a567b4512a523c07e98fe724ee2d30c903751e6ebee47b80ed58c468c073 09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f" # Optimization for nested STL calls diff --git a/srcpkgs/wcm/template b/srcpkgs/wcm/template old mode 100644 new mode 100755 index a6ae7daa8a3806..b4a85b39584303 --- a/srcpkgs/wcm/template +++ b/srcpkgs/wcm/template @@ -1,17 +1,17 @@ # Template file for 'wcm' pkgname=wcm -version=0.7.5 +version=0.8.0 revision=1 build_style=meson configure_args="-Denable_wdisplays=false" hostmakedepends="pkg-config wayland-devel" -makedepends="wayfire-devel gtk+3-devel wf-shell" +makedepends="wayfire-devel wf-shell gtkmm-devel" short_desc="Wayfire Config Manager" maintainer="Érico Nogueira " license="MIT" homepage="https://wayfire.org/" distfiles="https://github.com/WayfireWM/wcm/archive/v${version}.tar.gz" -checksum=39dd349a925295bb743b7c1318807ec2ce6675bfa482fc9b420da71c7b798515 +checksum=24000f5d037dc03eed9eaf2803987db5e02c1776bbe7c56b9c95c5942f65938f post_install() { vlicense LICENSE diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template old mode 100644 new mode 100755 index 49271c8d7729d8..911c99b3c858d7 --- a/srcpkgs/wf-config/template +++ b/srcpkgs/wf-config/template @@ -1,6 +1,6 @@ # Template file for 'wf-config' pkgname=wf-config -version=0.7.1 +version=0.8.0 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz" -checksum=9c212f85bfb26d135610f45865b4401e0c33a0ab3577ac65042eb23ebfe91bdb +checksum=5b69ab8886e2b0e9c5bffa65c5c676c2848fbcc0e67201886a5f2fdd354e25fb post_install() { vlicense LICENSE diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template old mode 100644 new mode 100755 index a5d9cfa8094136..45cfdc7089beda --- a/srcpkgs/wf-shell/template +++ b/srcpkgs/wf-shell/template @@ -1,19 +1,18 @@ # Template file for 'wf-shell' pkgname=wf-shell -version=0.7.0 -revision=2 +version=0.8.0 +revision=1 build_style=meson build_helper="gir" -configure_args="-Dwayland-logout:implementation=c" hostmakedepends="gobject-introspection pkg-config wayland-devel" makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel wayfire-devel - gtk+3-devel gtk-layer-shell-devel" + gtk-layer-shell-devel libdbusmenu-gtk3-devel" short_desc="Wayfire shell with GTK-based panel and background client" maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz" -checksum=7495c690a1c021e0c82ba304513b3e7870cb329f7f0bf88df3bc5f46535d5ec7 +checksum=d74b744194f91d9181699107072c006399b8b38696d68bad91bd812c7f73ee1d post_install() { vlicense LICENSE