Re: [PR PATCH] [Updated] meson: update to version 1.4.0.

[SpidFightFR <SpidFightFR@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-meson
https://github.com/void-linux/void-packages/pull/49288

meson: update to version 1.4.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**



<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49288.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-meson-49288.patch --]
[-- Type: text/x-diff, Size: 9530 bytes --]

From 1db279b921bfa66c6adda91d17c7e8244f3cdfba Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Sun, 24 Mar 2024 21:44:00 +0100
Subject: [PATCH 1/6] meson: update to version 1.4.0.

---
 srcpkgs/meson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index fe5540ed0a4e41..ca1e11187a43d0 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=1.3.2
+version=1.4.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=492eb450c8b073024276f916f5adbb3c4bb7e90e9e6ec124efda064f3d9b5baa
+checksum=8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 56d2aaf746d7b530d1da72ed633f5938cd6514f6 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Sun, 24 Mar 2024 21:54:55 +0100
Subject: [PATCH 2/6] wayfire: update to version 0.8.1

---
 srcpkgs/wayfire/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 42caa0af15b160..3b3376abcd118d 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,15 +1,15 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.7.5
-revision=2
-_utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
+version=0.8.1
+revision=1
+_utils_commit=15f8e16721585ae3eaf278ba71d7064237eb23f5
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=meson
 configure_args="-Dprint_trace=false"
 hostmakedepends="pkg-config wayland-devel"
-makedepends="wf-config-devel wlroots0.16-devel cairo-devel pango-devel
+makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel json-c++
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
@@ -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="04f43df21167db15d266f7e01085b111680d57779ebc27a410201f995b33c6df
+ 5f0a0f523b29bd73e0f11d63079315d3a0a3c3cae6ce9b557e0433e25b5a0d92
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 
 # Optimization for nested STL calls

From c5b4657bb7b351be2575a7e8054f57e2db0a00e0 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Sun, 24 Mar 2024 21:56:03 +0100
Subject: [PATCH 3/6] wf-config: update to version 0.8.0.

---
 srcpkgs/wf-config/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 49271c8d7729d8..911c99b3c858d7 100644
--- 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 <youngjinpark20@gmail.com>"
 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

From bc94aa580a02bbea36e919e6df00d1fa7b1f1855 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Mon, 25 Mar 2024 21:57:28 +0100
Subject: [PATCH 4/6] switchboard-plug-network: update to version 2.5.0.

---
 srcpkgs/switchboard-plug-network/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index 382aea7559a0ec..2035bce1dbfad3 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,6 +1,6 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.4.2
+version=2.5.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala gettext"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/switchboard-plug-network"
 distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz"
-checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971
+checksum=cca83a64a32e1a213af2836500a7fea994b69e40045f4e4e32f634ace8ae898a

From a77a2b290151e5c1cd345049f997e5f8f522afaf Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Mon, 1 Apr 2024 19:09:14 +0200
Subject: [PATCH 5/6] budgie-desktop-view: disable error checking.

---
 srcpkgs/budgie-desktop-view/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/budgie-desktop-view/template b/srcpkgs/budgie-desktop-view/template
index ab90a0d3de5a85..0e928f6269641d 100644
--- a/srcpkgs/budgie-desktop-view/template
+++ b/srcpkgs/budgie-desktop-view/template
@@ -1,8 +1,9 @@
 # Template file for 'budgie-desktop-view'
 pkgname=budgie-desktop-view
 version=1.3
-revision=1
+revision=2
 build_style=meson
+configure_args="-D werror=false"
 hostmakedepends="pkg-config intltool vala glib-devel"
 makedepends="libglib-devel gtk+3-devel vala-devel"
 short_desc="Budgie desktop icons application"

From 0671ae03e8d0a1ab9418801d7c49a1609e8b4fab Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Mon, 1 Apr 2024 20:31:24 +0200
Subject: [PATCH 6/6] wayfire-plugins-extra: update to version 0.8.1.

---
 .../patches/forcefullscreen-crash.patch       | 50 -------------------
 srcpkgs/wayfire-plugins-extra/template        |  4 +-
 2 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch

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 <oreaus@gmail.com>
-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<wf::subsurface_removed_signal*>(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
index 97170bfcdf9807..ba5fc8382dff22 100644
--- 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.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
 distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz"
-checksum=70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840
+checksum=22931376eebb93092828e2fb192facf097de4dc99c8766732f7cabc4e5175feb
 
 post_install() {
 	vlicense LICENSE