[PR PATCH] meson 0.60

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] meson 0.60
@ 2021-11-13 21:54 paper42
  2021-11-13 21:57 ` [PR PATCH] [Updated] " paper42
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: paper42 @ 2021-11-13 21:54 UTC (permalink / raw)
  To: ml

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

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages meson-0.60
https://github.com/void-linux/void-packages/pull/34059

meson 0.60
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I ran the configure phase on all packages with meson build_style, currently broken builds (some might not be caused by this update):

- [ ] igt-gpu-tools

```
The Meson build system
Version: 0.60.1
Source dir: /builddir/igt-gpu-tools-1.25
Build dir: /builddir/igt-gpu-tools-1.25/build
Build type: native build

meson.build:1:0: ERROR: Unknown options: "build_docs, build_runner, build_tests"
```

- [ ] NetworkManager
```
=> NetworkManager-1.32.12_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libgio-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgobject-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libglib-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgmodule-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libdl.so.2 <-> glibc>=2.32_1
   SONAME: libndp.so.0 <-> libndp>=1.3_1
   SONAME: libudev.so.1 <-> eudev-libudev>=1.6_1
   SONAME: libelogind.so.0 <-> libelogind>=238.1_2
   SONAME: libcurl.so.4 <-> libcurl>=7.75.0_2
   SONAME: libpsl.so.5 <-> libpsl>=0.20.2_1
   SONAME: libsmime3.so <-> nss>=3.12.4_1
   SONAME: libnss3.so <-> nss>=3.12.4_1
   SONAME: libnspr4.so <-> nspr>=4.8_1
   SONAME: libpthread.so.0 <-> glibc>=2.32_1
   SONAME: libc.so.6 <-> glibc>=2.32_1
   SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
   SONAME: libnm.so.0 <-> libnm-1.32.12_1
   SONAME: libnewt.so.0.52 <-> newt>=0.52.18_1
   SONAME: libreadline.so.8 <-> libreadline8>=8.0_1
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
   SONAME: src/core/devices/wwan/libnm-wwan.so <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libmm-glib.so.0 <-> libmm-glib>=1.0.0_1
=> ERROR: NetworkManager-1.32.12_1: cannot guess required shlibs, aborting!
```

- [ ] gnome-settings-daemon
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/gnome-settings-daemon-40.0.1
Build dir: /builddir/gnome-settings-daemon-40.0.1/build
Build type: native build
Project name: gnome-settings-daemon
Project version: 40.0.1
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64

meson.build:87:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
```



- [ ] libsixel
```
=> xbps-src: updating repositories for host (x86_64)...
The Meson build system
Version: 0.60.1
Source dir: /builddir/libsixel-1.10.3
Build dir: /builddir/libsixel-1.10.3/build
Build type: native build
Project name: libsixel
Project version: 1.10.3
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64
Checking for function "unreachable" : YES 
Compiler for C supports arguments -Wformat=2: YES 
Compiler for C supports arguments -Wsign-conversion: YES 
Compiler for C supports arguments -Wuninitialized: YES 
Compiler for C supports arguments -Wstrict-overflow: YES 
Compiler for C supports arguments -Wshadow: YES 
Compiler for C supports arguments -Wdouble-promotion: YES 
Compiler for C supports arguments -Wswitch-default: YES 
Compiler for C supports arguments -Wunused-function: YES 
Compiler for C supports arguments -Wunused-but-set-variable: YES 
Compiler for C supports arguments -Bsymbolic: YES 
Library m found: YES
Checking for function "malloc" : YES 
Checking for function "realloc" : YES 
Checking for function "memset" : YES 
Checking for function "getopt_long" : YES 
Has header "assert.h" : YES 
Has header "math.h" : YES 
Has header "ctype.h" : YES 
Has header "memory.h" : YES 
Has header "string.h" : YES 
Has header "unistd.h" : YES 
Has header "stdint.h" : YES 
Has header "getopt.h" : YES 
Has header "sys/types.h" : YES 
Has header "sys/stat.h" : YES 
Has header "fcntl.h" : YES 
Has header "errno.h" : YES 
Has header "limits.h" : YES 
Has header "sys/time.h" : YES 
Has header "time.h" : YES 
Has header "signal.h" : YES 
Has header "sys/select.h" : YES 
Has header "sys/signal.h" : YES 
Has header "termios.h" : YES 
Has header "sys/ioctl.h" : YES 
Has header "inttypes.h" : YES 
Dependency gdk-pixbuf-2.0 skipped: feature gdk-pixbuf2 disabled
Library gd found: NO
Dependency libcurl skipped: feature libcurl disabled
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency libjpeg found: YES 2.1.1
Run-time dependency libpng found: YES 1.6.37
Program python2 found: NO (disabled by: python2 )
Configuring config.h using configuration
Configuring sixel.h using configuration
Program bash found: YES (/usr/bin/bash)
Configuring libsixel-config using configuration
meson.build:161: WARNING: Perl, PHP and Ruby modules are available but not installed by Meson. If you want them, please refer to their individual installation directories for instructions after building libsixel.

meson.build:163:0: ERROR: Format placeholder @9@ out of range.
```

- [ ] libwacom
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/libwacom-1.12
Build dir: /builddir/libwacom-1.12/build
Build type: native build

meson.build:1:0: ERROR: Unknown options: "exe_wrapper"
```

- [ ] vala-panel{,-appmenu}
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/vala-panel-0.5.0
Build dir: /builddir/vala-panel-0.5.0/build
Build type: native build
Project name: vala-panel
Project version: 0.5.0
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Vala compiler for the host machine: valac (valac 0.52.4)
Host machine cpu family: x86_64
Host machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.70.0
Run-time dependency gio-2.0 found: YES 2.70.0
Run-time dependency gio-unix-2.0 found: YES 2.70.0
Run-time dependency gmodule-2.0 found: YES 2.70.0
Run-time dependency gtk+-3.0 found: YES 3.24.30
Run-time dependency gdk-x11-3.0 found: YES 3.24.30
Run-time dependency gdk-wayland-3.0 found: YES 3.24.30
Run-time dependency gtk-layer-shell-0 found: YES 0.6.0
Library m found: YES
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

po/meson.build:1:5: ERROR: Tried to create target "vala-panel-nb.mo", but a target of that name already exists.
```

- [ ] wlclock
```
=> ERROR: SHA256 mismatch for 'v1.0.0.tar.gz:'
e2f218e70378342c344e7afa43c4361e3308936a7afaf54a0cad9970267a4ff4
```
- [ ] wtype
```
=> wtype-0.3_1: patching: fix_reallocarray.patch.
1 out of 2 hunks FAILED -- saving rejects to file main.c.rej
=> ERROR: wtype-0.3_1: do-patch_00-patches: 'patch -s ${_args} -i ${_patch} 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```

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

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

From 2f30a6e6436414c1c6c8f7aeb0e26d03ca61109a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Nov 2021 22:52:09 +0100
Subject: [PATCH 01/35] meson: update to 0.60.1.

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 6cbcd3c9e966..0a7a60ea5a6d 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.59.4
+version=0.60.1
 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://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
+checksum=5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 7c8104b15409c308deb3c5db5b86c1bc472969f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:24:04 +0100
Subject: [PATCH 02/35] PackageKit: update to 1.2.4.

---
 srcpkgs/PackageKit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 155dd156a06a..062dba3d3b00 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
-version=1.2.2
-revision=2
+version=1.2.4
+revision=1
 wrksrc="PackageKit-PACKAGEKIT_${version//./_}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
-checksum=e87e95ce7423f49eff6dad054c86ba6f922e52d0a757f822e0343da0f44d3dbb
+checksum=4a7b0a41ffa56ad8af67156c46ecb9d4eb439b31a4cb581d959bd5480444954b
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 
 build_options="gir vala"

From f1b2eeba7feb07a52bc91f12b5439dd4e42b66b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:27:14 +0100
Subject: [PATCH 03/35] bijiben: remove obsolete zeitgeist support

bijiben 40.0 dropped zeitgeist support
---
 srcpkgs/bijiben/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8c3e51c3fc37..604076fdb93c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+ libhandy1-devel"
+depends="desktop-file-utils tracker3"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 6a05b4985c13a5ac7730d518c61dd788345ff99d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:41:10 +0100
Subject: [PATCH 04/35] colord-gtk: fix building vala bindings

---
 srcpkgs/colord-gtk/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 65463f110590..634a9322dae3 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,10 +1,10 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvala=$(vopt_if vala true false)
+configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
  -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
@@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.freedesktop.org/software/colord"
+homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
 checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
 
@@ -30,5 +30,8 @@ colord-gtk-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }

From 9f5a031755ceea44368cd2ac816d09458c0db181 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:52:14 +0100
Subject: [PATCH 05/35] efl: drop removed configure args

---
 srcpkgs/efl/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 8786d5d94edf..c116523094ea 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -10,8 +10,6 @@ configure_args="
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
  -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
- -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
- -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
  $(vopt_bool elogind systemd)
  $(vopt_bool x11 x11)

From c702b59d36426b228c34e9e09d0d32ba590e339d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:59:16 +0100
Subject: [PATCH 06/35] enlightenment: drop a removed configure argument

---
 srcpkgs/enlightenment/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index db9c886dc920..360a0f5368e6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -3,7 +3,7 @@ pkgname=enlightenment
 version=0.24.2
 revision=1
 build_style=meson
-configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
+configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
  $(vopt_bool wayland wl)"
 hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)"
 makedepends="gettext-devel efl-devel pam-devel xkeyboard-config

From 1a94af005dbd9da51b25801e4a5cfc31f5189365 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 16:03:04 +0100
Subject: [PATCH 07/35] epiphany: drop a removed configure option

---
 srcpkgs/epiphany/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c58e2fa54ef6..0ffa06f547fe 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,7 +4,7 @@ version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
+configure_args="-Dunit_tests=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel

From b4213f3df7a8b173bfd41fa7a1afd1e5829fd172 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:01:58 +0100
Subject: [PATCH 08/35] gnome-bluetooth: remove obsolete configure options

---
 srcpkgs/gnome-bluetooth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 83d89c0a8acb..e6861631b08d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -4,8 +4,7 @@ version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dicon-update=false -Dgtk_doc=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"

From a7ec4912b523397833fb169f3798bbad945442e3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:06 +0100
Subject: [PATCH 09/35] gnome-initial-setup: remove obsolete configure options

---
 srcpkgs/gnome-initial-setup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 30a4a6ed4762..075e4b86324f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -3,8 +3,7 @@ pkgname=gnome-initial-setup
 version=40.4
 revision=1
 build_style=meson
-configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
- -Dsystemd=false"
+configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel

From 4ccbb02d99c4e8aa7e4c2211d9a40b47455c6dc9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:13 +0100
Subject: [PATCH 10/35] gedit: remove obsolete configure options

* gir is not optional anymore, so also removing the build option
---
 srcpkgs/gedit/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index b4e862c26ad0..e93ff8905272 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,12 +5,10 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true
- $(vopt_bool gir vapi) $(vopt_bool gir introspection)"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
- $(vopt_if gir vala)"
+configure_args="-Dplugins=true"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel python3-gobject-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 
-build_options="gir"
-build_options_default="gir"
-
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel
 	 libpeas-devel tepl-devel"
@@ -31,9 +26,7 @@ gedit-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gedit/gir-1.0
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gedit/gir-1.0
+		vmove usr/share/vala
 	}
 }

From e502c83f9b42e1483073250b41fdcc75ec3aacb1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:17 +0100
Subject: [PATCH 11/35] gnome-builder: remove obsolete configure options

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a3ce20126d78..26cf768c391a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
 revision=3
 build_style=meson
 build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
+configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel

From 58b6df7232da1b19da28e55649f1b9ed78043408 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:26 +0100
Subject: [PATCH 12/35] gamehub: update to 0.16.1.

---
 srcpkgs/gamehub/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index ccbf98b53483..76b0f489f3de 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -1,8 +1,8 @@
 # Template file for 'gamehub'
 pkgname=gamehub
-version=0.16.0
+version=0.16.1
 revision=1
-wrksrc="GameHub-${version}-1-master"
+wrksrc="GameHub-${version}-2-master"
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
@@ -12,9 +12,5 @@ short_desc="All your games in one place"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tkashkin.tk/projects/gamehub/"
-distfiles="https://github.com/tkashkin/GameHub/archive/${version}-1-master.tar.gz"
-checksum=4244c914d7427933727ec0611886720b9325c4d4a852e0e8c283f6331ebd30e2
-
-post_install() {
-	vinstall data/com.github.tkashkin.gamehub.desktop.in 644 usr/share/applications com.github.tkashkin.gamehub.desktop
-}
+distfiles="https://github.com/tkashkin/GameHub/archive/refs/tags/${version}-2-master.tar.gz"
+checksum=bbbf2f5216ce6f0d6a57179f388a714aec52188f4e67a9deb6478061441a30b5

From c0160f6cce02bc783590568412d4c9dc6fd99e3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:34 +0100
Subject: [PATCH 13/35] NetworkManager: remove obsolete configure options

---
 srcpkgs/NetworkManager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e99d04798939..7001b27dc0e3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -4,7 +4,7 @@ version=1.32.12
 revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
+configure_args="-Dsystemd_journal=false
  -Dlibaudit=no -Dovs=false -Dselinux=false
  -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false

From ebc36dfdaa9a865829920ce8dba9c48a4bdf98cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:21:42 +0100
Subject: [PATCH 14/35] graphene: remove obsolete configure options

---
 srcpkgs/graphene/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 79b2ac2e945e..6be39623eeae 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -4,7 +4,7 @@ version=1.10.6
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+configure_args="-Dinstalled_tests=false
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"

From bab7e613997d4b411bf62950d010a8bba0b42c4d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:39 +0100
Subject: [PATCH 15/35] grilo: remove obsolete configure options

---
 srcpkgs/grilo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 64bae9bd4e2f..e47ec38542a5 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,7 +4,7 @@ version=0.3.13
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala)
+configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
  -Denable-gtk-doc=false"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
 makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel

From f56196015147ff26d91c9949ce17d80b3cd78c60 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:43 +0100
Subject: [PATCH 16/35] gnome-passwordsafe: fix build

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

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index fe91bcd9ed23..8f68cbf329f1 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -2,7 +2,7 @@
 pkgname=gnome-passwordsafe
 version=5.0
 revision=2
-wrksrc="PasswordSafe-${version}"
+wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection
  python3-pykeepass"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983
+checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449

From 089bc4a483c8cb1e79675e5be075349deaeb901b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:22 +0100
Subject: [PATCH 17/35] libgudev: remove obsolete configure options

---
 srcpkgs/libgudev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 47d1b8fc365d..e7603d00ce2f 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvala=$(vopt_if vala enabled disabled)"
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"

From 23c50f649c9698adee3a1deea0696ddec2047ff4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:34 +0100
Subject: [PATCH 18/35] libfprint: remove obsolete configure options

---
 srcpkgs/libfprint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index 33ac4c2a0571..16e6b2ffa1e0 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=libfprint-v$version
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
  libgusb-devel libglib-devel"

From 1549b3dc922f7f30055044a24495c726f43034dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:48 +0100
Subject: [PATCH 19/35] gst1-editing-services: remove obsolete configure
 options

---
 srcpkgs/gst1-editing-services/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 457dec0424cf..fde8efae9569 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled"
 hostmakedepends="flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
 short_desc="GStreamer 1.x Editing Services"

From 45dd29b0c49939f7fd621646366b2cbd7cd3a4e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:01:59 +0100
Subject: [PATCH 20/35] gst-plugins-base1: remove obsolete configure options

---
 srcpkgs/gst-plugins-base1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 050521f071c3..c0dce5856f8d 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"

From ba7c7ddf4ecd09250ac8dd3001ff0aac5caa6158 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:01 +0100
Subject: [PATCH 21/35] gst-plugins-bad1: remove obsolete configure options

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

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..77a88a91fba1 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -5,9 +5,9 @@ revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
- -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
+ -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
  -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled

From d72976f92d30de458df9bcb987fa4f1c40651b8f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:12 +0100
Subject: [PATCH 22/35] hexchat: remove obsolete configure options

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 97937999bb0d..7b3bc658d5aa 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -3,7 +3,7 @@ pkgname=hexchat
 version=2.16.0
 revision=3
 build_style=meson
-configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"

From 46e30791822cd282de9fa3350d5056a27c666a7b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:20 +0100
Subject: [PATCH 23/35] igt-gpu-tools: remove obsolete configure options

---
 srcpkgs/igt-gpu-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3b222ecd18d8..3f8b4e2b6166 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -22,7 +22,7 @@ lib32disabled=yes
 archs="i686* x86_64*"
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled"
+	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
 fi
 
 post_install() {

From 197f6da8082acdd2448db7be16fbf64657f361ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:54:21 +0100
Subject: [PATCH 24/35] libgweather: remove obsolete configure options

---
 srcpkgs/libgweather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 6d9b85a07d04..857006ea8786 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -4,8 +4,7 @@ version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
- -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"

From d3ebb47126cf68832bc0785369b193e134651b1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:04:25 +0100
Subject: [PATCH 25/35] light-locker: fix build and license

---
 srcpkgs/light-locker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index e3bb799ba171..d50c71480a33 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,15 +1,15 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel elogind-devel"
+ libXxf86misc-devel libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/the-cavalry/light-locker"
 distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz"
 checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c

From ee971761d8340af1396daa39f3a9be7cb6f21c52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:19:07 +0100
Subject: [PATCH 26/35] ncmpc: disable html manual

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

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 683ec13e85a3..a7d76aa3ce9e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,9 +1,9 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
 version=0.45
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlirc=disabled"
+configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
 short_desc="Ncurses-based mpd client"

From 063cd6b732b3dedaa028d31f8d4d5f1efcecaf75 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:22:30 +0100
Subject: [PATCH 27/35] pixman: remove obsolete configure options

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

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 456e9d1628e8..eba3b82c9fa7 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -5,8 +5,8 @@ revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
-configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
- -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
+configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled
+ -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
 makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"

From 3aaaf250ccd556f7a8ee1b1f0f3a19ce29580e3f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:33:52 +0100
Subject: [PATCH 28/35] seatd: fix configure arguments

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

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index c619787ae3eb..178f1b3d8aa9 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,8 @@ pkgname=seatd
 version=0.6.3
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind)
+ -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From d57fa6abf58f96a77aed474ec7acade9ccea82e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:34:04 +0100
Subject: [PATCH 29/35] spice-gtk: remove obsolete configure options

---
 srcpkgs/spice-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 7218e837891f..351923f41e7f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -7,8 +7,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
- -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
- -Dpulse=disabled -Dgtk_doc=disabled"
+ -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel

From 6238aa32dd5c995c9b33dcdbc5a591b02b30e8f4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:37:05 +0100
Subject: [PATCH 30/35] switchboard: remove obsolete configure options

---
 srcpkgs/switchboard/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 45031a8d8b76..ebb706e5d9e5 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -3,7 +3,6 @@ pkgname=switchboard
 version=2.3.7
 revision=2
 build_style=meson
-configure_args="-Dlibunity=false"
 hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"

From 8a8dc5d6a93687f68b9034604983a86049db612c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:41:37 +0100
Subject: [PATCH 31/35] cglm: update to 0.8.4, switch to meson

---
 srcpkgs/cglm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index c7dfee606c45..05885c452520 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
 # Template file for 'cglm'
 pkgname=cglm
-version=0.8.3
+version=0.8.4
 revision=1
-build_style=cmake
+build_style=meson
 short_desc="Highly Optimized Graphics Math (glm) for C"
 maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=3a3f935f9f2ed5a8cb6337e421bf6f3a699a72d8cfe26fde1bbb8fde5c1c8aaf
+checksum=42f84c42c8a3e62954da77ab5c5d3264033d5802009e175db7921332a476126e
 
 post_install() {
 	vlicense LICENSE

From 6fdae79fcd41b014d0e55321afef793cc1c41df0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:56:50 +0100
Subject: [PATCH 32/35] totem: remove gir build option

---
 srcpkgs/totem/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8871c546b50a..4fba4f04ca8a 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -4,12 +4,9 @@ version=3.38.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-python=no -Denable-nautilus=yes
- -Denable-introspection=$(vopt_if gir yes no)
- -Denable-vala=$(vopt_if gir yes no)"
-hostmakedepends="intltool itstool pkg-config
- $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1
- glib-devel"
+configure_args="-Denable-python=no"
+hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1 
+ gst-plugins-good1 glib-devel"
 # XXX missing lirc plugin.
 makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
@@ -31,16 +28,11 @@ do_check() {
 	:
 }
 
-build_options="gir"
-build_options_default="gir"
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -51,8 +43,6 @@ totem-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 	}
 }

From f652b446e1499228ebb1006a5fbd7291f5214882 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:57:22 +0100
Subject: [PATCH 33/35] tracker3: remove deprecated networkmanager option

---
 srcpkgs/tracker3/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..a6f8135b77d6 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,16 +1,15 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=3
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled
- -Dstemmer=disabled -Dsystemd_user_services=false"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="tar python3-gobject"
 short_desc="Personal search tool and storage system"
 maintainer="q66 <daniel@octaforge.org>"

From 556d71aacd5c02419830922abbe3e72dbaf74473 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:00:29 +0100
Subject: [PATCH 34/35] tracker-miners: remove taglib configure option

---
 srcpkgs/tracker-miners/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..9c4762cf56ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
  -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
@@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ libvorbis-devel poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
 short_desc="Data miners for tracker"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -24,8 +24,4 @@ license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
 checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
+make_check=no # relies on unsupported ops in chroot

From 70739caad658c38324a3c225d63ddd4ce02a709f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:18:35 +0100
Subject: [PATCH 35/35] tracker3-miners: remove obsolete configure options

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..4c752fe55add 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -5,20 +5,20 @@ revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
  -Dsystemd_user_services=false -Dnetwork_manager=enabled"
 hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
  NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker3"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
@ 2021-11-13 21:57 ` paper42
  2021-11-14 13:06 ` paper42
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2021-11-13 21:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages meson-0.60
https://github.com/void-linux/void-packages/pull/34059

meson 0.60
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I ran the configure phase on all packages with meson build_style, currently broken builds (some might not be caused by this update):

- [ ] igt-gpu-tools

```
The Meson build system
Version: 0.60.1
Source dir: /builddir/igt-gpu-tools-1.25
Build dir: /builddir/igt-gpu-tools-1.25/build
Build type: native build

meson.build:1:0: ERROR: Unknown options: "build_docs, build_runner, build_tests"
```

- [ ] NetworkManager
```
=> NetworkManager-1.32.12_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libgio-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgobject-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libglib-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgmodule-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libdl.so.2 <-> glibc>=2.32_1
   SONAME: libndp.so.0 <-> libndp>=1.3_1
   SONAME: libudev.so.1 <-> eudev-libudev>=1.6_1
   SONAME: libelogind.so.0 <-> libelogind>=238.1_2
   SONAME: libcurl.so.4 <-> libcurl>=7.75.0_2
   SONAME: libpsl.so.5 <-> libpsl>=0.20.2_1
   SONAME: libsmime3.so <-> nss>=3.12.4_1
   SONAME: libnss3.so <-> nss>=3.12.4_1
   SONAME: libnspr4.so <-> nspr>=4.8_1
   SONAME: libpthread.so.0 <-> glibc>=2.32_1
   SONAME: libc.so.6 <-> glibc>=2.32_1
   SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
   SONAME: libnm.so.0 <-> libnm-1.32.12_1
   SONAME: libnewt.so.0.52 <-> newt>=0.52.18_1
   SONAME: libreadline.so.8 <-> libreadline8>=8.0_1
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
   SONAME: src/core/devices/wwan/libnm-wwan.so <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libmm-glib.so.0 <-> libmm-glib>=1.0.0_1
=> ERROR: NetworkManager-1.32.12_1: cannot guess required shlibs, aborting!
```

- [ ] gnome-settings-daemon
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/gnome-settings-daemon-40.0.1
Build dir: /builddir/gnome-settings-daemon-40.0.1/build
Build type: native build
Project name: gnome-settings-daemon
Project version: 40.0.1
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64

meson.build:87:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
```



- [ ] libsixel
```
=> xbps-src: updating repositories for host (x86_64)...
The Meson build system
Version: 0.60.1
Source dir: /builddir/libsixel-1.10.3
Build dir: /builddir/libsixel-1.10.3/build
Build type: native build
Project name: libsixel
Project version: 1.10.3
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64
Checking for function "unreachable" : YES 
Compiler for C supports arguments -Wformat=2: YES 
Compiler for C supports arguments -Wsign-conversion: YES 
Compiler for C supports arguments -Wuninitialized: YES 
Compiler for C supports arguments -Wstrict-overflow: YES 
Compiler for C supports arguments -Wshadow: YES 
Compiler for C supports arguments -Wdouble-promotion: YES 
Compiler for C supports arguments -Wswitch-default: YES 
Compiler for C supports arguments -Wunused-function: YES 
Compiler for C supports arguments -Wunused-but-set-variable: YES 
Compiler for C supports arguments -Bsymbolic: YES 
Library m found: YES
Checking for function "malloc" : YES 
Checking for function "realloc" : YES 
Checking for function "memset" : YES 
Checking for function "getopt_long" : YES 
Has header "assert.h" : YES 
Has header "math.h" : YES 
Has header "ctype.h" : YES 
Has header "memory.h" : YES 
Has header "string.h" : YES 
Has header "unistd.h" : YES 
Has header "stdint.h" : YES 
Has header "getopt.h" : YES 
Has header "sys/types.h" : YES 
Has header "sys/stat.h" : YES 
Has header "fcntl.h" : YES 
Has header "errno.h" : YES 
Has header "limits.h" : YES 
Has header "sys/time.h" : YES 
Has header "time.h" : YES 
Has header "signal.h" : YES 
Has header "sys/select.h" : YES 
Has header "sys/signal.h" : YES 
Has header "termios.h" : YES 
Has header "sys/ioctl.h" : YES 
Has header "inttypes.h" : YES 
Dependency gdk-pixbuf-2.0 skipped: feature gdk-pixbuf2 disabled
Library gd found: NO
Dependency libcurl skipped: feature libcurl disabled
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency libjpeg found: YES 2.1.1
Run-time dependency libpng found: YES 1.6.37
Program python2 found: NO (disabled by: python2 )
Configuring config.h using configuration
Configuring sixel.h using configuration
Program bash found: YES (/usr/bin/bash)
Configuring libsixel-config using configuration
meson.build:161: WARNING: Perl, PHP and Ruby modules are available but not installed by Meson. If you want them, please refer to their individual installation directories for instructions after building libsixel.

meson.build:163:0: ERROR: Format placeholder @9@ out of range.
```

- [ ] libwacom
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/libwacom-1.12
Build dir: /builddir/libwacom-1.12/build
Build type: native build

meson.build:1:0: ERROR: Unknown options: "exe_wrapper"
```

- [ ] vala-panel{,-appmenu}
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/vala-panel-0.5.0
Build dir: /builddir/vala-panel-0.5.0/build
Build type: native build
Project name: vala-panel
Project version: 0.5.0
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Vala compiler for the host machine: valac (valac 0.52.4)
Host machine cpu family: x86_64
Host machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.70.0
Run-time dependency gio-2.0 found: YES 2.70.0
Run-time dependency gio-unix-2.0 found: YES 2.70.0
Run-time dependency gmodule-2.0 found: YES 2.70.0
Run-time dependency gtk+-3.0 found: YES 3.24.30
Run-time dependency gdk-x11-3.0 found: YES 3.24.30
Run-time dependency gdk-wayland-3.0 found: YES 3.24.30
Run-time dependency gtk-layer-shell-0 found: YES 0.6.0
Library m found: YES
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

po/meson.build:1:5: ERROR: Tried to create target "vala-panel-nb.mo", but a target of that name already exists.
```

- [ ] wlclock
```
=> ERROR: SHA256 mismatch for 'v1.0.0.tar.gz:'
e2f218e70378342c344e7afa43c4361e3308936a7afaf54a0cad9970267a4ff4
```
- [ ] wtype
```
=> wtype-0.3_1: patching: fix_reallocarray.patch.
1 out of 2 hunks FAILED -- saving rejects to file main.c.rej
=> ERROR: wtype-0.3_1: do-patch_00-patches: 'patch -s ${_args} -i ${_patch} 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```

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

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

From 2f30a6e6436414c1c6c8f7aeb0e26d03ca61109a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Nov 2021 22:52:09 +0100
Subject: [PATCH 01/35] meson: update to 0.60.1.

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 6cbcd3c9e966..0a7a60ea5a6d 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.59.4
+version=0.60.1
 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://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
+checksum=5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 7c8104b15409c308deb3c5db5b86c1bc472969f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:24:04 +0100
Subject: [PATCH 02/35] PackageKit: update to 1.2.4.

---
 srcpkgs/PackageKit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 155dd156a06a..062dba3d3b00 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
-version=1.2.2
-revision=2
+version=1.2.4
+revision=1
 wrksrc="PackageKit-PACKAGEKIT_${version//./_}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
-checksum=e87e95ce7423f49eff6dad054c86ba6f922e52d0a757f822e0343da0f44d3dbb
+checksum=4a7b0a41ffa56ad8af67156c46ecb9d4eb439b31a4cb581d959bd5480444954b
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 
 build_options="gir vala"

From f1b2eeba7feb07a52bc91f12b5439dd4e42b66b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:27:14 +0100
Subject: [PATCH 03/35] bijiben: remove obsolete zeitgeist support

bijiben 40.0 dropped zeitgeist support
---
 srcpkgs/bijiben/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8c3e51c3fc37..604076fdb93c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+ libhandy1-devel"
+depends="desktop-file-utils tracker3"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 6a05b4985c13a5ac7730d518c61dd788345ff99d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:41:10 +0100
Subject: [PATCH 04/35] colord-gtk: fix building vala bindings

---
 srcpkgs/colord-gtk/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 65463f110590..634a9322dae3 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,10 +1,10 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvala=$(vopt_if vala true false)
+configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
  -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
@@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.freedesktop.org/software/colord"
+homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
 checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
 
@@ -30,5 +30,8 @@ colord-gtk-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }

From 9f5a031755ceea44368cd2ac816d09458c0db181 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:52:14 +0100
Subject: [PATCH 05/35] efl: drop removed configure args

---
 srcpkgs/efl/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 8786d5d94edf..c116523094ea 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -10,8 +10,6 @@ configure_args="
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
  -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
- -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
- -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
  $(vopt_bool elogind systemd)
  $(vopt_bool x11 x11)

From c702b59d36426b228c34e9e09d0d32ba590e339d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:59:16 +0100
Subject: [PATCH 06/35] enlightenment: drop a removed configure argument

---
 srcpkgs/enlightenment/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index db9c886dc920..360a0f5368e6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -3,7 +3,7 @@ pkgname=enlightenment
 version=0.24.2
 revision=1
 build_style=meson
-configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
+configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
  $(vopt_bool wayland wl)"
 hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)"
 makedepends="gettext-devel efl-devel pam-devel xkeyboard-config

From 1a94af005dbd9da51b25801e4a5cfc31f5189365 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 16:03:04 +0100
Subject: [PATCH 07/35] epiphany: drop a removed configure option

---
 srcpkgs/epiphany/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c58e2fa54ef6..0ffa06f547fe 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,7 +4,7 @@ version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
+configure_args="-Dunit_tests=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel

From b4213f3df7a8b173bfd41fa7a1afd1e5829fd172 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:01:58 +0100
Subject: [PATCH 08/35] gnome-bluetooth: remove obsolete configure options

---
 srcpkgs/gnome-bluetooth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 83d89c0a8acb..e6861631b08d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -4,8 +4,7 @@ version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dicon-update=false -Dgtk_doc=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"

From a7ec4912b523397833fb169f3798bbad945442e3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:06 +0100
Subject: [PATCH 09/35] gnome-initial-setup: remove obsolete configure options

---
 srcpkgs/gnome-initial-setup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 30a4a6ed4762..075e4b86324f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -3,8 +3,7 @@ pkgname=gnome-initial-setup
 version=40.4
 revision=1
 build_style=meson
-configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
- -Dsystemd=false"
+configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel

From 4ccbb02d99c4e8aa7e4c2211d9a40b47455c6dc9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:13 +0100
Subject: [PATCH 10/35] gedit: remove obsolete configure options

* gir is not optional anymore, so also removing the build option
---
 srcpkgs/gedit/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index b4e862c26ad0..e93ff8905272 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,12 +5,10 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true
- $(vopt_bool gir vapi) $(vopt_bool gir introspection)"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
- $(vopt_if gir vala)"
+configure_args="-Dplugins=true"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel python3-gobject-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 
-build_options="gir"
-build_options_default="gir"
-
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel
 	 libpeas-devel tepl-devel"
@@ -31,9 +26,7 @@ gedit-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gedit/gir-1.0
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gedit/gir-1.0
+		vmove usr/share/vala
 	}
 }

From e502c83f9b42e1483073250b41fdcc75ec3aacb1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:17 +0100
Subject: [PATCH 11/35] gnome-builder: remove obsolete configure options

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a3ce20126d78..26cf768c391a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
 revision=3
 build_style=meson
 build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
+configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel

From fae89bd87c44be38e115bcaa82d8cd9a6d29e158 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:26 +0100
Subject: [PATCH 12/35] gamehub: update to 0.16.1-2.

---
 srcpkgs/gamehub/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index ccbf98b53483..e8f110b3eb8d 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -1,8 +1,8 @@
 # Template file for 'gamehub'
 pkgname=gamehub
-version=0.16.0
+version=0.16.1
 revision=1
-wrksrc="GameHub-${version}-1-master"
+wrksrc="GameHub-${version}-2-master"
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
@@ -12,8 +12,8 @@ short_desc="All your games in one place"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tkashkin.tk/projects/gamehub/"
-distfiles="https://github.com/tkashkin/GameHub/archive/${version}-1-master.tar.gz"
-checksum=4244c914d7427933727ec0611886720b9325c4d4a852e0e8c283f6331ebd30e2
+distfiles="https://github.com/tkashkin/GameHub/archive/refs/tags/${version}-2-master.tar.gz"
+checksum=bbbf2f5216ce6f0d6a57179f388a714aec52188f4e67a9deb6478061441a30b5
 
 post_install() {
 	vinstall data/com.github.tkashkin.gamehub.desktop.in 644 usr/share/applications com.github.tkashkin.gamehub.desktop

From 8b113b67f4408f01eaa8c9af3a52653c463b827d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:34 +0100
Subject: [PATCH 13/35] NetworkManager: remove obsolete configure options

---
 srcpkgs/NetworkManager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e99d04798939..7001b27dc0e3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -4,7 +4,7 @@ version=1.32.12
 revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
+configure_args="-Dsystemd_journal=false
  -Dlibaudit=no -Dovs=false -Dselinux=false
  -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false

From c21e65edf61583b4c773a963bf264412820a51aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:21:42 +0100
Subject: [PATCH 14/35] graphene: remove obsolete configure options

---
 srcpkgs/graphene/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 79b2ac2e945e..6be39623eeae 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -4,7 +4,7 @@ version=1.10.6
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+configure_args="-Dinstalled_tests=false
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"

From 11ef333444fc1cb72c3da982d65995f0a8fd62f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:39 +0100
Subject: [PATCH 15/35] grilo: remove obsolete configure options

---
 srcpkgs/grilo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 64bae9bd4e2f..e47ec38542a5 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,7 +4,7 @@ version=0.3.13
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala)
+configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
  -Denable-gtk-doc=false"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
 makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel

From ada6a96df82eadb213841a5f90abdd38ed6d094b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:43 +0100
Subject: [PATCH 16/35] gnome-passwordsafe: fix build

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

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index fe91bcd9ed23..8f68cbf329f1 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -2,7 +2,7 @@
 pkgname=gnome-passwordsafe
 version=5.0
 revision=2
-wrksrc="PasswordSafe-${version}"
+wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection
  python3-pykeepass"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983
+checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449

From 55a3218a4fe48daae452016acf9e0b980a5b393f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:22 +0100
Subject: [PATCH 17/35] libgudev: remove obsolete configure options

---
 srcpkgs/libgudev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 47d1b8fc365d..e7603d00ce2f 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvala=$(vopt_if vala enabled disabled)"
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"

From 9a8f044bc263dc544a7ebec0015c31dce98212f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:34 +0100
Subject: [PATCH 18/35] libfprint: remove obsolete configure options

---
 srcpkgs/libfprint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index 33ac4c2a0571..16e6b2ffa1e0 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=libfprint-v$version
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
  libgusb-devel libglib-devel"

From 4305d77ed7f9b873eedf9ca37c67e60cba6da40d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:48 +0100
Subject: [PATCH 19/35] gst1-editing-services: remove obsolete configure
 options

---
 srcpkgs/gst1-editing-services/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 457dec0424cf..fde8efae9569 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled"
 hostmakedepends="flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
 short_desc="GStreamer 1.x Editing Services"

From 74cdb01409838b92f674c445762c625d1b967bb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:01:59 +0100
Subject: [PATCH 20/35] gst-plugins-base1: remove obsolete configure options

---
 srcpkgs/gst-plugins-base1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 050521f071c3..c0dce5856f8d 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"

From a8cbc10c96d29b0e1b9a93cfedd2a787d86517e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:01 +0100
Subject: [PATCH 21/35] gst-plugins-bad1: remove obsolete configure options

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

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..77a88a91fba1 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -5,9 +5,9 @@ revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
- -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
+ -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
  -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled

From b8500e0be3c3bb4460d762a76955658c2ab357a6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:12 +0100
Subject: [PATCH 22/35] hexchat: remove obsolete configure options

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 97937999bb0d..7b3bc658d5aa 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -3,7 +3,7 @@ pkgname=hexchat
 version=2.16.0
 revision=3
 build_style=meson
-configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"

From fb00d0a1e9928fb796f288883eea7ce6616e60b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:20 +0100
Subject: [PATCH 23/35] igt-gpu-tools: remove obsolete configure options

---
 srcpkgs/igt-gpu-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3b222ecd18d8..3f8b4e2b6166 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -22,7 +22,7 @@ lib32disabled=yes
 archs="i686* x86_64*"
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled"
+	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
 fi
 
 post_install() {

From 944df36c63818455003f44855ff2de6ba16631a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:54:21 +0100
Subject: [PATCH 24/35] libgweather: remove obsolete configure options

---
 srcpkgs/libgweather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 6d9b85a07d04..857006ea8786 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -4,8 +4,7 @@ version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
- -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"

From ff2dd864b3437d6a850dd2ec41519bee81f991d7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:04:25 +0100
Subject: [PATCH 25/35] light-locker: fix build and license

---
 srcpkgs/light-locker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index e3bb799ba171..d50c71480a33 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,15 +1,15 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel elogind-devel"
+ libXxf86misc-devel libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/the-cavalry/light-locker"
 distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz"
 checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c

From c045089374de46c643840100b31dda48c3e8988c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:19:07 +0100
Subject: [PATCH 26/35] ncmpc: disable html manual

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

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 683ec13e85a3..a7d76aa3ce9e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,9 +1,9 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
 version=0.45
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlirc=disabled"
+configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
 short_desc="Ncurses-based mpd client"

From 62ea2f038bebb15044e9232b3fae9981fc382993 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:22:30 +0100
Subject: [PATCH 27/35] pixman: remove obsolete configure options

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

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 456e9d1628e8..eba3b82c9fa7 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -5,8 +5,8 @@ revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
-configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
- -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
+configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled
+ -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
 makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"

From 348d834097ef5814854c90d5432f8ce217ec4017 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:33:52 +0100
Subject: [PATCH 28/35] seatd: fix configure arguments

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

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index c619787ae3eb..178f1b3d8aa9 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,8 @@ pkgname=seatd
 version=0.6.3
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind)
+ -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From f792dd8accf426a66087ac1cc4cedb2481ec19e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:34:04 +0100
Subject: [PATCH 29/35] spice-gtk: remove obsolete configure options

---
 srcpkgs/spice-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 7218e837891f..351923f41e7f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -7,8 +7,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
- -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
- -Dpulse=disabled -Dgtk_doc=disabled"
+ -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel

From 16d910441d47608010223bdcdff7eef569055baa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:37:05 +0100
Subject: [PATCH 30/35] switchboard: remove obsolete configure options

---
 srcpkgs/switchboard/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 45031a8d8b76..ebb706e5d9e5 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -3,7 +3,6 @@ pkgname=switchboard
 version=2.3.7
 revision=2
 build_style=meson
-configure_args="-Dlibunity=false"
 hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"

From 056ca58fefc31af271419ea594a66637680ef59e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:41:37 +0100
Subject: [PATCH 31/35] cglm: update to 0.8.4, switch to meson

---
 srcpkgs/cglm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index c7dfee606c45..05885c452520 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
 # Template file for 'cglm'
 pkgname=cglm
-version=0.8.3
+version=0.8.4
 revision=1
-build_style=cmake
+build_style=meson
 short_desc="Highly Optimized Graphics Math (glm) for C"
 maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=3a3f935f9f2ed5a8cb6337e421bf6f3a699a72d8cfe26fde1bbb8fde5c1c8aaf
+checksum=42f84c42c8a3e62954da77ab5c5d3264033d5802009e175db7921332a476126e
 
 post_install() {
 	vlicense LICENSE

From 81efb4a98b28432210c8df9680a0c443ddcce06a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:56:50 +0100
Subject: [PATCH 32/35] totem: remove gir build option

---
 srcpkgs/totem/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8871c546b50a..4fba4f04ca8a 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -4,12 +4,9 @@ version=3.38.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-python=no -Denable-nautilus=yes
- -Denable-introspection=$(vopt_if gir yes no)
- -Denable-vala=$(vopt_if gir yes no)"
-hostmakedepends="intltool itstool pkg-config
- $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1
- glib-devel"
+configure_args="-Denable-python=no"
+hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1 
+ gst-plugins-good1 glib-devel"
 # XXX missing lirc plugin.
 makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
@@ -31,16 +28,11 @@ do_check() {
 	:
 }
 
-build_options="gir"
-build_options_default="gir"
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -51,8 +43,6 @@ totem-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 	}
 }

From 58efc1d6e35eac62ebe0d5b94262aa30c5596974 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:57:22 +0100
Subject: [PATCH 33/35] tracker3: remove deprecated networkmanager option

---
 srcpkgs/tracker3/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..a6f8135b77d6 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,16 +1,15 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=3
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled
- -Dstemmer=disabled -Dsystemd_user_services=false"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="tar python3-gobject"
 short_desc="Personal search tool and storage system"
 maintainer="q66 <daniel@octaforge.org>"

From d2ead99df1901a397120884597bbbdcb2b2dcff5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:00:29 +0100
Subject: [PATCH 34/35] tracker-miners: remove taglib configure option

---
 srcpkgs/tracker-miners/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..9c4762cf56ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
  -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
@@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ libvorbis-devel poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
 short_desc="Data miners for tracker"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -24,8 +24,4 @@ license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
 checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
+make_check=no # relies on unsupported ops in chroot

From c6ebcec3696d4d6985fe131a44dafc5dc8ca2108 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:18:35 +0100
Subject: [PATCH 35/35] tracker3-miners: remove obsolete configure options

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..4c752fe55add 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -5,20 +5,20 @@ revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
  -Dsystemd_user_services=false -Dnetwork_manager=enabled"
 hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
  NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker3"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
  2021-11-13 21:57 ` [PR PATCH] [Updated] " paper42
@ 2021-11-14 13:06 ` paper42
  2021-11-14 14:07 ` paper42
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2021-11-14 13:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages meson-0.60
https://github.com/void-linux/void-packages/pull/34059

meson 0.60
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I ran the configure phase on all packages with meson build_style, currently broken builds (some are not caused by this update):

- [ ] igt-gpu-tools

```Checking whether type "struct sysinfo" has member "totalram" : YES 
Running compile:
Working directory:  /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n
Command line:  cc /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c -o /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/output.exe -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_FILE_OFFSET_BITS=64 -O0 -std=gnu11 -D_GNU_SOURCE -Wl,-z,relro -Wl,-z,now -Wl,--as-needed 

Code:
 #include <sys/mman.h>
#include <limits.h>

        #if defined __stub_memfd_create || defined __stub___memfd_create
        fail fail fail this function is not going to work
        #endif
        
int main(void) {
            void *a = (void*) &memfd_create;
            long long b = (long long) a;
            return (int) b;
        }
Compiler stdout:
 
Compiler stderr:
 In file included from /usr/include/sys/mman.h:22,
                 from /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c:1:
/usr/include/features.h:397:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
      |    ^~~~~~~

Checking for function "memfd_create" : YES 
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

lib/meson.build:131:4: ERROR: Function does not take positional arguments.
```

- [ ] NetworkManager
```
=> NetworkManager-1.32.12_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libgio-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgobject-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libglib-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgmodule-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libdl.so.2 <-> glibc>=2.32_1
   SONAME: libndp.so.0 <-> libndp>=1.3_1
   SONAME: libudev.so.1 <-> eudev-libudev>=1.6_1
   SONAME: libelogind.so.0 <-> libelogind>=238.1_2
   SONAME: libcurl.so.4 <-> libcurl>=7.75.0_2
   SONAME: libpsl.so.5 <-> libpsl>=0.20.2_1
   SONAME: libsmime3.so <-> nss>=3.12.4_1
   SONAME: libnss3.so <-> nss>=3.12.4_1
   SONAME: libnspr4.so <-> nspr>=4.8_1
   SONAME: libpthread.so.0 <-> glibc>=2.32_1
   SONAME: libc.so.6 <-> glibc>=2.32_1
   SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
   SONAME: libnm.so.0 <-> libnm-1.32.12_1
   SONAME: libnewt.so.0.52 <-> newt>=0.52.18_1
   SONAME: libreadline.so.8 <-> libreadline8>=8.0_1
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
   SONAME: src/core/devices/wwan/libnm-wwan.so <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libmm-glib.so.0 <-> libmm-glib>=1.0.0_1
=> ERROR: NetworkManager-1.32.12_1: cannot guess required shlibs, aborting!
```

- [ ] gnome-settings-daemon
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/gnome-settings-daemon-40.0.1
Build dir: /builddir/gnome-settings-daemon-40.0.1/build
Build type: native build
Project name: gnome-settings-daemon
Project version: 40.0.1
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64

meson.build:87:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
```



- [ ] libsixel
```
=> xbps-src: updating repositories for host (x86_64)...
The Meson build system
Version: 0.60.1
Source dir: /builddir/libsixel-1.10.3
Build dir: /builddir/libsixel-1.10.3/build
Build type: native build
Project name: libsixel
Project version: 1.10.3
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64
Checking for function "unreachable" : YES 
Compiler for C supports arguments -Wformat=2: YES 
Compiler for C supports arguments -Wsign-conversion: YES 
Compiler for C supports arguments -Wuninitialized: YES 
Compiler for C supports arguments -Wstrict-overflow: YES 
Compiler for C supports arguments -Wshadow: YES 
Compiler for C supports arguments -Wdouble-promotion: YES 
Compiler for C supports arguments -Wswitch-default: YES 
Compiler for C supports arguments -Wunused-function: YES 
Compiler for C supports arguments -Wunused-but-set-variable: YES 
Compiler for C supports arguments -Bsymbolic: YES 
Library m found: YES
Checking for function "malloc" : YES 
Checking for function "realloc" : YES 
Checking for function "memset" : YES 
Checking for function "getopt_long" : YES 
Has header "assert.h" : YES 
Has header "math.h" : YES 
Has header "ctype.h" : YES 
Has header "memory.h" : YES 
Has header "string.h" : YES 
Has header "unistd.h" : YES 
Has header "stdint.h" : YES 
Has header "getopt.h" : YES 
Has header "sys/types.h" : YES 
Has header "sys/stat.h" : YES 
Has header "fcntl.h" : YES 
Has header "errno.h" : YES 
Has header "limits.h" : YES 
Has header "sys/time.h" : YES 
Has header "time.h" : YES 
Has header "signal.h" : YES 
Has header "sys/select.h" : YES 
Has header "sys/signal.h" : YES 
Has header "termios.h" : YES 
Has header "sys/ioctl.h" : YES 
Has header "inttypes.h" : YES 
Dependency gdk-pixbuf-2.0 skipped: feature gdk-pixbuf2 disabled
Library gd found: NO
Dependency libcurl skipped: feature libcurl disabled
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency libjpeg found: YES 2.1.1
Run-time dependency libpng found: YES 1.6.37
Program python2 found: NO (disabled by: python2 )
Configuring config.h using configuration
Configuring sixel.h using configuration
Program bash found: YES (/usr/bin/bash)
Configuring libsixel-config using configuration
meson.build:161: WARNING: Perl, PHP and Ruby modules are available but not installed by Meson. If you want them, please refer to their individual installation directories for instructions after building libsixel.

meson.build:163:0: ERROR: Format placeholder @9@ out of range.
```

- [ ] libwacom
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/libwacom-1.12
Build dir: /builddir/libwacom-1.12/build
Build type: native build

meson.build:1:0: ERROR: Unknown options: "exe_wrapper"
```

- [ ] vala-panel{,-appmenu}
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/vala-panel-0.5.0
Build dir: /builddir/vala-panel-0.5.0/build
Build type: native build
Project name: vala-panel
Project version: 0.5.0
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Vala compiler for the host machine: valac (valac 0.52.4)
Host machine cpu family: x86_64
Host machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.70.0
Run-time dependency gio-2.0 found: YES 2.70.0
Run-time dependency gio-unix-2.0 found: YES 2.70.0
Run-time dependency gmodule-2.0 found: YES 2.70.0
Run-time dependency gtk+-3.0 found: YES 3.24.30
Run-time dependency gdk-x11-3.0 found: YES 3.24.30
Run-time dependency gdk-wayland-3.0 found: YES 3.24.30
Run-time dependency gtk-layer-shell-0 found: YES 0.6.0
Library m found: YES
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

po/meson.build:1:5: ERROR: Tried to create target "vala-panel-nb.mo", but a target of that name already exists.
```

- [ ] wlclock
```
=> ERROR: SHA256 mismatch for 'v1.0.0.tar.gz:'
e2f218e70378342c344e7afa43c4361e3308936a7afaf54a0cad9970267a4ff4
```
- [ ] wtype
```
=> wtype-0.3_1: patching: fix_reallocarray.patch.
1 out of 2 hunks FAILED -- saving rejects to file main.c.rej
=> ERROR: wtype-0.3_1: do-patch_00-patches: 'patch -s ${_args} -i ${_patch} 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```

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

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

From 3ccf4ae272b027662891adf70e1c85d065a32259 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Nov 2021 22:52:09 +0100
Subject: [PATCH 01/36] meson: update to 0.60.1.

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 6cbcd3c9e966..0a7a60ea5a6d 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.59.4
+version=0.60.1
 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://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
+checksum=5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From fef4a2339413f66dd27cb1d734481ab2d0b60e45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:24:04 +0100
Subject: [PATCH 02/36] PackageKit: update to 1.2.4.

---
 srcpkgs/PackageKit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 155dd156a06a..062dba3d3b00 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
-version=1.2.2
-revision=2
+version=1.2.4
+revision=1
 wrksrc="PackageKit-PACKAGEKIT_${version//./_}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
-checksum=e87e95ce7423f49eff6dad054c86ba6f922e52d0a757f822e0343da0f44d3dbb
+checksum=4a7b0a41ffa56ad8af67156c46ecb9d4eb439b31a4cb581d959bd5480444954b
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 
 build_options="gir vala"

From 2ebb836feb5e93504ab873bae5cbcb1d13dbd551 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:27:14 +0100
Subject: [PATCH 03/36] bijiben: remove obsolete zeitgeist support

bijiben 40.0 dropped zeitgeist support
---
 srcpkgs/bijiben/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8c3e51c3fc37..604076fdb93c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+ libhandy1-devel"
+depends="desktop-file-utils tracker3"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 2cff0dc17ddd92fe1b26b8798555c22a541307f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:41:10 +0100
Subject: [PATCH 04/36] colord-gtk: fix building vala bindings

---
 srcpkgs/colord-gtk/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 65463f110590..634a9322dae3 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,10 +1,10 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvala=$(vopt_if vala true false)
+configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
  -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
@@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.freedesktop.org/software/colord"
+homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
 checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
 
@@ -30,5 +30,8 @@ colord-gtk-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }

From 50313db9b09c1786795cac3d41cce29ec05cba32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:52:14 +0100
Subject: [PATCH 05/36] efl: drop removed configure args

---
 srcpkgs/efl/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 8786d5d94edf..c116523094ea 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -10,8 +10,6 @@ configure_args="
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
  -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
- -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
- -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
  $(vopt_bool elogind systemd)
  $(vopt_bool x11 x11)

From 3da846926892672cf0d53eca4bd8fbab7755e2a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:59:16 +0100
Subject: [PATCH 06/36] enlightenment: drop a removed configure argument

---
 srcpkgs/enlightenment/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index db9c886dc920..360a0f5368e6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -3,7 +3,7 @@ pkgname=enlightenment
 version=0.24.2
 revision=1
 build_style=meson
-configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
+configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
  $(vopt_bool wayland wl)"
 hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)"
 makedepends="gettext-devel efl-devel pam-devel xkeyboard-config

From 3350fdcb0bb2efcdaf20da33fca21a2fadfef924 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 16:03:04 +0100
Subject: [PATCH 07/36] epiphany: drop a removed configure option

---
 srcpkgs/epiphany/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c58e2fa54ef6..0ffa06f547fe 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,7 +4,7 @@ version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
+configure_args="-Dunit_tests=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel

From 597cd8d55c402eaf4ebec70f72a99ee500560d24 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:01:58 +0100
Subject: [PATCH 08/36] gnome-bluetooth: remove obsolete configure options

---
 srcpkgs/gnome-bluetooth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 83d89c0a8acb..e6861631b08d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -4,8 +4,7 @@ version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dicon-update=false -Dgtk_doc=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"

From 800c55d628f4487216f0c79ad3592dd6e1fd4c3f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:06 +0100
Subject: [PATCH 09/36] gnome-initial-setup: remove obsolete configure options

---
 srcpkgs/gnome-initial-setup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 30a4a6ed4762..075e4b86324f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -3,8 +3,7 @@ pkgname=gnome-initial-setup
 version=40.4
 revision=1
 build_style=meson
-configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
- -Dsystemd=false"
+configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel

From 61c7a408cb8bfee9cf37d5d1ab3bbf40218ff0ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:13 +0100
Subject: [PATCH 10/36] gedit: remove obsolete configure options

* gir is not optional anymore, so also removing the build option
---
 srcpkgs/gedit/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index b4e862c26ad0..e93ff8905272 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,12 +5,10 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true
- $(vopt_bool gir vapi) $(vopt_bool gir introspection)"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
- $(vopt_if gir vala)"
+configure_args="-Dplugins=true"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel python3-gobject-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 
-build_options="gir"
-build_options_default="gir"
-
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel
 	 libpeas-devel tepl-devel"
@@ -31,9 +26,7 @@ gedit-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gedit/gir-1.0
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gedit/gir-1.0
+		vmove usr/share/vala
 	}
 }

From 75b3627b63e7a562d780ce65dd626de525572bc7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:17 +0100
Subject: [PATCH 11/36] gnome-builder: remove obsolete configure options

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a3ce20126d78..26cf768c391a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
 revision=3
 build_style=meson
 build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
+configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel

From 3ab109264587bc4f659133b81925fd110859e591 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:26 +0100
Subject: [PATCH 12/36] gamehub: update to 0.16.1-2.

---
 srcpkgs/gamehub/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index ccbf98b53483..e8f110b3eb8d 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -1,8 +1,8 @@
 # Template file for 'gamehub'
 pkgname=gamehub
-version=0.16.0
+version=0.16.1
 revision=1
-wrksrc="GameHub-${version}-1-master"
+wrksrc="GameHub-${version}-2-master"
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
@@ -12,8 +12,8 @@ short_desc="All your games in one place"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tkashkin.tk/projects/gamehub/"
-distfiles="https://github.com/tkashkin/GameHub/archive/${version}-1-master.tar.gz"
-checksum=4244c914d7427933727ec0611886720b9325c4d4a852e0e8c283f6331ebd30e2
+distfiles="https://github.com/tkashkin/GameHub/archive/refs/tags/${version}-2-master.tar.gz"
+checksum=bbbf2f5216ce6f0d6a57179f388a714aec52188f4e67a9deb6478061441a30b5
 
 post_install() {
 	vinstall data/com.github.tkashkin.gamehub.desktop.in 644 usr/share/applications com.github.tkashkin.gamehub.desktop

From 9b82e8ff176962902f90d036f8cea52f7572ca2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:34 +0100
Subject: [PATCH 13/36] NetworkManager: remove obsolete configure options

---
 srcpkgs/NetworkManager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e99d04798939..7001b27dc0e3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -4,7 +4,7 @@ version=1.32.12
 revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
+configure_args="-Dsystemd_journal=false
  -Dlibaudit=no -Dovs=false -Dselinux=false
  -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false

From 0b8d6131fcad9b505401bbf017a5d09513587740 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:21:42 +0100
Subject: [PATCH 14/36] graphene: remove obsolete configure options

---
 srcpkgs/graphene/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 79b2ac2e945e..6be39623eeae 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -4,7 +4,7 @@ version=1.10.6
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+configure_args="-Dinstalled_tests=false
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"

From 4c7fe11c6f917d02134d8f56ccfef89df6b2b098 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:39 +0100
Subject: [PATCH 15/36] grilo: remove obsolete configure options

---
 srcpkgs/grilo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 64bae9bd4e2f..e47ec38542a5 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,7 +4,7 @@ version=0.3.13
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala)
+configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
  -Denable-gtk-doc=false"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
 makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel

From c8363c99f12f768c1c7acd495a9fd9f1a3e28ee8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:43 +0100
Subject: [PATCH 16/36] gnome-passwordsafe: fix build

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

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index fe91bcd9ed23..8f68cbf329f1 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -2,7 +2,7 @@
 pkgname=gnome-passwordsafe
 version=5.0
 revision=2
-wrksrc="PasswordSafe-${version}"
+wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection
  python3-pykeepass"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983
+checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449

From 146e84dfc0e546eda15c34d36bb7aa0b92ece5c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:22 +0100
Subject: [PATCH 17/36] libgudev: remove obsolete configure options

---
 srcpkgs/libgudev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 47d1b8fc365d..e7603d00ce2f 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvala=$(vopt_if vala enabled disabled)"
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"

From dfa6a2f239330c11a8ff0261d36547dabe2478aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:34 +0100
Subject: [PATCH 18/36] libfprint: remove obsolete configure options

---
 srcpkgs/libfprint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index 33ac4c2a0571..16e6b2ffa1e0 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=libfprint-v$version
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
  libgusb-devel libglib-devel"

From 87574c2d8f416423b474bb14ab0005aa71f0b8a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:48 +0100
Subject: [PATCH 19/36] gst1-editing-services: remove obsolete configure
 options

---
 srcpkgs/gst1-editing-services/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 457dec0424cf..fde8efae9569 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled"
 hostmakedepends="flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
 short_desc="GStreamer 1.x Editing Services"

From f6cd313990e6639efbc2acd40b388c4bdbf4ab12 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:01:59 +0100
Subject: [PATCH 20/36] gst-plugins-base1: remove obsolete configure options

---
 srcpkgs/gst-plugins-base1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 050521f071c3..c0dce5856f8d 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"

From 6d71cb639ab5050a15c42ac6d641d922d395772e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:01 +0100
Subject: [PATCH 21/36] gst-plugins-bad1: remove obsolete configure options

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

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..77a88a91fba1 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -5,9 +5,9 @@ revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
- -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
+ -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
  -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled

From 3ed1914f6a6f862aacd031550ac9f17b65bd0d2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:12 +0100
Subject: [PATCH 22/36] hexchat: remove obsolete configure options

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 97937999bb0d..7b3bc658d5aa 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -3,7 +3,7 @@ pkgname=hexchat
 version=2.16.0
 revision=3
 build_style=meson
-configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"

From 8d4bde9817e79bf00dc275fc026a94277f65f89f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:20 +0100
Subject: [PATCH 23/36] igt-gpu-tools: remove obsolete configure options

---
 srcpkgs/igt-gpu-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3b222ecd18d8..3f8b4e2b6166 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -22,7 +22,7 @@ lib32disabled=yes
 archs="i686* x86_64*"
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled"
+	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
 fi
 
 post_install() {

From b500f09a489aa35d2adca5dc77c80095f72df857 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:54:21 +0100
Subject: [PATCH 24/36] libgweather: remove obsolete configure options

---
 srcpkgs/libgweather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 6d9b85a07d04..857006ea8786 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -4,8 +4,7 @@ version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
- -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"

From 5bdfb7a95da4ea0ae36ece4883315abbd5f1e682 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:04:25 +0100
Subject: [PATCH 25/36] light-locker: fix build and license

---
 srcpkgs/light-locker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index e3bb799ba171..d50c71480a33 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,15 +1,15 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel elogind-devel"
+ libXxf86misc-devel libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/the-cavalry/light-locker"
 distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz"
 checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c

From c48d534dc366daa7f2b51fb2a353067e455618df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:19:07 +0100
Subject: [PATCH 26/36] ncmpc: disable html manual

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

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 683ec13e85a3..a7d76aa3ce9e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,9 +1,9 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
 version=0.45
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlirc=disabled"
+configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
 short_desc="Ncurses-based mpd client"

From f3dfaa142c1811eb2e731325a27928abf4d7d85c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:22:30 +0100
Subject: [PATCH 27/36] pixman: remove obsolete configure options

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

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 456e9d1628e8..eba3b82c9fa7 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -5,8 +5,8 @@ revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
-configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
- -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
+configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled
+ -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
 makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"

From fad29c76b03d3f89a40de6a52a77ffd2347eac2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:33:52 +0100
Subject: [PATCH 28/36] seatd: fix configure arguments

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

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index c619787ae3eb..178f1b3d8aa9 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,8 @@ pkgname=seatd
 version=0.6.3
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind)
+ -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From a37d68ef5f8536449f7262087a6a5d69f8217a97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:34:04 +0100
Subject: [PATCH 29/36] spice-gtk: remove obsolete configure options

---
 srcpkgs/spice-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 7218e837891f..351923f41e7f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -7,8 +7,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
- -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
- -Dpulse=disabled -Dgtk_doc=disabled"
+ -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel

From 66c5686904247d2c1242b32adff59c05d913b376 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:37:05 +0100
Subject: [PATCH 30/36] switchboard: remove obsolete configure options

---
 srcpkgs/switchboard/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 45031a8d8b76..ebb706e5d9e5 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -3,7 +3,6 @@ pkgname=switchboard
 version=2.3.7
 revision=2
 build_style=meson
-configure_args="-Dlibunity=false"
 hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"

From 61c399db5c97646616440c0e71dba36fb3550b05 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:41:37 +0100
Subject: [PATCH 31/36] cglm: update to 0.8.4, switch to meson

---
 srcpkgs/cglm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index c7dfee606c45..05885c452520 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
 # Template file for 'cglm'
 pkgname=cglm
-version=0.8.3
+version=0.8.4
 revision=1
-build_style=cmake
+build_style=meson
 short_desc="Highly Optimized Graphics Math (glm) for C"
 maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=3a3f935f9f2ed5a8cb6337e421bf6f3a699a72d8cfe26fde1bbb8fde5c1c8aaf
+checksum=42f84c42c8a3e62954da77ab5c5d3264033d5802009e175db7921332a476126e
 
 post_install() {
 	vlicense LICENSE

From b22ef2d47494d7e69dbbd0ec19d0136d01945628 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:56:50 +0100
Subject: [PATCH 32/36] totem: remove gir build option

---
 srcpkgs/totem/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8871c546b50a..f80a2620b2f1 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -4,12 +4,9 @@ version=3.38.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-python=no -Denable-nautilus=yes
- -Denable-introspection=$(vopt_if gir yes no)
- -Denable-vala=$(vopt_if gir yes no)"
-hostmakedepends="intltool itstool pkg-config
- $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1
- glib-devel"
+configure_args="-Denable-python=no"
+hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1
+ gst-plugins-good1 glib-devel"
 # XXX missing lirc plugin.
 makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
@@ -31,16 +28,11 @@ do_check() {
 	:
 }
 
-build_options="gir"
-build_options_default="gir"
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -51,8 +43,6 @@ totem-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 	}
 }

From 69ff7c35c1ba0ecbfd16506a3560038444254c5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:57:22 +0100
Subject: [PATCH 33/36] tracker3: remove deprecated networkmanager option

---
 srcpkgs/tracker3/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..a6f8135b77d6 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,16 +1,15 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=3
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled
- -Dstemmer=disabled -Dsystemd_user_services=false"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="tar python3-gobject"
 short_desc="Personal search tool and storage system"
 maintainer="q66 <daniel@octaforge.org>"

From 5c69abe709c36f40e0486adba67ba51f487b16bb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:00:29 +0100
Subject: [PATCH 34/36] tracker-miners: remove taglib configure option

---
 srcpkgs/tracker-miners/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..9c4762cf56ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
  -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
@@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ libvorbis-devel poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
 short_desc="Data miners for tracker"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -24,8 +24,4 @@ license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
 checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
+make_check=no # relies on unsupported ops in chroot

From 935c8219c2ce350c7bb3a6ece8ca621703a54439 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:18:35 +0100
Subject: [PATCH 35/36] tracker3-miners: remove obsolete configure options

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..4c752fe55add 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -5,20 +5,20 @@ revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
  -Dsystemd_user_services=false -Dnetwork_manager=enabled"
 hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
  NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker3"

From 44bb4fa6fae8c715b13fa328fabdf581038ed0ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 13:48:40 +0100
Subject: [PATCH 36/36] libwacom: remove obsolete configure options

---
 srcpkgs/libwacom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index c4922df7a205..b6003b1c6d3e 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -4,7 +4,7 @@ version=1.12
 revision=1
 build_style=meson
 build_helper="qemu"
-configure_args="-Ddocumentation=disabled -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+configure_args="-Ddocumentation=disabled"
 hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
 checkdepends="python3-pytest python3-libevdev python3-pyudev"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
  2021-11-13 21:57 ` [PR PATCH] [Updated] " paper42
  2021-11-14 13:06 ` paper42
@ 2021-11-14 14:07 ` paper42
  2021-11-14 14:38 ` eli-schwartz
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2021-11-14 14:07 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages meson-0.60
https://github.com/void-linux/void-packages/pull/34059

meson 0.60
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I ran the configure phase on all packages with meson build_style, currently broken builds:

## regressions from 0.59.4

- [ ] igt-gpu-tools

```Checking whether type "struct sysinfo" has member "totalram" : YES 
Running compile:
Working directory:  /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n
Command line:  cc /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c -o /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/output.exe -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_FILE_OFFSET_BITS=64 -O0 -std=gnu11 -D_GNU_SOURCE -Wl,-z,relro -Wl,-z,now -Wl,--as-needed 

Code:
 #include <sys/mman.h>
#include <limits.h>

        #if defined __stub_memfd_create || defined __stub___memfd_create
        fail fail fail this function is not going to work
        #endif
        
int main(void) {
            void *a = (void*) &memfd_create;
            long long b = (long long) a;
            return (int) b;
        }
Compiler stdout:
 
Compiler stderr:
 In file included from /usr/include/sys/mman.h:22,
                 from /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c:1:
/usr/include/features.h:397:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
      |    ^~~~~~~

Checking for function "memfd_create" : YES 
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

lib/meson.build:131:4: ERROR: Function does not take positional arguments.
```

- [ ] NetworkManager
```
=> NetworkManager-1.32.12_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libgio-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgobject-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libglib-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgmodule-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libdl.so.2 <-> glibc>=2.32_1
   SONAME: libndp.so.0 <-> libndp>=1.3_1
   SONAME: libudev.so.1 <-> eudev-libudev>=1.6_1
   SONAME: libelogind.so.0 <-> libelogind>=238.1_2
   SONAME: libcurl.so.4 <-> libcurl>=7.75.0_2
   SONAME: libpsl.so.5 <-> libpsl>=0.20.2_1
   SONAME: libsmime3.so <-> nss>=3.12.4_1
   SONAME: libnss3.so <-> nss>=3.12.4_1
   SONAME: libnspr4.so <-> nspr>=4.8_1
   SONAME: libpthread.so.0 <-> glibc>=2.32_1
   SONAME: libc.so.6 <-> glibc>=2.32_1
   SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
   SONAME: libnm.so.0 <-> libnm-1.32.12_1
   SONAME: libnewt.so.0.52 <-> newt>=0.52.18_1
   SONAME: libreadline.so.8 <-> libreadline8>=8.0_1
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
   SONAME: src/core/devices/wwan/libnm-wwan.so <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libmm-glib.so.0 <-> libmm-glib>=1.0.0_1
=> ERROR: NetworkManager-1.32.12_1: cannot guess required shlibs, aborting!
```

- [ ] vala-panel{,-appmenu}
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/vala-panel-0.5.0
Build dir: /builddir/vala-panel-0.5.0/build
Build type: native build
Project name: vala-panel
Project version: 0.5.0
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Vala compiler for the host machine: valac (valac 0.52.4)
Host machine cpu family: x86_64
Host machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.70.0
Run-time dependency gio-2.0 found: YES 2.70.0
Run-time dependency gio-unix-2.0 found: YES 2.70.0
Run-time dependency gmodule-2.0 found: YES 2.70.0
Run-time dependency gtk+-3.0 found: YES 3.24.30
Run-time dependency gdk-x11-3.0 found: YES 3.24.30
Run-time dependency gdk-wayland-3.0 found: YES 3.24.30
Run-time dependency gtk-layer-shell-0 found: YES 0.6.0
Library m found: YES
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

po/meson.build:1:5: ERROR: Tried to create target "vala-panel-nb.mo", but a target of that name already exists.
```

- [x] gnome-settings-daemon

imported an upstream patch
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/gnome-settings-daemon-40.0.1
Build dir: /builddir/gnome-settings-daemon-40.0.1/build
Build type: native build
Project name: gnome-settings-daemon
Project version: 40.0.1
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64

meson.build:87:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
```

- [x] libsixel

This will be fixed in meson 0.60.2, I imported a patch for now - mesonbuild/meson#9530
```
=> xbps-src: updating repositories for host (x86_64)...
The Meson build system
Version: 0.60.1
Source dir: /builddir/libsixel-1.10.3
Build dir: /builddir/libsixel-1.10.3/build
Build type: native build
Project name: libsixel
Project version: 1.10.3
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64
Checking for function "unreachable" : YES 
Compiler for C supports arguments -Wformat=2: YES 
Compiler for C supports arguments -Wsign-conversion: YES 
Compiler for C supports arguments -Wuninitialized: YES 
Compiler for C supports arguments -Wstrict-overflow: YES 
Compiler for C supports arguments -Wshadow: YES 
Compiler for C supports arguments -Wdouble-promotion: YES 
Compiler for C supports arguments -Wswitch-default: YES 
Compiler for C supports arguments -Wunused-function: YES 
Compiler for C supports arguments -Wunused-but-set-variable: YES 
Compiler for C supports arguments -Bsymbolic: YES 
Library m found: YES
Checking for function "malloc" : YES 
Checking for function "realloc" : YES 
Checking for function "memset" : YES 
Checking for function "getopt_long" : YES 
Has header "assert.h" : YES 
Has header "math.h" : YES 
Has header "ctype.h" : YES 
Has header "memory.h" : YES 
Has header "string.h" : YES 
Has header "unistd.h" : YES 
Has header "stdint.h" : YES 
Has header "getopt.h" : YES 
Has header "sys/types.h" : YES 
Has header "sys/stat.h" : YES 
Has header "fcntl.h" : YES 
Has header "errno.h" : YES 
Has header "limits.h" : YES 
Has header "sys/time.h" : YES 
Has header "time.h" : YES 
Has header "signal.h" : YES 
Has header "sys/select.h" : YES 
Has header "sys/signal.h" : YES 
Has header "termios.h" : YES 
Has header "sys/ioctl.h" : YES 
Has header "inttypes.h" : YES 
Dependency gdk-pixbuf-2.0 skipped: feature gdk-pixbuf2 disabled
Library gd found: NO
Dependency libcurl skipped: feature libcurl disabled
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency libjpeg found: YES 2.1.1
Run-time dependency libpng found: YES 1.6.37
Program python2 found: NO (disabled by: python2 )
Configuring config.h using configuration
Configuring sixel.h using configuration
Program bash found: YES (/usr/bin/bash)
Configuring libsixel-config using configuration
meson.build:161: WARNING: Perl, PHP and Ruby modules are available but not installed by Meson. If you want them, please refer to their individual installation directories for instructions after building libsixel.

meson.build:163:0: ERROR: Format placeholder @9@ out of range.
```

## unrelated build failures

- [ ] gst-plugins-base1
```
FAILED: gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o 
cc -Igst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p -I. -I.. -Igst-libs -I../gst-libs -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/orc-0.4 -I/usr/include/gudev-1.0 -I/usr/include/libdrm -flto=auto -fdiagnostics-color=always -DNDEBUG -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -Wmissing-declarations -Wredundant-decls -Wundef -Wwrite-strings -Wformat -Wformat-nonliteral -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wvla -Wpointer-arith -Wmissing-prototypes -Wdeclaration-after-statement -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fPIC -pthread -DHAVE_CONFIG_H -DBUILDING_GST_GL -MD -MQ gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -MF gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o.d -o gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -c ../gst-libs/gst/gl/gstglwindow.c
In file included from ../gst-libs/gst/gl/gstglwindow.c:54:
../gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h:25:10: fatal error: xdg-shell-client-protocol.h: No such file or directory
   25 | #include "xdg-shell-client-protocol.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[235/783] Compiling C object gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/egl_gstegl.c.o
ninja: build stopped: subcommand failed.
```

the meson musl test failure is a bug known upstream - mesonbuild/meson#8283

[skip ci]

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

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

From 3ccf4ae272b027662891adf70e1c85d065a32259 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Nov 2021 22:52:09 +0100
Subject: [PATCH 01/37] meson: update to 0.60.1.

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 6cbcd3c9e966..0a7a60ea5a6d 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.59.4
+version=0.60.1
 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://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
+checksum=5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From fef4a2339413f66dd27cb1d734481ab2d0b60e45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:24:04 +0100
Subject: [PATCH 02/37] PackageKit: update to 1.2.4.

---
 srcpkgs/PackageKit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 155dd156a06a..062dba3d3b00 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
-version=1.2.2
-revision=2
+version=1.2.4
+revision=1
 wrksrc="PackageKit-PACKAGEKIT_${version//./_}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
-checksum=e87e95ce7423f49eff6dad054c86ba6f922e52d0a757f822e0343da0f44d3dbb
+checksum=4a7b0a41ffa56ad8af67156c46ecb9d4eb439b31a4cb581d959bd5480444954b
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 
 build_options="gir vala"

From 2ebb836feb5e93504ab873bae5cbcb1d13dbd551 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:27:14 +0100
Subject: [PATCH 03/37] bijiben: remove obsolete zeitgeist support

bijiben 40.0 dropped zeitgeist support
---
 srcpkgs/bijiben/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8c3e51c3fc37..604076fdb93c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+ libhandy1-devel"
+depends="desktop-file-utils tracker3"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 2cff0dc17ddd92fe1b26b8798555c22a541307f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:41:10 +0100
Subject: [PATCH 04/37] colord-gtk: fix building vala bindings

---
 srcpkgs/colord-gtk/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 65463f110590..634a9322dae3 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,10 +1,10 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvala=$(vopt_if vala true false)
+configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
  -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
@@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.freedesktop.org/software/colord"
+homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
 checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
 
@@ -30,5 +30,8 @@ colord-gtk-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }

From 50313db9b09c1786795cac3d41cce29ec05cba32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:52:14 +0100
Subject: [PATCH 05/37] efl: drop removed configure args

---
 srcpkgs/efl/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 8786d5d94edf..c116523094ea 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -10,8 +10,6 @@ configure_args="
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
  -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
- -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
- -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
  $(vopt_bool elogind systemd)
  $(vopt_bool x11 x11)

From 3da846926892672cf0d53eca4bd8fbab7755e2a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:59:16 +0100
Subject: [PATCH 06/37] enlightenment: drop a removed configure argument

---
 srcpkgs/enlightenment/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index db9c886dc920..360a0f5368e6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -3,7 +3,7 @@ pkgname=enlightenment
 version=0.24.2
 revision=1
 build_style=meson
-configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
+configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
  $(vopt_bool wayland wl)"
 hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)"
 makedepends="gettext-devel efl-devel pam-devel xkeyboard-config

From 3350fdcb0bb2efcdaf20da33fca21a2fadfef924 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 16:03:04 +0100
Subject: [PATCH 07/37] epiphany: drop a removed configure option

---
 srcpkgs/epiphany/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c58e2fa54ef6..0ffa06f547fe 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,7 +4,7 @@ version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
+configure_args="-Dunit_tests=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel

From 597cd8d55c402eaf4ebec70f72a99ee500560d24 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:01:58 +0100
Subject: [PATCH 08/37] gnome-bluetooth: remove obsolete configure options

---
 srcpkgs/gnome-bluetooth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 83d89c0a8acb..e6861631b08d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -4,8 +4,7 @@ version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dicon-update=false -Dgtk_doc=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"

From 800c55d628f4487216f0c79ad3592dd6e1fd4c3f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:06 +0100
Subject: [PATCH 09/37] gnome-initial-setup: remove obsolete configure options

---
 srcpkgs/gnome-initial-setup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 30a4a6ed4762..075e4b86324f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -3,8 +3,7 @@ pkgname=gnome-initial-setup
 version=40.4
 revision=1
 build_style=meson
-configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
- -Dsystemd=false"
+configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel

From 61c7a408cb8bfee9cf37d5d1ab3bbf40218ff0ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:13 +0100
Subject: [PATCH 10/37] gedit: remove obsolete configure options

* gir is not optional anymore, so also removing the build option
---
 srcpkgs/gedit/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index b4e862c26ad0..e93ff8905272 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,12 +5,10 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true
- $(vopt_bool gir vapi) $(vopt_bool gir introspection)"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
- $(vopt_if gir vala)"
+configure_args="-Dplugins=true"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel python3-gobject-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 
-build_options="gir"
-build_options_default="gir"
-
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel
 	 libpeas-devel tepl-devel"
@@ -31,9 +26,7 @@ gedit-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gedit/gir-1.0
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gedit/gir-1.0
+		vmove usr/share/vala
 	}
 }

From 75b3627b63e7a562d780ce65dd626de525572bc7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:17 +0100
Subject: [PATCH 11/37] gnome-builder: remove obsolete configure options

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a3ce20126d78..26cf768c391a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
 revision=3
 build_style=meson
 build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
+configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel

From 3ab109264587bc4f659133b81925fd110859e591 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:26 +0100
Subject: [PATCH 12/37] gamehub: update to 0.16.1-2.

---
 srcpkgs/gamehub/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index ccbf98b53483..e8f110b3eb8d 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -1,8 +1,8 @@
 # Template file for 'gamehub'
 pkgname=gamehub
-version=0.16.0
+version=0.16.1
 revision=1
-wrksrc="GameHub-${version}-1-master"
+wrksrc="GameHub-${version}-2-master"
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
@@ -12,8 +12,8 @@ short_desc="All your games in one place"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tkashkin.tk/projects/gamehub/"
-distfiles="https://github.com/tkashkin/GameHub/archive/${version}-1-master.tar.gz"
-checksum=4244c914d7427933727ec0611886720b9325c4d4a852e0e8c283f6331ebd30e2
+distfiles="https://github.com/tkashkin/GameHub/archive/refs/tags/${version}-2-master.tar.gz"
+checksum=bbbf2f5216ce6f0d6a57179f388a714aec52188f4e67a9deb6478061441a30b5
 
 post_install() {
 	vinstall data/com.github.tkashkin.gamehub.desktop.in 644 usr/share/applications com.github.tkashkin.gamehub.desktop

From 9b82e8ff176962902f90d036f8cea52f7572ca2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:34 +0100
Subject: [PATCH 13/37] NetworkManager: remove obsolete configure options

---
 srcpkgs/NetworkManager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e99d04798939..7001b27dc0e3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -4,7 +4,7 @@ version=1.32.12
 revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
+configure_args="-Dsystemd_journal=false
  -Dlibaudit=no -Dovs=false -Dselinux=false
  -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false

From 0b8d6131fcad9b505401bbf017a5d09513587740 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:21:42 +0100
Subject: [PATCH 14/37] graphene: remove obsolete configure options

---
 srcpkgs/graphene/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 79b2ac2e945e..6be39623eeae 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -4,7 +4,7 @@ version=1.10.6
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+configure_args="-Dinstalled_tests=false
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"

From 4c7fe11c6f917d02134d8f56ccfef89df6b2b098 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:39 +0100
Subject: [PATCH 15/37] grilo: remove obsolete configure options

---
 srcpkgs/grilo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 64bae9bd4e2f..e47ec38542a5 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,7 +4,7 @@ version=0.3.13
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala)
+configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
  -Denable-gtk-doc=false"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
 makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel

From c8363c99f12f768c1c7acd495a9fd9f1a3e28ee8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:43 +0100
Subject: [PATCH 16/37] gnome-passwordsafe: fix build

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

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index fe91bcd9ed23..8f68cbf329f1 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -2,7 +2,7 @@
 pkgname=gnome-passwordsafe
 version=5.0
 revision=2
-wrksrc="PasswordSafe-${version}"
+wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection
  python3-pykeepass"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983
+checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449

From 146e84dfc0e546eda15c34d36bb7aa0b92ece5c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:22 +0100
Subject: [PATCH 17/37] libgudev: remove obsolete configure options

---
 srcpkgs/libgudev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 47d1b8fc365d..e7603d00ce2f 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvala=$(vopt_if vala enabled disabled)"
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"

From dfa6a2f239330c11a8ff0261d36547dabe2478aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:34 +0100
Subject: [PATCH 18/37] libfprint: remove obsolete configure options

---
 srcpkgs/libfprint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index 33ac4c2a0571..16e6b2ffa1e0 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=libfprint-v$version
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
  libgusb-devel libglib-devel"

From 87574c2d8f416423b474bb14ab0005aa71f0b8a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:48 +0100
Subject: [PATCH 19/37] gst1-editing-services: remove obsolete configure
 options

---
 srcpkgs/gst1-editing-services/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 457dec0424cf..fde8efae9569 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled"
 hostmakedepends="flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
 short_desc="GStreamer 1.x Editing Services"

From f6cd313990e6639efbc2acd40b388c4bdbf4ab12 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:01:59 +0100
Subject: [PATCH 20/37] gst-plugins-base1: remove obsolete configure options

---
 srcpkgs/gst-plugins-base1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 050521f071c3..c0dce5856f8d 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"

From 6d71cb639ab5050a15c42ac6d641d922d395772e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:01 +0100
Subject: [PATCH 21/37] gst-plugins-bad1: remove obsolete configure options

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

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..77a88a91fba1 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -5,9 +5,9 @@ revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
- -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
+ -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
  -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled

From 3ed1914f6a6f862aacd031550ac9f17b65bd0d2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:12 +0100
Subject: [PATCH 22/37] hexchat: remove obsolete configure options

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 97937999bb0d..7b3bc658d5aa 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -3,7 +3,7 @@ pkgname=hexchat
 version=2.16.0
 revision=3
 build_style=meson
-configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"

From 8d4bde9817e79bf00dc275fc026a94277f65f89f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:20 +0100
Subject: [PATCH 23/37] igt-gpu-tools: remove obsolete configure options

---
 srcpkgs/igt-gpu-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3b222ecd18d8..3f8b4e2b6166 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -22,7 +22,7 @@ lib32disabled=yes
 archs="i686* x86_64*"
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled"
+	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
 fi
 
 post_install() {

From b500f09a489aa35d2adca5dc77c80095f72df857 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:54:21 +0100
Subject: [PATCH 24/37] libgweather: remove obsolete configure options

---
 srcpkgs/libgweather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 6d9b85a07d04..857006ea8786 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -4,8 +4,7 @@ version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
- -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"

From 5bdfb7a95da4ea0ae36ece4883315abbd5f1e682 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:04:25 +0100
Subject: [PATCH 25/37] light-locker: fix build and license

---
 srcpkgs/light-locker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index e3bb799ba171..d50c71480a33 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,15 +1,15 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel elogind-devel"
+ libXxf86misc-devel libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/the-cavalry/light-locker"
 distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz"
 checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c

From c48d534dc366daa7f2b51fb2a353067e455618df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:19:07 +0100
Subject: [PATCH 26/37] ncmpc: disable html manual

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

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 683ec13e85a3..a7d76aa3ce9e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,9 +1,9 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
 version=0.45
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlirc=disabled"
+configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
 short_desc="Ncurses-based mpd client"

From f3dfaa142c1811eb2e731325a27928abf4d7d85c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:22:30 +0100
Subject: [PATCH 27/37] pixman: remove obsolete configure options

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

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 456e9d1628e8..eba3b82c9fa7 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -5,8 +5,8 @@ revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
-configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
- -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
+configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled
+ -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
 makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"

From fad29c76b03d3f89a40de6a52a77ffd2347eac2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:33:52 +0100
Subject: [PATCH 28/37] seatd: fix configure arguments

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

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index c619787ae3eb..178f1b3d8aa9 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,8 @@ pkgname=seatd
 version=0.6.3
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind)
+ -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From a37d68ef5f8536449f7262087a6a5d69f8217a97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:34:04 +0100
Subject: [PATCH 29/37] spice-gtk: remove obsolete configure options

---
 srcpkgs/spice-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 7218e837891f..351923f41e7f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -7,8 +7,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
- -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
- -Dpulse=disabled -Dgtk_doc=disabled"
+ -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel

From 66c5686904247d2c1242b32adff59c05d913b376 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:37:05 +0100
Subject: [PATCH 30/37] switchboard: remove obsolete configure options

---
 srcpkgs/switchboard/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 45031a8d8b76..ebb706e5d9e5 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -3,7 +3,6 @@ pkgname=switchboard
 version=2.3.7
 revision=2
 build_style=meson
-configure_args="-Dlibunity=false"
 hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"

From 61c399db5c97646616440c0e71dba36fb3550b05 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:41:37 +0100
Subject: [PATCH 31/37] cglm: update to 0.8.4, switch to meson

---
 srcpkgs/cglm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index c7dfee606c45..05885c452520 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
 # Template file for 'cglm'
 pkgname=cglm
-version=0.8.3
+version=0.8.4
 revision=1
-build_style=cmake
+build_style=meson
 short_desc="Highly Optimized Graphics Math (glm) for C"
 maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=3a3f935f9f2ed5a8cb6337e421bf6f3a699a72d8cfe26fde1bbb8fde5c1c8aaf
+checksum=42f84c42c8a3e62954da77ab5c5d3264033d5802009e175db7921332a476126e
 
 post_install() {
 	vlicense LICENSE

From b22ef2d47494d7e69dbbd0ec19d0136d01945628 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:56:50 +0100
Subject: [PATCH 32/37] totem: remove gir build option

---
 srcpkgs/totem/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8871c546b50a..f80a2620b2f1 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -4,12 +4,9 @@ version=3.38.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-python=no -Denable-nautilus=yes
- -Denable-introspection=$(vopt_if gir yes no)
- -Denable-vala=$(vopt_if gir yes no)"
-hostmakedepends="intltool itstool pkg-config
- $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1
- glib-devel"
+configure_args="-Denable-python=no"
+hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1
+ gst-plugins-good1 glib-devel"
 # XXX missing lirc plugin.
 makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
@@ -31,16 +28,11 @@ do_check() {
 	:
 }
 
-build_options="gir"
-build_options_default="gir"
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -51,8 +43,6 @@ totem-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 	}
 }

From 69ff7c35c1ba0ecbfd16506a3560038444254c5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:57:22 +0100
Subject: [PATCH 33/37] tracker3: remove deprecated networkmanager option

---
 srcpkgs/tracker3/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..a6f8135b77d6 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,16 +1,15 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=3
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled
- -Dstemmer=disabled -Dsystemd_user_services=false"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="tar python3-gobject"
 short_desc="Personal search tool and storage system"
 maintainer="q66 <daniel@octaforge.org>"

From 5c69abe709c36f40e0486adba67ba51f487b16bb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:00:29 +0100
Subject: [PATCH 34/37] tracker-miners: remove taglib configure option

---
 srcpkgs/tracker-miners/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..9c4762cf56ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
  -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
@@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ libvorbis-devel poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
 short_desc="Data miners for tracker"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -24,8 +24,4 @@ license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
 checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
+make_check=no # relies on unsupported ops in chroot

From 935c8219c2ce350c7bb3a6ece8ca621703a54439 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:18:35 +0100
Subject: [PATCH 35/37] tracker3-miners: remove obsolete configure options

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..4c752fe55add 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -5,20 +5,20 @@ revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
  -Dsystemd_user_services=false -Dnetwork_manager=enabled"
 hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
  NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker3"

From 44bb4fa6fae8c715b13fa328fabdf581038ed0ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 13:48:40 +0100
Subject: [PATCH 36/37] libwacom: remove obsolete configure options

---
 srcpkgs/libwacom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index c4922df7a205..b6003b1c6d3e 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -4,7 +4,7 @@ version=1.12
 revision=1
 build_style=meson
 build_helper="qemu"
-configure_args="-Ddocumentation=disabled -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+configure_args="-Ddocumentation=disabled"
 hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
 checkdepends="python3-pytest python3-libevdev python3-pyudev"

From 53b445fc66967e3af6e4a5dc09b667d811db0098 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 14:21:50 +0100
Subject: [PATCH 37/37] gnome-settings-daemon: fix build with meson 0.60

---
 .../meson-fix-string-bool-comparison.patch    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
new file mode 100644
index 000000000000..19cb682ca296
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
@@ -0,0 +1,29 @@
+From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 16 Jul 2021 16:02:36 +0200
+Subject: [PATCH] build: Fix str/bool comparison
+
+gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==.
+The result of this is undefined and will become a hard error in a future Meson release.
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fdf71713..ba2a90ca 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release')
+   common_flags += ['-DG_DISABLE_CAST_CHECKS']
+ endif
+ 
+-# Workaround for meson's bug
+-# https://github.com/mesonbuild/meson/pull/1896
+-if get_option('b_ndebug') == true
++if get_option('b_ndebug') == 'true'
+   common_flags += ['-DG_DISABLE_ASSERT']
+ endif
+ 
+-- 
+GitLab
+

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
                   ` (2 preceding siblings ...)
  2021-11-14 14:07 ` paper42
@ 2021-11-14 14:38 ` eli-schwartz
  2021-11-14 18:24 ` [PR PATCH] [Updated] " paper42
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: eli-schwartz @ 2021-11-14 14:38 UTC (permalink / raw)
  To: ml

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

New comment by eli-schwartz on void-packages repository

https://github.com/void-linux/void-packages/pull/34059#issuecomment-968303043

Comment:
>     * igt-gpu-tools

https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/963917a3565466832a3b2fc22e9285d34a0bf944



>     * vala-panel{,-appmenu}

https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/issues/357 etc. fixed in https://gitlab.com/vala-panel-project/vala-panel-appmenu/-/commit/442bcebcc00ea3a51057de0d1290593be7f9deb3 but perhaps vala-panel needs the same fix

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
                   ` (3 preceding siblings ...)
  2021-11-14 14:38 ` eli-schwartz
@ 2021-11-14 18:24 ` paper42
  2021-11-26  0:30 ` paper42
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2021-11-14 18:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages meson-0.60
https://github.com/void-linux/void-packages/pull/34059

meson 0.60
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I ran the configure phase on all packages with meson build_style, currently broken builds:

## regressions from 0.59.4

- [ ] igt-gpu-tools

```Checking whether type "struct sysinfo" has member "totalram" : YES 
Running compile:
Working directory:  /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n
Command line:  cc /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c -o /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/output.exe -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_FILE_OFFSET_BITS=64 -O0 -std=gnu11 -D_GNU_SOURCE -Wl,-z,relro -Wl,-z,now -Wl,--as-needed 

Code:
 #include <sys/mman.h>
#include <limits.h>

        #if defined __stub_memfd_create || defined __stub___memfd_create
        fail fail fail this function is not going to work
        #endif
        
int main(void) {
            void *a = (void*) &memfd_create;
            long long b = (long long) a;
            return (int) b;
        }
Compiler stdout:
 
Compiler stderr:
 In file included from /usr/include/sys/mman.h:22,
                 from /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c:1:
/usr/include/features.h:397:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
      |    ^~~~~~~

Checking for function "memfd_create" : YES 
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

lib/meson.build:131:4: ERROR: Function does not take positional arguments.
```

- [ ] NetworkManager
```
=> NetworkManager-1.32.12_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libgio-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgobject-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libglib-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgmodule-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libdl.so.2 <-> glibc>=2.32_1
   SONAME: libndp.so.0 <-> libndp>=1.3_1
   SONAME: libudev.so.1 <-> eudev-libudev>=1.6_1
   SONAME: libelogind.so.0 <-> libelogind>=238.1_2
   SONAME: libcurl.so.4 <-> libcurl>=7.75.0_2
   SONAME: libpsl.so.5 <-> libpsl>=0.20.2_1
   SONAME: libsmime3.so <-> nss>=3.12.4_1
   SONAME: libnss3.so <-> nss>=3.12.4_1
   SONAME: libnspr4.so <-> nspr>=4.8_1
   SONAME: libpthread.so.0 <-> glibc>=2.32_1
   SONAME: libc.so.6 <-> glibc>=2.32_1
   SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
   SONAME: libnm.so.0 <-> libnm-1.32.12_1
   SONAME: libnewt.so.0.52 <-> newt>=0.52.18_1
   SONAME: libreadline.so.8 <-> libreadline8>=8.0_1
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
   SONAME: src/core/devices/wwan/libnm-wwan.so <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libmm-glib.so.0 <-> libmm-glib>=1.0.0_1
=> ERROR: NetworkManager-1.32.12_1: cannot guess required shlibs, aborting!
```

- [ ] vala-panel{,-appmenu}
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/vala-panel-0.5.0
Build dir: /builddir/vala-panel-0.5.0/build
Build type: native build
Project name: vala-panel
Project version: 0.5.0
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Vala compiler for the host machine: valac (valac 0.52.4)
Host machine cpu family: x86_64
Host machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.70.0
Run-time dependency gio-2.0 found: YES 2.70.0
Run-time dependency gio-unix-2.0 found: YES 2.70.0
Run-time dependency gmodule-2.0 found: YES 2.70.0
Run-time dependency gtk+-3.0 found: YES 3.24.30
Run-time dependency gdk-x11-3.0 found: YES 3.24.30
Run-time dependency gdk-wayland-3.0 found: YES 3.24.30
Run-time dependency gtk-layer-shell-0 found: YES 0.6.0
Library m found: YES
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

po/meson.build:1:5: ERROR: Tried to create target "vala-panel-nb.mo", but a target of that name already exists.
```

- [x] gnome-settings-daemon

imported an upstream patch
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/gnome-settings-daemon-40.0.1
Build dir: /builddir/gnome-settings-daemon-40.0.1/build
Build type: native build
Project name: gnome-settings-daemon
Project version: 40.0.1
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64

meson.build:87:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
```

- [x] libsixel

This will be fixed in meson 0.60.2, I imported a patch for now - mesonbuild/meson#9530
```
=> xbps-src: updating repositories for host (x86_64)...
The Meson build system
Version: 0.60.1
Source dir: /builddir/libsixel-1.10.3
Build dir: /builddir/libsixel-1.10.3/build
Build type: native build
Project name: libsixel
Project version: 1.10.3
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64
Checking for function "unreachable" : YES 
Compiler for C supports arguments -Wformat=2: YES 
Compiler for C supports arguments -Wsign-conversion: YES 
Compiler for C supports arguments -Wuninitialized: YES 
Compiler for C supports arguments -Wstrict-overflow: YES 
Compiler for C supports arguments -Wshadow: YES 
Compiler for C supports arguments -Wdouble-promotion: YES 
Compiler for C supports arguments -Wswitch-default: YES 
Compiler for C supports arguments -Wunused-function: YES 
Compiler for C supports arguments -Wunused-but-set-variable: YES 
Compiler for C supports arguments -Bsymbolic: YES 
Library m found: YES
Checking for function "malloc" : YES 
Checking for function "realloc" : YES 
Checking for function "memset" : YES 
Checking for function "getopt_long" : YES 
Has header "assert.h" : YES 
Has header "math.h" : YES 
Has header "ctype.h" : YES 
Has header "memory.h" : YES 
Has header "string.h" : YES 
Has header "unistd.h" : YES 
Has header "stdint.h" : YES 
Has header "getopt.h" : YES 
Has header "sys/types.h" : YES 
Has header "sys/stat.h" : YES 
Has header "fcntl.h" : YES 
Has header "errno.h" : YES 
Has header "limits.h" : YES 
Has header "sys/time.h" : YES 
Has header "time.h" : YES 
Has header "signal.h" : YES 
Has header "sys/select.h" : YES 
Has header "sys/signal.h" : YES 
Has header "termios.h" : YES 
Has header "sys/ioctl.h" : YES 
Has header "inttypes.h" : YES 
Dependency gdk-pixbuf-2.0 skipped: feature gdk-pixbuf2 disabled
Library gd found: NO
Dependency libcurl skipped: feature libcurl disabled
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency libjpeg found: YES 2.1.1
Run-time dependency libpng found: YES 1.6.37
Program python2 found: NO (disabled by: python2 )
Configuring config.h using configuration
Configuring sixel.h using configuration
Program bash found: YES (/usr/bin/bash)
Configuring libsixel-config using configuration
meson.build:161: WARNING: Perl, PHP and Ruby modules are available but not installed by Meson. If you want them, please refer to their individual installation directories for instructions after building libsixel.

meson.build:163:0: ERROR: Format placeholder @9@ out of range.
```

## unrelated build failures

- [ ] gst-plugins-base1
```
FAILED: gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o 
cc -Igst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p -I. -I.. -Igst-libs -I../gst-libs -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/orc-0.4 -I/usr/include/gudev-1.0 -I/usr/include/libdrm -flto=auto -fdiagnostics-color=always -DNDEBUG -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -Wmissing-declarations -Wredundant-decls -Wundef -Wwrite-strings -Wformat -Wformat-nonliteral -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wvla -Wpointer-arith -Wmissing-prototypes -Wdeclaration-after-statement -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fPIC -pthread -DHAVE_CONFIG_H -DBUILDING_GST_GL -MD -MQ gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -MF gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o.d -o gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -c ../gst-libs/gst/gl/gstglwindow.c
In file included from ../gst-libs/gst/gl/gstglwindow.c:54:
../gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h:25:10: fatal error: xdg-shell-client-protocol.h: No such file or directory
   25 | #include "xdg-shell-client-protocol.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[235/783] Compiling C object gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/egl_gstegl.c.o
ninja: build stopped: subcommand failed.
```

the meson musl test failure is a bug known upstream - mesonbuild/meson#8283

[skip ci]

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

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

From bf352e284000fe487db33946f5db365f3bf9522e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Nov 2021 22:52:09 +0100
Subject: [PATCH 01/39] meson: update to 0.60.1.

---
 ...9fed9e4136f858b58749fd35127a73229cd2.patch | 64 +++++++++++++++++++
 srcpkgs/meson/template                        |  4 +-
 2 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/meson/patches/558f9fed9e4136f858b58749fd35127a73229cd2.patch

diff --git a/srcpkgs/meson/patches/558f9fed9e4136f858b58749fd35127a73229cd2.patch b/srcpkgs/meson/patches/558f9fed9e4136f858b58749fd35127a73229cd2.patch
new file mode 100644
index 000000000000..75d48a15443a
--- /dev/null
+++ b/srcpkgs/meson/patches/558f9fed9e4136f858b58749fd35127a73229cd2.patch
@@ -0,0 +1,64 @@
+From 558f9fed9e4136f858b58749fd35127a73229cd2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Thu, 4 Nov 2021 18:46:09 -0400
+Subject: [PATCH] fix regression that broke string.format with list objects
+
+String formatting should validly assume that printing a list means
+printing the list itself. Instead, something like this broke:
+
+'one is: @0@ and two is: @1@'.format(['foo',  'bar'], ['baz'])
+
+which would evaluate as:
+
+'one is: foo and two is: bar'
+
+or:
+
+'the value of array option foobar is: @0@'.format(get_option('foobar'))
+
+which should evaluate with '-Dfoobar=[]' as
+
+'the value of array option foobar is: []'
+
+But instead produced:
+
+meson.build:7:0: ERROR: Format placeholder @0@ out of range.
+
+Fixes #9530
+---
+ mesonbuild/interpreter/primitives/string.py        | 2 ++
+ test cases/common/35 string operations/meson.build | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/mesonbuild/interpreter/primitives/string.py b/mesonbuild/interpreter/primitives/string.py
+index 3f8df5eb70e..a5fc9920275 100644
+--- a/mesonbuild/interpreter/primitives/string.py
++++ b/mesonbuild/interpreter/primitives/string.py
+@@ -13,6 +13,7 @@
+     MesonOperator,
+     FeatureNew,
+     typed_operator,
++    noArgsFlattening,
+     noKwargs,
+     noPosargs,
+     typed_pos_args,
+@@ -85,6 +86,7 @@ def startswith_method(self, args: T.Tuple[str], kwargs: TYPE_kwargs) -> bool:
+     def endswith_method(self, args: T.Tuple[str], kwargs: TYPE_kwargs) -> bool:
+         return self.held_object.endswith(args[0])
+ 
++    @noArgsFlattening
+     @noKwargs
+     @typed_pos_args('str.format', varargs=object)
+     def format_method(self, args: T.Tuple[T.List[object]], kwargs: TYPE_kwargs) -> str:
+diff --git a/test cases/common/35 string operations/meson.build b/test cases/common/35 string operations/meson.build
+index b86e13a1afd..2ba70b6e10e 100644
+--- a/test cases/common/35 string operations/meson.build	
++++ b/test cases/common/35 string operations/meson.build	
+@@ -60,6 +60,7 @@ assert(false.to_string() == 'false', 'bool string conversion failed')
+ assert(true.to_string('yes', 'no') == 'yes', 'bool string conversion with args failed')
+ assert(false.to_string('yes', 'no') == 'no', 'bool string conversion with args failed')
+ assert('@0@'.format(true) == 'true', 'bool string formatting failed')
++assert('@0@'.format(['one', 'two']) == '[\'one\', \'two\']', 'list string formatting failed')
+ 
+ assert(' '.join(['a', 'b', 'c']) == 'a b c', 'join() array broken')
+ assert(''.join(['a', 'b', 'c']) == 'abc', 'empty join() broken')
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 6cbcd3c9e966..0a7a60ea5a6d 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.59.4
+version=0.60.1
 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://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
+checksum=5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From e1cbc32596a81def53f590f7247ab02e39d239c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:24:04 +0100
Subject: [PATCH 02/39] PackageKit: update to 1.2.4.

---
 srcpkgs/PackageKit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 155dd156a06a..062dba3d3b00 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
-version=1.2.2
-revision=2
+version=1.2.4
+revision=1
 wrksrc="PackageKit-PACKAGEKIT_${version//./_}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
-checksum=e87e95ce7423f49eff6dad054c86ba6f922e52d0a757f822e0343da0f44d3dbb
+checksum=4a7b0a41ffa56ad8af67156c46ecb9d4eb439b31a4cb581d959bd5480444954b
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 
 build_options="gir vala"

From b0fa3023c95d5f736f1436f543d274e444c7a519 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:27:14 +0100
Subject: [PATCH 03/39] bijiben: remove obsolete zeitgeist support

bijiben 40.0 dropped zeitgeist support
---
 srcpkgs/bijiben/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8c3e51c3fc37..604076fdb93c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+ libhandy1-devel"
+depends="desktop-file-utils tracker3"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 65ca6e5c833ab8ed2d409908ac1cc48a2bd95b45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:41:10 +0100
Subject: [PATCH 04/39] colord-gtk: fix building vala bindings

---
 srcpkgs/colord-gtk/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 65463f110590..634a9322dae3 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,10 +1,10 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvala=$(vopt_if vala true false)
+configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
  -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
@@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.freedesktop.org/software/colord"
+homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
 checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
 
@@ -30,5 +30,8 @@ colord-gtk-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }

From 616a82d82e0c030214c8768c085cdd1d39319d90 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:52:14 +0100
Subject: [PATCH 05/39] efl: drop removed configure args

---
 srcpkgs/efl/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 8786d5d94edf..c116523094ea 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -10,8 +10,6 @@ configure_args="
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
  -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
- -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
- -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
  $(vopt_bool elogind systemd)
  $(vopt_bool x11 x11)

From 5df12f3103e4dbbcabb891a90701aa63ff2ef05c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:59:16 +0100
Subject: [PATCH 06/39] enlightenment: drop a removed configure argument

---
 srcpkgs/enlightenment/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index db9c886dc920..360a0f5368e6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -3,7 +3,7 @@ pkgname=enlightenment
 version=0.24.2
 revision=1
 build_style=meson
-configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
+configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
  $(vopt_bool wayland wl)"
 hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)"
 makedepends="gettext-devel efl-devel pam-devel xkeyboard-config

From 654558c5fb78818007ee794b1c38e8cc21dca46b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 16:03:04 +0100
Subject: [PATCH 07/39] epiphany: drop a removed configure option

---
 srcpkgs/epiphany/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c58e2fa54ef6..0ffa06f547fe 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,7 +4,7 @@ version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
+configure_args="-Dunit_tests=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel

From 6a3c7adaa95930470f642a29068909c381e7656d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:01:58 +0100
Subject: [PATCH 08/39] gnome-bluetooth: remove obsolete configure options

---
 srcpkgs/gnome-bluetooth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 83d89c0a8acb..e6861631b08d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -4,8 +4,7 @@ version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dicon-update=false -Dgtk_doc=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"

From 1ec31b723bdbcdfa8e6fe69a8e267882bb64911e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:06 +0100
Subject: [PATCH 09/39] gnome-initial-setup: remove obsolete configure options

---
 srcpkgs/gnome-initial-setup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 30a4a6ed4762..075e4b86324f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -3,8 +3,7 @@ pkgname=gnome-initial-setup
 version=40.4
 revision=1
 build_style=meson
-configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
- -Dsystemd=false"
+configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel

From dca8ff6765f6f2c916443138a92b61512507a7ec Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:13 +0100
Subject: [PATCH 10/39] gedit: remove obsolete configure options

* gir is not optional anymore, so also removing the build option
---
 srcpkgs/gedit/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index b4e862c26ad0..e93ff8905272 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,12 +5,10 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true
- $(vopt_bool gir vapi) $(vopt_bool gir introspection)"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
- $(vopt_if gir vala)"
+configure_args="-Dplugins=true"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel python3-gobject-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 
-build_options="gir"
-build_options_default="gir"
-
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel
 	 libpeas-devel tepl-devel"
@@ -31,9 +26,7 @@ gedit-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gedit/gir-1.0
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gedit/gir-1.0
+		vmove usr/share/vala
 	}
 }

From d1c186f3acc72801b0a3a637676c75c8aeadf7f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:17 +0100
Subject: [PATCH 11/39] gnome-builder: remove obsolete configure options

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a3ce20126d78..26cf768c391a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
 revision=3
 build_style=meson
 build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
+configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel

From a76185d3dbdfac3a6e77b17bd7e5ffbdcf4431cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:26 +0100
Subject: [PATCH 12/39] gamehub: update to 0.16.1-2.

---
 srcpkgs/gamehub/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index ccbf98b53483..e8f110b3eb8d 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -1,8 +1,8 @@
 # Template file for 'gamehub'
 pkgname=gamehub
-version=0.16.0
+version=0.16.1
 revision=1
-wrksrc="GameHub-${version}-1-master"
+wrksrc="GameHub-${version}-2-master"
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
@@ -12,8 +12,8 @@ short_desc="All your games in one place"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tkashkin.tk/projects/gamehub/"
-distfiles="https://github.com/tkashkin/GameHub/archive/${version}-1-master.tar.gz"
-checksum=4244c914d7427933727ec0611886720b9325c4d4a852e0e8c283f6331ebd30e2
+distfiles="https://github.com/tkashkin/GameHub/archive/refs/tags/${version}-2-master.tar.gz"
+checksum=bbbf2f5216ce6f0d6a57179f388a714aec52188f4e67a9deb6478061441a30b5
 
 post_install() {
 	vinstall data/com.github.tkashkin.gamehub.desktop.in 644 usr/share/applications com.github.tkashkin.gamehub.desktop

From a5d667a4d62a8051d333dcb214edb7270445f622 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:34 +0100
Subject: [PATCH 13/39] NetworkManager: remove obsolete configure options

---
 srcpkgs/NetworkManager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e99d04798939..7001b27dc0e3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -4,7 +4,7 @@ version=1.32.12
 revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
+configure_args="-Dsystemd_journal=false
  -Dlibaudit=no -Dovs=false -Dselinux=false
  -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false

From 77bcb1f9323b045961ed2edb6ce208e6b688ec47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:21:42 +0100
Subject: [PATCH 14/39] graphene: remove obsolete configure options

---
 srcpkgs/graphene/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 79b2ac2e945e..6be39623eeae 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -4,7 +4,7 @@ version=1.10.6
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+configure_args="-Dinstalled_tests=false
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"

From 70113624b7361dd177e3ef7065dff5f44fab1a45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:39 +0100
Subject: [PATCH 15/39] grilo: remove obsolete configure options

---
 srcpkgs/grilo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 64bae9bd4e2f..e47ec38542a5 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,7 +4,7 @@ version=0.3.13
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala)
+configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
  -Denable-gtk-doc=false"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
 makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel

From d1d915e4909cd44f8d88d26968fb003a1c7a48c0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:43 +0100
Subject: [PATCH 16/39] gnome-passwordsafe: fix build

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

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index fe91bcd9ed23..8f68cbf329f1 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -2,7 +2,7 @@
 pkgname=gnome-passwordsafe
 version=5.0
 revision=2
-wrksrc="PasswordSafe-${version}"
+wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection
  python3-pykeepass"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983
+checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449

From 87ffbc11b7fc8f2cc90ded504bd0131fd0e3277c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:22 +0100
Subject: [PATCH 17/39] libgudev: remove obsolete configure options

---
 srcpkgs/libgudev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 47d1b8fc365d..e7603d00ce2f 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvala=$(vopt_if vala enabled disabled)"
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"

From 6aee078d259d588cdadc9b0c8c712788b17ab96e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:34 +0100
Subject: [PATCH 18/39] libfprint: remove obsolete configure options

---
 srcpkgs/libfprint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index 33ac4c2a0571..16e6b2ffa1e0 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=libfprint-v$version
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
  libgusb-devel libglib-devel"

From 518b1880afe4fb87e3855763ac3750b5334959fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:48 +0100
Subject: [PATCH 19/39] gst1-editing-services: remove obsolete configure
 options

---
 srcpkgs/gst1-editing-services/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 457dec0424cf..fde8efae9569 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled"
 hostmakedepends="flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
 short_desc="GStreamer 1.x Editing Services"

From edad3a42ca349a401a5ddc6fa5de72b7f6ee9fcc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:01:59 +0100
Subject: [PATCH 20/39] gst-plugins-base1: remove obsolete configure options

---
 srcpkgs/gst-plugins-base1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 050521f071c3..c0dce5856f8d 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"

From bdb0f1270011565ad16b93a9662ced654080eb5a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:01 +0100
Subject: [PATCH 21/39] gst-plugins-bad1: remove obsolete configure options

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

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..77a88a91fba1 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -5,9 +5,9 @@ revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
- -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
+ -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
  -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled

From 7ed2210c16219d7686b76096631107207288eac4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:12 +0100
Subject: [PATCH 22/39] hexchat: remove obsolete configure options

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 97937999bb0d..7b3bc658d5aa 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -3,7 +3,7 @@ pkgname=hexchat
 version=2.16.0
 revision=3
 build_style=meson
-configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"

From 7ff7362ecf78e99c465cdec2552662318e996caa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:20 +0100
Subject: [PATCH 23/39] igt-gpu-tools: fix build with meson 0.60

---
 .../patches/meson-fix-underscorify-call.patch | 36 +++++++++++++++++++
 srcpkgs/igt-gpu-tools/template                |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch

diff --git a/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
new file mode 100644
index 000000000000..142e2fa44fb6
--- /dev/null
+++ b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc8..297b0ad2 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+ 
+ lib_intermediates = []
+ foreach f: lib_sources
+-    name = f.underscorify(f)
++    name = f.underscorify()
+     lib = static_library('igt-' + name,
+ 	[ f, lib_version ],
+ 	include_directories: inc,
+-- 
+GitLab
+
diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3b222ecd18d8..3f8b4e2b6166 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -22,7 +22,7 @@ lib32disabled=yes
 archs="i686* x86_64*"
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled"
+	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
 fi
 
 post_install() {

From 0b6f81b251ca5d83195dfe64e2042dffad8d9b1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:54:21 +0100
Subject: [PATCH 24/39] libgweather: remove obsolete configure options

---
 srcpkgs/libgweather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 6d9b85a07d04..857006ea8786 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -4,8 +4,7 @@ version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
- -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"

From 2f661a5793361b4f9d4822cdd5b4c0322d9f2f6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:04:25 +0100
Subject: [PATCH 25/39] light-locker: fix build and license

---
 srcpkgs/light-locker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index e3bb799ba171..d50c71480a33 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,15 +1,15 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel elogind-devel"
+ libXxf86misc-devel libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/the-cavalry/light-locker"
 distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz"
 checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c

From 1528736f55262f71c6c41085df61d1841207e443 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:19:07 +0100
Subject: [PATCH 26/39] ncmpc: disable html manual

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

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 683ec13e85a3..a7d76aa3ce9e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,9 +1,9 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
 version=0.45
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlirc=disabled"
+configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
 short_desc="Ncurses-based mpd client"

From 581687174910b778b28c32d9a756d0b5e6c31f4d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:22:30 +0100
Subject: [PATCH 27/39] pixman: remove obsolete configure options

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

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 456e9d1628e8..eba3b82c9fa7 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -5,8 +5,8 @@ revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
-configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
- -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
+configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled
+ -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
 makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"

From 7a854b5ccb94a384ee8d01020fa990fe0b8f4d9e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:33:52 +0100
Subject: [PATCH 28/39] seatd: fix configure arguments

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

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index c619787ae3eb..178f1b3d8aa9 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,8 @@ pkgname=seatd
 version=0.6.3
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind)
+ -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From 4a28c1116ab3fc18ce6db822ad8d1cc80b62eb1d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:34:04 +0100
Subject: [PATCH 29/39] spice-gtk: remove obsolete configure options

---
 srcpkgs/spice-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 7218e837891f..351923f41e7f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -7,8 +7,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
- -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
- -Dpulse=disabled -Dgtk_doc=disabled"
+ -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel

From 7f9c824a3f2b064ca2bd990a87385b2406d60a3b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:37:05 +0100
Subject: [PATCH 30/39] switchboard: remove obsolete configure options

---
 srcpkgs/switchboard/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 45031a8d8b76..ebb706e5d9e5 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -3,7 +3,6 @@ pkgname=switchboard
 version=2.3.7
 revision=2
 build_style=meson
-configure_args="-Dlibunity=false"
 hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"

From 2b5dc423bb6d40a2b5284f92f8aa0ca4a1bea931 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:41:37 +0100
Subject: [PATCH 31/39] cglm: update to 0.8.4, switch to meson

---
 srcpkgs/cglm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index c7dfee606c45..05885c452520 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
 # Template file for 'cglm'
 pkgname=cglm
-version=0.8.3
+version=0.8.4
 revision=1
-build_style=cmake
+build_style=meson
 short_desc="Highly Optimized Graphics Math (glm) for C"
 maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=3a3f935f9f2ed5a8cb6337e421bf6f3a699a72d8cfe26fde1bbb8fde5c1c8aaf
+checksum=42f84c42c8a3e62954da77ab5c5d3264033d5802009e175db7921332a476126e
 
 post_install() {
 	vlicense LICENSE

From 00c720f879731f5688d8dabd9d3d5125b57fd3a3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:56:50 +0100
Subject: [PATCH 32/39] totem: remove gir build option

---
 srcpkgs/totem/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8871c546b50a..f80a2620b2f1 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -4,12 +4,9 @@ version=3.38.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-python=no -Denable-nautilus=yes
- -Denable-introspection=$(vopt_if gir yes no)
- -Denable-vala=$(vopt_if gir yes no)"
-hostmakedepends="intltool itstool pkg-config
- $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1
- glib-devel"
+configure_args="-Denable-python=no"
+hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1
+ gst-plugins-good1 glib-devel"
 # XXX missing lirc plugin.
 makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
@@ -31,16 +28,11 @@ do_check() {
 	:
 }
 
-build_options="gir"
-build_options_default="gir"
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -51,8 +43,6 @@ totem-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 	}
 }

From 898be327b072eb9737cfb7ced4c12182b95c7d00 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:57:22 +0100
Subject: [PATCH 33/39] tracker3: remove deprecated networkmanager option

---
 srcpkgs/tracker3/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..a6f8135b77d6 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,16 +1,15 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=3
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled
- -Dstemmer=disabled -Dsystemd_user_services=false"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="tar python3-gobject"
 short_desc="Personal search tool and storage system"
 maintainer="q66 <daniel@octaforge.org>"

From fe9e75cf4ba6982a25db932869984f88ef7edd8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:00:29 +0100
Subject: [PATCH 34/39] tracker-miners: remove taglib configure option

---
 srcpkgs/tracker-miners/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..9c4762cf56ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
  -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
@@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ libvorbis-devel poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
 short_desc="Data miners for tracker"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -24,8 +24,4 @@ license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
 checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
+make_check=no # relies on unsupported ops in chroot

From f4ead7de6dad77983af2dc6dbf84c91deb6f99e7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:18:35 +0100
Subject: [PATCH 35/39] tracker3-miners: remove obsolete configure options

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..4c752fe55add 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -5,20 +5,20 @@ revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
  -Dsystemd_user_services=false -Dnetwork_manager=enabled"
 hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
  NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker3"

From 37224b45617ff382b6ae42b91846c1952628547a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 13:48:40 +0100
Subject: [PATCH 36/39] libwacom: remove obsolete configure options

---
 srcpkgs/libwacom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index c4922df7a205..b6003b1c6d3e 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -4,7 +4,7 @@ version=1.12
 revision=1
 build_style=meson
 build_helper="qemu"
-configure_args="-Ddocumentation=disabled -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+configure_args="-Ddocumentation=disabled"
 hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
 checkdepends="python3-pytest python3-libevdev python3-pyudev"

From 976be61f857f1dcc15e4871c098cb7f9ef5d2f70 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 14:21:50 +0100
Subject: [PATCH 37/39] gnome-settings-daemon: fix build with meson 0.60

---
 .../meson-fix-string-bool-comparison.patch    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
new file mode 100644
index 000000000000..19cb682ca296
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
@@ -0,0 +1,29 @@
+From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 16 Jul 2021 16:02:36 +0200
+Subject: [PATCH] build: Fix str/bool comparison
+
+gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==.
+The result of this is undefined and will become a hard error in a future Meson release.
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fdf71713..ba2a90ca 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release')
+   common_flags += ['-DG_DISABLE_CAST_CHECKS']
+ endif
+ 
+-# Workaround for meson's bug
+-# https://github.com/mesonbuild/meson/pull/1896
+-if get_option('b_ndebug') == true
++if get_option('b_ndebug') == 'true'
+   common_flags += ['-DG_DISABLE_ASSERT']
+ endif
+ 
+-- 
+GitLab
+

From f86f74b8cee3cb1469d40970fc24b5c4bfba6128 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 18:57:28 +0100
Subject: [PATCH 38/39] vala-panel: fix build with meson 0.60

---
 .../LINGUAS-remove-a-duplicate-entry.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch

diff --git a/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch
new file mode 100644
index 000000000000..36548f5dab6e
--- /dev/null
+++ b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch
@@ -0,0 +1,19 @@
+From 52f40ce779cfa224266dd427cfe57afd83a28362 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 14 Nov 2021 17:15:55 +0100
+Subject: [PATCH] LINGUAS: remove a duplicate entry
+
+---
+ po/LINGUAS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index e66ec1c..3ee3bdd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
+-- 
+2.33.1
+

From 4e3abbe87da17e85239e7ca53c8c2b3b74cdd2d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 18:59:05 +0100
Subject: [PATCH 39/39] vala-panel-appmenu: fix build with meson 0.60

---
 .../LINGUAS-remove-a-duplicate-entry.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch

diff --git a/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch
new file mode 100644
index 000000000000..3b31ed15b1f5
--- /dev/null
+++ b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch
@@ -0,0 +1,19 @@
+From 442bcebcc00ea3a51057de0d1290593be7f9deb3 Mon Sep 17 00:00:00 2001
+From: Konstantin <ria.freelander@gmail.com>
+Date: Wed, 27 Oct 2021 07:47:37 +0000
+Subject: [PATCH] Update LINGUAS
+
+---
+ po/LINGUAS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index e66ec1c..3ee3bdd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
+-- 
+GitLab
+

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
                   ` (4 preceding siblings ...)
  2021-11-14 18:24 ` [PR PATCH] [Updated] " paper42
@ 2021-11-26  0:30 ` paper42
  2021-12-02  1:01 ` eli-schwartz
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2021-11-26  0:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages meson-0.60
https://github.com/void-linux/void-packages/pull/34059

meson 0.60
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I ran the configure phase on all packages with meson build_style, currently broken builds:

## regressions from 0.59.4

- [x] igt-gpu-tools

```Checking whether type "struct sysinfo" has member "totalram" : YES 
Running compile:
Working directory:  /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n
Command line:  cc /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c -o /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/output.exe -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_FILE_OFFSET_BITS=64 -O0 -std=gnu11 -D_GNU_SOURCE -Wl,-z,relro -Wl,-z,now -Wl,--as-needed 

Code:
 #include <sys/mman.h>
#include <limits.h>

        #if defined __stub_memfd_create || defined __stub___memfd_create
        fail fail fail this function is not going to work
        #endif
        
int main(void) {
            void *a = (void*) &memfd_create;
            long long b = (long long) a;
            return (int) b;
        }
Compiler stdout:
 
Compiler stderr:
 In file included from /usr/include/sys/mman.h:22,
                 from /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c:1:
/usr/include/features.h:397:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
      |    ^~~~~~~

Checking for function "memfd_create" : YES 
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

lib/meson.build:131:4: ERROR: Function does not take positional arguments.
```

- [ ] NetworkManager
```
=> NetworkManager-1.32.12_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libgio-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgobject-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libglib-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgmodule-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libdl.so.2 <-> glibc>=2.32_1
   SONAME: libndp.so.0 <-> libndp>=1.3_1
   SONAME: libudev.so.1 <-> eudev-libudev>=1.6_1
   SONAME: libelogind.so.0 <-> libelogind>=238.1_2
   SONAME: libcurl.so.4 <-> libcurl>=7.75.0_2
   SONAME: libpsl.so.5 <-> libpsl>=0.20.2_1
   SONAME: libsmime3.so <-> nss>=3.12.4_1
   SONAME: libnss3.so <-> nss>=3.12.4_1
   SONAME: libnspr4.so <-> nspr>=4.8_1
   SONAME: libpthread.so.0 <-> glibc>=2.32_1
   SONAME: libc.so.6 <-> glibc>=2.32_1
   SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
   SONAME: libnm.so.0 <-> libnm-1.32.12_1
   SONAME: libnewt.so.0.52 <-> newt>=0.52.18_1
   SONAME: libreadline.so.8 <-> libreadline8>=8.0_1
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
   SONAME: src/core/devices/wwan/libnm-wwan.so <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libmm-glib.so.0 <-> libmm-glib>=1.0.0_1
=> ERROR: NetworkManager-1.32.12_1: cannot guess required shlibs, aborting!
```

- [x] vala-panel{,-appmenu}
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/vala-panel-0.5.0
Build dir: /builddir/vala-panel-0.5.0/build
Build type: native build
Project name: vala-panel
Project version: 0.5.0
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Vala compiler for the host machine: valac (valac 0.52.4)
Host machine cpu family: x86_64
Host machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.70.0
Run-time dependency gio-2.0 found: YES 2.70.0
Run-time dependency gio-unix-2.0 found: YES 2.70.0
Run-time dependency gmodule-2.0 found: YES 2.70.0
Run-time dependency gtk+-3.0 found: YES 3.24.30
Run-time dependency gdk-x11-3.0 found: YES 3.24.30
Run-time dependency gdk-wayland-3.0 found: YES 3.24.30
Run-time dependency gtk-layer-shell-0 found: YES 0.6.0
Library m found: YES
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

po/meson.build:1:5: ERROR: Tried to create target "vala-panel-nb.mo", but a target of that name already exists.
```

- [x] gnome-settings-daemon

imported an upstream patch
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/gnome-settings-daemon-40.0.1
Build dir: /builddir/gnome-settings-daemon-40.0.1/build
Build type: native build
Project name: gnome-settings-daemon
Project version: 40.0.1
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64

meson.build:87:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
```

- [x] libsixel

This will be fixed in meson 0.60.2, I imported a patch for now - mesonbuild/meson#9530
```
=> xbps-src: updating repositories for host (x86_64)...
The Meson build system
Version: 0.60.1
Source dir: /builddir/libsixel-1.10.3
Build dir: /builddir/libsixel-1.10.3/build
Build type: native build
Project name: libsixel
Project version: 1.10.3
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64
Checking for function "unreachable" : YES 
Compiler for C supports arguments -Wformat=2: YES 
Compiler for C supports arguments -Wsign-conversion: YES 
Compiler for C supports arguments -Wuninitialized: YES 
Compiler for C supports arguments -Wstrict-overflow: YES 
Compiler for C supports arguments -Wshadow: YES 
Compiler for C supports arguments -Wdouble-promotion: YES 
Compiler for C supports arguments -Wswitch-default: YES 
Compiler for C supports arguments -Wunused-function: YES 
Compiler for C supports arguments -Wunused-but-set-variable: YES 
Compiler for C supports arguments -Bsymbolic: YES 
Library m found: YES
Checking for function "malloc" : YES 
Checking for function "realloc" : YES 
Checking for function "memset" : YES 
Checking for function "getopt_long" : YES 
Has header "assert.h" : YES 
Has header "math.h" : YES 
Has header "ctype.h" : YES 
Has header "memory.h" : YES 
Has header "string.h" : YES 
Has header "unistd.h" : YES 
Has header "stdint.h" : YES 
Has header "getopt.h" : YES 
Has header "sys/types.h" : YES 
Has header "sys/stat.h" : YES 
Has header "fcntl.h" : YES 
Has header "errno.h" : YES 
Has header "limits.h" : YES 
Has header "sys/time.h" : YES 
Has header "time.h" : YES 
Has header "signal.h" : YES 
Has header "sys/select.h" : YES 
Has header "sys/signal.h" : YES 
Has header "termios.h" : YES 
Has header "sys/ioctl.h" : YES 
Has header "inttypes.h" : YES 
Dependency gdk-pixbuf-2.0 skipped: feature gdk-pixbuf2 disabled
Library gd found: NO
Dependency libcurl skipped: feature libcurl disabled
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency libjpeg found: YES 2.1.1
Run-time dependency libpng found: YES 1.6.37
Program python2 found: NO (disabled by: python2 )
Configuring config.h using configuration
Configuring sixel.h using configuration
Program bash found: YES (/usr/bin/bash)
Configuring libsixel-config using configuration
meson.build:161: WARNING: Perl, PHP and Ruby modules are available but not installed by Meson. If you want them, please refer to their individual installation directories for instructions after building libsixel.

meson.build:163:0: ERROR: Format placeholder @9@ out of range.
```

## unrelated build failures

- [ ] gst-plugins-base1
```
FAILED: gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o 
cc -Igst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p -I. -I.. -Igst-libs -I../gst-libs -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/orc-0.4 -I/usr/include/gudev-1.0 -I/usr/include/libdrm -flto=auto -fdiagnostics-color=always -DNDEBUG -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -Wmissing-declarations -Wredundant-decls -Wundef -Wwrite-strings -Wformat -Wformat-nonliteral -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wvla -Wpointer-arith -Wmissing-prototypes -Wdeclaration-after-statement -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fPIC -pthread -DHAVE_CONFIG_H -DBUILDING_GST_GL -MD -MQ gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -MF gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o.d -o gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -c ../gst-libs/gst/gl/gstglwindow.c
In file included from ../gst-libs/gst/gl/gstglwindow.c:54:
../gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h:25:10: fatal error: xdg-shell-client-protocol.h: No such file or directory
   25 | #include "xdg-shell-client-protocol.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[235/783] Compiling C object gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/egl_gstegl.c.o
ninja: build stopped: subcommand failed.
```

the meson musl test failure is a bug known upstream - mesonbuild/meson#8283

[skip ci]

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

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

From 8d6cff863d098d8364b94b94e2343f385429b3d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Nov 2021 22:52:09 +0100
Subject: [PATCH 01/43] meson: update to 0.60.2.

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 6cbcd3c9e966..2ac20eb33795 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.59.4
+version=0.60.2
 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://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
+checksum=64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 7c464da91e5b2600a3dfcfea0e03f40aea9daff5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:24:04 +0100
Subject: [PATCH 02/43] PackageKit: update to 1.2.4.

---
 srcpkgs/PackageKit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 155dd156a06a..062dba3d3b00 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,7 +1,7 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
-version=1.2.2
-revision=2
+version=1.2.4
+revision=1
 wrksrc="PackageKit-PACKAGEKIT_${version//./_}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
-checksum=e87e95ce7423f49eff6dad054c86ba6f922e52d0a757f822e0343da0f44d3dbb
+checksum=4a7b0a41ffa56ad8af67156c46ecb9d4eb439b31a4cb581d959bd5480444954b
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 
 build_options="gir vala"

From de0c2dd1190dad7d6eb3cfec663cd83b11d13574 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:27:14 +0100
Subject: [PATCH 03/43] bijiben: remove obsolete zeitgeist support

bijiben 40.0 dropped zeitgeist support
---
 srcpkgs/bijiben/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8c3e51c3fc37..604076fdb93c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+ libhandy1-devel"
+depends="desktop-file-utils tracker3"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 525605c2cb9eab7ab4b049fea7b85bb2d84166a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:41:10 +0100
Subject: [PATCH 04/43] colord-gtk: fix building vala bindings

---
 srcpkgs/colord-gtk/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 65463f110590..634a9322dae3 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,10 +1,10 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvala=$(vopt_if vala true false)
+configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
  -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
@@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.freedesktop.org/software/colord"
+homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
 checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
 
@@ -30,5 +30,8 @@ colord-gtk-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }

From 434da2a4a56abdf379b333119b1636fdec6f9444 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:52:14 +0100
Subject: [PATCH 05/43] efl: drop removed configure args

---
 srcpkgs/efl/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 8786d5d94edf..c116523094ea 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -10,8 +10,6 @@ configure_args="
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
  -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
- -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
- -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
  $(vopt_bool elogind systemd)
  $(vopt_bool x11 x11)

From 89c4df613969c7214c72ac2ab11a807af8d316ed Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:59:16 +0100
Subject: [PATCH 06/43] enlightenment: drop a removed configure argument

---
 srcpkgs/enlightenment/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index db9c886dc920..360a0f5368e6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -3,7 +3,7 @@ pkgname=enlightenment
 version=0.24.2
 revision=1
 build_style=meson
-configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
+configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
  $(vopt_bool wayland wl)"
 hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)"
 makedepends="gettext-devel efl-devel pam-devel xkeyboard-config

From f70eb703a94af7bc8141b142bf2fa5377ca35b60 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 16:03:04 +0100
Subject: [PATCH 07/43] epiphany: drop a removed configure option

---
 srcpkgs/epiphany/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c58e2fa54ef6..0ffa06f547fe 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,7 +4,7 @@ version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
+configure_args="-Dunit_tests=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel

From 8412eacff8fddd3c5b2040739f3870572cdfe340 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:01:58 +0100
Subject: [PATCH 08/43] gnome-bluetooth: remove obsolete configure options

---
 srcpkgs/gnome-bluetooth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 83d89c0a8acb..e6861631b08d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -4,8 +4,7 @@ version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dicon-update=false -Dgtk_doc=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"

From 8526e0a36d446d926548fa368b5ea08e118901d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:06 +0100
Subject: [PATCH 09/43] gnome-initial-setup: remove obsolete configure options

---
 srcpkgs/gnome-initial-setup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 30a4a6ed4762..075e4b86324f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -3,8 +3,7 @@ pkgname=gnome-initial-setup
 version=40.4
 revision=1
 build_style=meson
-configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
- -Dsystemd=false"
+configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel

From 7204c739b5a33afc3ade3fec8ac57b861a7192f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:13 +0100
Subject: [PATCH 10/43] gedit: remove obsolete configure options

* gir is not optional anymore, so also removing the build option
---
 srcpkgs/gedit/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index b4e862c26ad0..e93ff8905272 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,12 +5,10 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true
- $(vopt_bool gir vapi) $(vopt_bool gir introspection)"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
- $(vopt_if gir vala)"
+configure_args="-Dplugins=true"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel python3-gobject-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 
-build_options="gir"
-build_options_default="gir"
-
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel
 	 libpeas-devel tepl-devel"
@@ -31,9 +26,7 @@ gedit-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gedit/gir-1.0
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gedit/gir-1.0
+		vmove usr/share/vala
 	}
 }

From ba597190eb0dea375b3eec3fb2693b572b9f1ef8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:17 +0100
Subject: [PATCH 11/43] gnome-builder: remove obsolete configure options

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a3ce20126d78..26cf768c391a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
 revision=3
 build_style=meson
 build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
+configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel

From 464da2aaa5ff73ad8452b937c0c56035acbf41f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:26 +0100
Subject: [PATCH 12/43] gamehub: update to 0.16.1-2.

---
 srcpkgs/gamehub/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index ccbf98b53483..e8f110b3eb8d 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -1,8 +1,8 @@
 # Template file for 'gamehub'
 pkgname=gamehub
-version=0.16.0
+version=0.16.1
 revision=1
-wrksrc="GameHub-${version}-1-master"
+wrksrc="GameHub-${version}-2-master"
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
@@ -12,8 +12,8 @@ short_desc="All your games in one place"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tkashkin.tk/projects/gamehub/"
-distfiles="https://github.com/tkashkin/GameHub/archive/${version}-1-master.tar.gz"
-checksum=4244c914d7427933727ec0611886720b9325c4d4a852e0e8c283f6331ebd30e2
+distfiles="https://github.com/tkashkin/GameHub/archive/refs/tags/${version}-2-master.tar.gz"
+checksum=bbbf2f5216ce6f0d6a57179f388a714aec52188f4e67a9deb6478061441a30b5
 
 post_install() {
 	vinstall data/com.github.tkashkin.gamehub.desktop.in 644 usr/share/applications com.github.tkashkin.gamehub.desktop

From 6783819e280b529c897142b8c67de65cd1b5bf58 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:34 +0100
Subject: [PATCH 13/43] NetworkManager: remove obsolete configure options

---
 srcpkgs/NetworkManager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e99d04798939..7001b27dc0e3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -4,7 +4,7 @@ version=1.32.12
 revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
+configure_args="-Dsystemd_journal=false
  -Dlibaudit=no -Dovs=false -Dselinux=false
  -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false

From 81fd99e7792b1786ab13fde821308f82446d8b9d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:21:42 +0100
Subject: [PATCH 14/43] graphene: remove obsolete configure options

---
 srcpkgs/graphene/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 79b2ac2e945e..6be39623eeae 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -4,7 +4,7 @@ version=1.10.6
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+configure_args="-Dinstalled_tests=false
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"

From 490bd9b8ed741c122c7d609577985092923c1c70 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:39 +0100
Subject: [PATCH 15/43] grilo: remove obsolete configure options

---
 srcpkgs/grilo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 64bae9bd4e2f..e47ec38542a5 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,7 +4,7 @@ version=0.3.13
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala)
+configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
  -Denable-gtk-doc=false"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
 makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel

From 61bde371790e9f9f20cc98bd80de3ceaf485f24e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:43 +0100
Subject: [PATCH 16/43] gnome-passwordsafe: fix build

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

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index fe91bcd9ed23..8f68cbf329f1 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -2,7 +2,7 @@
 pkgname=gnome-passwordsafe
 version=5.0
 revision=2
-wrksrc="PasswordSafe-${version}"
+wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection
  python3-pykeepass"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983
+checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449

From 1ea835684d3c97d07cb0674fffa18114cb6e0302 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:22 +0100
Subject: [PATCH 17/43] libgudev: remove obsolete configure options

---
 srcpkgs/libgudev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 47d1b8fc365d..e7603d00ce2f 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvala=$(vopt_if vala enabled disabled)"
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"

From 7d519936aa68c68ff3db05026c11a8f92f8ad059 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:34 +0100
Subject: [PATCH 18/43] libfprint: remove obsolete configure options

---
 srcpkgs/libfprint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index 33ac4c2a0571..16e6b2ffa1e0 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=libfprint-v$version
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
  libgusb-devel libglib-devel"

From 7526510d6ac41615dfe138c89b2cf8ff45f79f22 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:48 +0100
Subject: [PATCH 19/43] gst1-editing-services: remove obsolete configure
 options

---
 srcpkgs/gst1-editing-services/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 457dec0424cf..fde8efae9569 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled"
 hostmakedepends="flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
 short_desc="GStreamer 1.x Editing Services"

From a273959ab5db3e55cda0df1c1038318bd78fa524 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:01:59 +0100
Subject: [PATCH 20/43] gst-plugins-base1: remove obsolete configure options

---
 srcpkgs/gst-plugins-base1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 050521f071c3..c0dce5856f8d 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"

From 817589d992c5f090af0b700fe88ba3ee82f43b40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:01 +0100
Subject: [PATCH 21/43] gst-plugins-bad1: remove obsolete configure options

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

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..77a88a91fba1 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -5,9 +5,9 @@ revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
- -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
+ -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
  -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled

From d77a584ef775facc1c9fefef89bede7d0eef837b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:12 +0100
Subject: [PATCH 22/43] hexchat: remove obsolete configure options

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 97937999bb0d..7b3bc658d5aa 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -3,7 +3,7 @@ pkgname=hexchat
 version=2.16.0
 revision=3
 build_style=meson
-configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"

From 07875328e51801f1bcb74bf2e895a9dee7b240aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:20 +0100
Subject: [PATCH 23/43] igt-gpu-tools: fix build with meson 0.60

---
 .../patches/meson-fix-underscorify-call.patch | 36 +++++++++++++++++++
 srcpkgs/igt-gpu-tools/template                |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch

diff --git a/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
new file mode 100644
index 000000000000..142e2fa44fb6
--- /dev/null
+++ b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc8..297b0ad2 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+ 
+ lib_intermediates = []
+ foreach f: lib_sources
+-    name = f.underscorify(f)
++    name = f.underscorify()
+     lib = static_library('igt-' + name,
+ 	[ f, lib_version ],
+ 	include_directories: inc,
+-- 
+GitLab
+
diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3b222ecd18d8..3f8b4e2b6166 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -22,7 +22,7 @@ lib32disabled=yes
 archs="i686* x86_64*"
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled"
+	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
 fi
 
 post_install() {

From 1e8180fa5aa354c400a5b59e693fab32fdb5c754 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:54:21 +0100
Subject: [PATCH 24/43] libgweather: remove obsolete configure options

---
 srcpkgs/libgweather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 6d9b85a07d04..857006ea8786 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -4,8 +4,7 @@ version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
- -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"

From 7054f94b123b32d44872c7d2fb866132e4569bd8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:04:25 +0100
Subject: [PATCH 25/43] light-locker: fix build and license

---
 srcpkgs/light-locker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index e3bb799ba171..d50c71480a33 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,15 +1,15 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel elogind-devel"
+ libXxf86misc-devel libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/the-cavalry/light-locker"
 distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz"
 checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c

From 866002300daf07397794e531626a87c132e455a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:19:07 +0100
Subject: [PATCH 26/43] ncmpc: disable html manual

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

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 683ec13e85a3..a7d76aa3ce9e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,9 +1,9 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
 version=0.45
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlirc=disabled"
+configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
 short_desc="Ncurses-based mpd client"

From 22c7a9b67a9093f8ee7a171405e1d6eda6725397 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:22:30 +0100
Subject: [PATCH 27/43] pixman: remove obsolete configure options

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

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 456e9d1628e8..eba3b82c9fa7 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -5,8 +5,8 @@ revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
-configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
- -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
+configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled
+ -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
 makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"

From 507fa1018a7825e68a02ebcac39b22a6ddf1685d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:33:52 +0100
Subject: [PATCH 28/43] seatd: fix configure arguments

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

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index c619787ae3eb..178f1b3d8aa9 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,8 @@ pkgname=seatd
 version=0.6.3
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind)
+ -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From 0f280e121679224273504ef85d9a60ae4a6d91a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:34:04 +0100
Subject: [PATCH 29/43] spice-gtk: remove obsolete configure options

---
 srcpkgs/spice-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 7218e837891f..351923f41e7f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -7,8 +7,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
- -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
- -Dpulse=disabled -Dgtk_doc=disabled"
+ -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel

From cf805b1b1030ef4a8fd96091fc938d7fca73f160 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:37:05 +0100
Subject: [PATCH 30/43] switchboard: remove obsolete configure options

---
 srcpkgs/switchboard/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 45031a8d8b76..ebb706e5d9e5 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -3,7 +3,6 @@ pkgname=switchboard
 version=2.3.7
 revision=2
 build_style=meson
-configure_args="-Dlibunity=false"
 hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"

From e6605df26e0390049f4f48589b1d0130285b2aa5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:41:37 +0100
Subject: [PATCH 31/43] cglm: update to 0.8.4, switch to meson

---
 srcpkgs/cglm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index c7dfee606c45..05885c452520 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
 # Template file for 'cglm'
 pkgname=cglm
-version=0.8.3
+version=0.8.4
 revision=1
-build_style=cmake
+build_style=meson
 short_desc="Highly Optimized Graphics Math (glm) for C"
 maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=3a3f935f9f2ed5a8cb6337e421bf6f3a699a72d8cfe26fde1bbb8fde5c1c8aaf
+checksum=42f84c42c8a3e62954da77ab5c5d3264033d5802009e175db7921332a476126e
 
 post_install() {
 	vlicense LICENSE

From 1ac33bae00232d5d98e01b4aa7a8b49702b9b73f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:56:50 +0100
Subject: [PATCH 32/43] totem: remove gir build option

---
 srcpkgs/totem/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8871c546b50a..f80a2620b2f1 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -4,12 +4,9 @@ version=3.38.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-python=no -Denable-nautilus=yes
- -Denable-introspection=$(vopt_if gir yes no)
- -Denable-vala=$(vopt_if gir yes no)"
-hostmakedepends="intltool itstool pkg-config
- $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1
- glib-devel"
+configure_args="-Denable-python=no"
+hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1
+ gst-plugins-good1 glib-devel"
 # XXX missing lirc plugin.
 makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
@@ -31,16 +28,11 @@ do_check() {
 	:
 }
 
-build_options="gir"
-build_options_default="gir"
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -51,8 +43,6 @@ totem-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 	}
 }

From 05c035e1a8ddaa964481b5dfa5def34bba6496ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:57:22 +0100
Subject: [PATCH 33/43] tracker3: remove deprecated networkmanager option

---
 srcpkgs/tracker3/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..a6f8135b77d6 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,16 +1,15 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=3
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled
- -Dstemmer=disabled -Dsystemd_user_services=false"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="tar python3-gobject"
 short_desc="Personal search tool and storage system"
 maintainer="q66 <daniel@octaforge.org>"

From 452e2b1f1d7db8dab1682f8140406ccaa3eb72cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:00:29 +0100
Subject: [PATCH 34/43] tracker-miners: remove taglib configure option

---
 srcpkgs/tracker-miners/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..9c4762cf56ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
  -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
@@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ libvorbis-devel poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
 short_desc="Data miners for tracker"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -24,8 +24,4 @@ license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
 checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
+make_check=no # relies on unsupported ops in chroot

From 5bdaa035ad73644470b787b12560f43051b043b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:18:35 +0100
Subject: [PATCH 35/43] tracker3-miners: remove obsolete configure options

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..4c752fe55add 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -5,20 +5,20 @@ revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
  -Dsystemd_user_services=false -Dnetwork_manager=enabled"
 hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
  NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker3"

From 4103181339868179073ff73099ccc2437bb5d470 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 13:48:40 +0100
Subject: [PATCH 36/43] libwacom: remove obsolete configure options

---
 srcpkgs/libwacom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index c4922df7a205..b6003b1c6d3e 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -4,7 +4,7 @@ version=1.12
 revision=1
 build_style=meson
 build_helper="qemu"
-configure_args="-Ddocumentation=disabled -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+configure_args="-Ddocumentation=disabled"
 hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
 checkdepends="python3-pytest python3-libevdev python3-pyudev"

From 301dc653aeba05d7aab0205407c3cc138bc845b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 14:21:50 +0100
Subject: [PATCH 37/43] gnome-settings-daemon: fix build with meson 0.60

---
 .../meson-fix-string-bool-comparison.patch    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
new file mode 100644
index 000000000000..19cb682ca296
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
@@ -0,0 +1,29 @@
+From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 16 Jul 2021 16:02:36 +0200
+Subject: [PATCH] build: Fix str/bool comparison
+
+gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==.
+The result of this is undefined and will become a hard error in a future Meson release.
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fdf71713..ba2a90ca 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release')
+   common_flags += ['-DG_DISABLE_CAST_CHECKS']
+ endif
+ 
+-# Workaround for meson's bug
+-# https://github.com/mesonbuild/meson/pull/1896
+-if get_option('b_ndebug') == true
++if get_option('b_ndebug') == 'true'
+   common_flags += ['-DG_DISABLE_ASSERT']
+ endif
+ 
+-- 
+GitLab
+

From 04665b4dc58b42f8518452d727f9aa7e6ec343cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 18:57:28 +0100
Subject: [PATCH 38/43] vala-panel: fix build with meson 0.60

---
 .../LINGUAS-remove-a-duplicate-entry.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch

diff --git a/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch
new file mode 100644
index 000000000000..36548f5dab6e
--- /dev/null
+++ b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch
@@ -0,0 +1,19 @@
+From 52f40ce779cfa224266dd427cfe57afd83a28362 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 14 Nov 2021 17:15:55 +0100
+Subject: [PATCH] LINGUAS: remove a duplicate entry
+
+---
+ po/LINGUAS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index e66ec1c..3ee3bdd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
+-- 
+2.33.1
+

From 811ecc08ccc8d378858a04563824e62050e70d47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 18:59:05 +0100
Subject: [PATCH 39/43] vala-panel-appmenu: fix build with meson 0.60

---
 .../LINGUAS-remove-a-duplicate-entry.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch

diff --git a/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch
new file mode 100644
index 000000000000..3b31ed15b1f5
--- /dev/null
+++ b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch
@@ -0,0 +1,19 @@
+From 442bcebcc00ea3a51057de0d1290593be7f9deb3 Mon Sep 17 00:00:00 2001
+From: Konstantin <ria.freelander@gmail.com>
+Date: Wed, 27 Oct 2021 07:47:37 +0000
+Subject: [PATCH] Update LINGUAS
+
+---
+ po/LINGUAS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index e66ec1c..3ee3bdd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
+-- 
+GitLab
+

From 4c44befd098b74cfa6046acb89efd487d6e0da55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:30:31 +0100
Subject: [PATCH 40/43] gitg: remove obsolete configure options

---
 srcpkgs/gitg/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index 2f8f671038da..bf10d435baef 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -15,7 +15,3 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gitg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
-fi

From eb546dddb0fec8be5cd19415809a1d0a148c45aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:30:45 +0100
Subject: [PATCH 41/43] gedit: remove obsolete configure options

---
 srcpkgs/gedit/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index e93ff8905272..2f8b48a2199d 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,7 +5,6 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true"
 hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
  libpeas-devel tepl-devel python3-gobject-devel"

From 0632e4a27983dafed5cfdd306ceb4224ef385f0e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:31:59 +0100
Subject: [PATCH 42/43] gtk-vnc: fix build

---
 srcpkgs/gtk-vnc/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 46a535d1e0f3..0186c4f7c00a 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -5,9 +5,10 @@ revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dwith-vala=$(vopt_if gir enabled disabled)"
-hostmakedepends="gettext gettext-devel glib-devel intltool libgcrypt-devel
- pkg-config $(vopt_if gir vala)"
-makedepends="gnutls-devel gtk+3-devel libsasl-devel $(vopt_if gir vala)"
+hostmakedepends="gettext gettext-devel glib-devel intltool pkg-config
+ $(vopt_if gir vala)"
+makedepends="gnutls-devel gtk+3-devel libsasl-devel libgcrypt-devel
+ $(vopt_if gir vala)"
 short_desc="VNC viewer widget for GTK"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 7bf2bab805032e1a44cfab2bb2c13ccf0c923751 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 18:16:46 +0100
Subject: [PATCH 43/43] pulseeffects-legacy: fix build

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

diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index ec5a16528474..585f25a55c8f 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -4,8 +4,8 @@ version=4.8.5
 revision=3
 wrksrc="easyeffects-${version}"
 build_style=meson
-hostmakedepends="itstool pkg-config gettext"
-makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
+hostmakedepends="itstool pkg-config gettext glib-devel"
+makedepends="boost-devel gsettings-desktop-schemas-devel
  gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
  pulseaudio-devel sratom-devel zita-convolver-devel libbs2b-devel
  libsamplerate-devel libsndfile-devel rnnoise-devel"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
                   ` (5 preceding siblings ...)
  2021-11-26  0:30 ` paper42
@ 2021-12-02  1:01 ` eli-schwartz
  2021-12-16 23:17 ` [PR PATCH] [Updated] " paper42
  2021-12-16 23:25 ` [PR PATCH] [Merged]: " paper42
  8 siblings, 0 replies; 10+ messages in thread
From: eli-schwartz @ 2021-12-02  1:01 UTC (permalink / raw)
  To: ml

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

New comment by eli-schwartz on void-packages repository

https://github.com/void-linux/void-packages/pull/34059#issuecomment-984196585

Comment:
>  gst-plugins-base1

Can be fixed by upgrading from patch release .4 to patch release .5

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
                   ` (6 preceding siblings ...)
  2021-12-02  1:01 ` eli-schwartz
@ 2021-12-16 23:17 ` paper42
  2021-12-16 23:25 ` [PR PATCH] [Merged]: " paper42
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2021-12-16 23:17 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages meson-0.60
https://github.com/void-linux/void-packages/pull/34059

meson 0.60
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I ran the configure phase on all packages with meson build_style, currently broken builds:

## regressions from 0.59.4

- [x] igt-gpu-tools

```Checking whether type "struct sysinfo" has member "totalram" : YES 
Running compile:
Working directory:  /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n
Command line:  cc /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c -o /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/output.exe -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_FILE_OFFSET_BITS=64 -O0 -std=gnu11 -D_GNU_SOURCE -Wl,-z,relro -Wl,-z,now -Wl,--as-needed 

Code:
 #include <sys/mman.h>
#include <limits.h>

        #if defined __stub_memfd_create || defined __stub___memfd_create
        fail fail fail this function is not going to work
        #endif
        
int main(void) {
            void *a = (void*) &memfd_create;
            long long b = (long long) a;
            return (int) b;
        }
Compiler stdout:
 
Compiler stderr:
 In file included from /usr/include/sys/mman.h:22,
                 from /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c:1:
/usr/include/features.h:397:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
      |    ^~~~~~~

Checking for function "memfd_create" : YES 
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

lib/meson.build:131:4: ERROR: Function does not take positional arguments.
```

- [ ] NetworkManager
```
=> NetworkManager-1.32.12_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libgio-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgobject-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libglib-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgmodule-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libdl.so.2 <-> glibc>=2.32_1
   SONAME: libndp.so.0 <-> libndp>=1.3_1
   SONAME: libudev.so.1 <-> eudev-libudev>=1.6_1
   SONAME: libelogind.so.0 <-> libelogind>=238.1_2
   SONAME: libcurl.so.4 <-> libcurl>=7.75.0_2
   SONAME: libpsl.so.5 <-> libpsl>=0.20.2_1
   SONAME: libsmime3.so <-> nss>=3.12.4_1
   SONAME: libnss3.so <-> nss>=3.12.4_1
   SONAME: libnspr4.so <-> nspr>=4.8_1
   SONAME: libpthread.so.0 <-> glibc>=2.32_1
   SONAME: libc.so.6 <-> glibc>=2.32_1
   SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
   SONAME: libnm.so.0 <-> libnm-1.32.12_1
   SONAME: libnewt.so.0.52 <-> newt>=0.52.18_1
   SONAME: libreadline.so.8 <-> libreadline8>=8.0_1
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
   SONAME: src/core/devices/wwan/libnm-wwan.so <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libmm-glib.so.0 <-> libmm-glib>=1.0.0_1
=> ERROR: NetworkManager-1.32.12_1: cannot guess required shlibs, aborting!
```

- [x] vala-panel{,-appmenu}
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/vala-panel-0.5.0
Build dir: /builddir/vala-panel-0.5.0/build
Build type: native build
Project name: vala-panel
Project version: 0.5.0
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Vala compiler for the host machine: valac (valac 0.52.4)
Host machine cpu family: x86_64
Host machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.70.0
Run-time dependency gio-2.0 found: YES 2.70.0
Run-time dependency gio-unix-2.0 found: YES 2.70.0
Run-time dependency gmodule-2.0 found: YES 2.70.0
Run-time dependency gtk+-3.0 found: YES 3.24.30
Run-time dependency gdk-x11-3.0 found: YES 3.24.30
Run-time dependency gdk-wayland-3.0 found: YES 3.24.30
Run-time dependency gtk-layer-shell-0 found: YES 0.6.0
Library m found: YES
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

po/meson.build:1:5: ERROR: Tried to create target "vala-panel-nb.mo", but a target of that name already exists.
```

- [x] gnome-settings-daemon

imported an upstream patch
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/gnome-settings-daemon-40.0.1
Build dir: /builddir/gnome-settings-daemon-40.0.1/build
Build type: native build
Project name: gnome-settings-daemon
Project version: 40.0.1
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64

meson.build:87:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
```

- [x] libsixel

This will be fixed in meson 0.60.2, I imported a patch for now - mesonbuild/meson#9530
```
=> xbps-src: updating repositories for host (x86_64)...
The Meson build system
Version: 0.60.1
Source dir: /builddir/libsixel-1.10.3
Build dir: /builddir/libsixel-1.10.3/build
Build type: native build
Project name: libsixel
Project version: 1.10.3
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64
Checking for function "unreachable" : YES 
Compiler for C supports arguments -Wformat=2: YES 
Compiler for C supports arguments -Wsign-conversion: YES 
Compiler for C supports arguments -Wuninitialized: YES 
Compiler for C supports arguments -Wstrict-overflow: YES 
Compiler for C supports arguments -Wshadow: YES 
Compiler for C supports arguments -Wdouble-promotion: YES 
Compiler for C supports arguments -Wswitch-default: YES 
Compiler for C supports arguments -Wunused-function: YES 
Compiler for C supports arguments -Wunused-but-set-variable: YES 
Compiler for C supports arguments -Bsymbolic: YES 
Library m found: YES
Checking for function "malloc" : YES 
Checking for function "realloc" : YES 
Checking for function "memset" : YES 
Checking for function "getopt_long" : YES 
Has header "assert.h" : YES 
Has header "math.h" : YES 
Has header "ctype.h" : YES 
Has header "memory.h" : YES 
Has header "string.h" : YES 
Has header "unistd.h" : YES 
Has header "stdint.h" : YES 
Has header "getopt.h" : YES 
Has header "sys/types.h" : YES 
Has header "sys/stat.h" : YES 
Has header "fcntl.h" : YES 
Has header "errno.h" : YES 
Has header "limits.h" : YES 
Has header "sys/time.h" : YES 
Has header "time.h" : YES 
Has header "signal.h" : YES 
Has header "sys/select.h" : YES 
Has header "sys/signal.h" : YES 
Has header "termios.h" : YES 
Has header "sys/ioctl.h" : YES 
Has header "inttypes.h" : YES 
Dependency gdk-pixbuf-2.0 skipped: feature gdk-pixbuf2 disabled
Library gd found: NO
Dependency libcurl skipped: feature libcurl disabled
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency libjpeg found: YES 2.1.1
Run-time dependency libpng found: YES 1.6.37
Program python2 found: NO (disabled by: python2 )
Configuring config.h using configuration
Configuring sixel.h using configuration
Program bash found: YES (/usr/bin/bash)
Configuring libsixel-config using configuration
meson.build:161: WARNING: Perl, PHP and Ruby modules are available but not installed by Meson. If you want them, please refer to their individual installation directories for instructions after building libsixel.

meson.build:163:0: ERROR: Format placeholder @9@ out of range.
```

## unrelated build failures

- [ ] gst-plugins-base1
```
FAILED: gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o 
cc -Igst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p -I. -I.. -Igst-libs -I../gst-libs -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/orc-0.4 -I/usr/include/gudev-1.0 -I/usr/include/libdrm -flto=auto -fdiagnostics-color=always -DNDEBUG -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -Wmissing-declarations -Wredundant-decls -Wundef -Wwrite-strings -Wformat -Wformat-nonliteral -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wvla -Wpointer-arith -Wmissing-prototypes -Wdeclaration-after-statement -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fPIC -pthread -DHAVE_CONFIG_H -DBUILDING_GST_GL -MD -MQ gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -MF gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o.d -o gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -c ../gst-libs/gst/gl/gstglwindow.c
In file included from ../gst-libs/gst/gl/gstglwindow.c:54:
../gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h:25:10: fatal error: xdg-shell-client-protocol.h: No such file or directory
   25 | #include "xdg-shell-client-protocol.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[235/783] Compiling C object gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/egl_gstegl.c.o
ninja: build stopped: subcommand failed.
```

the meson musl test failure is a bug known upstream - mesonbuild/meson#8283

[skip ci]

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

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

From ac3dedcf3fa4f2b1905a01ca8ebfa084bbfe2120 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Nov 2021 22:52:09 +0100
Subject: [PATCH 01/41] meson: update to 0.60.2.

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 6cbcd3c9e966..2ac20eb33795 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.59.4
+version=0.60.2
 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://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
+checksum=64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 9911307b34304a8a044d1f143ed5314ec0762923 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:27:14 +0100
Subject: [PATCH 02/41] bijiben: remove obsolete zeitgeist support

bijiben 40.0 dropped zeitgeist support
---
 srcpkgs/bijiben/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8c3e51c3fc37..604076fdb93c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy1-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+ libhandy1-devel"
+depends="desktop-file-utils tracker3"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 385342017e604104e354b6dee39e61aeb01e8e64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:41:10 +0100
Subject: [PATCH 03/41] colord-gtk: fix building vala bindings

---
 srcpkgs/colord-gtk/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 65463f110590..634a9322dae3 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,10 +1,10 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvala=$(vopt_if vala true false)
+configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
  -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
 hostmakedepends="pkg-config intltool glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
@@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://www.freedesktop.org/software/colord"
+homepage="https://github.com/hughsie/colord-gtk"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
 checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
 
@@ -30,5 +30,8 @@ colord-gtk-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 	}
 }

From 81b181a5d45d34572a471ba6003a465cf464ffb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:52:14 +0100
Subject: [PATCH 04/41] efl: drop removed configure args

---
 srcpkgs/efl/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 8786d5d94edf..c116523094ea 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -10,8 +10,6 @@ configure_args="
  -Dnetwork-backend=none
  -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim
  -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json)
- -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine
- -Demotion-generic-loaders-disabler=vlc
  -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none)
  $(vopt_bool elogind systemd)
  $(vopt_bool x11 x11)

From 08e4bab1f5226b717f06d15e84fb565152ee956b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 15:59:16 +0100
Subject: [PATCH 05/41] enlightenment: drop a removed configure argument

---
 srcpkgs/enlightenment/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index db9c886dc920..360a0f5368e6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -3,7 +3,7 @@ pkgname=enlightenment
 version=0.24.2
 revision=1
 build_style=meson
-configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
+configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false
  $(vopt_bool wayland wl)"
 hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)"
 makedepends="gettext-devel efl-devel pam-devel xkeyboard-config

From 3f5d889ba0136181dffe7113b4e2850186de9400 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 16:03:04 +0100
Subject: [PATCH 06/41] epiphany: drop a removed configure option

---
 srcpkgs/epiphany/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index c58e2fa54ef6..0ffa06f547fe 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -4,7 +4,7 @@ version=40.2
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled"
+configure_args="-Dunit_tests=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel

From f16bcf3eaf8d8acfa9c683f8be48919fce561100 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:01:58 +0100
Subject: [PATCH 07/41] gnome-bluetooth: remove obsolete configure options

---
 srcpkgs/gnome-bluetooth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 83d89c0a8acb..e6861631b08d 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -4,8 +4,7 @@ version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dicon-update=false -Dgtk_doc=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel"
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"

From b17f99a1f48dd48b81d283c3717468d8587e4ef2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:06 +0100
Subject: [PATCH 08/41] gnome-initial-setup: remove obsolete configure options

---
 srcpkgs/gnome-initial-setup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 30a4a6ed4762..075e4b86324f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -3,8 +3,7 @@ pkgname=gnome-initial-setup
 version=40.4
 revision=1
 build_style=meson
-configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
- -Dsystemd=false"
+configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel

From cda71a5186e24c20068c991c1d4065ce5fed3785 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:13 +0100
Subject: [PATCH 09/41] gedit: remove obsolete configure options

* gir is not optional anymore, so also removing the build option
---
 srcpkgs/gedit/template | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index b4e862c26ad0..e93ff8905272 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,12 +5,10 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true
- $(vopt_bool gir vapi) $(vopt_bool gir introspection)"
-hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
- $(vopt_if gir vala)"
+configure_args="-Dplugins=true"
+hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel python3-gobject-devel"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 
-build_options="gir"
-build_options_default="gir"
-
 gedit-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel
 	 libpeas-devel tepl-devel"
@@ -31,9 +26,7 @@ gedit-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gedit/gir-1.0
-			vmove usr/share/vala
-		fi
+		vmove usr/share/gedit/gir-1.0
+		vmove usr/share/vala
 	}
 }

From 512a42536db494fb3c7a4a5c9e5ccb464eb95cd0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:17 +0100
Subject: [PATCH 10/41] gnome-builder: remove obsolete configure options

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a3ce20126d78..26cf768c391a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
 revision=3
 build_style=meson
 build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
+configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel

From 93265c6edd26e9136e0dcb4c7c20473d26fa117c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:02:34 +0100
Subject: [PATCH 11/41] NetworkManager: remove obsolete configure options

---
 srcpkgs/NetworkManager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index e99d04798939..7001b27dc0e3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -4,7 +4,7 @@ version=1.32.12
 revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
+configure_args="-Dsystemd_journal=false
  -Dlibaudit=no -Dovs=false -Dselinux=false
  -Dmodify_system=true -Dsystemdsystemunitdir=no
  -Dpppd=/usr/bin/pppd -Dqt=false

From 1eebe94a63f45158b42bcb887756eaaa71b4d417 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:21:42 +0100
Subject: [PATCH 12/41] graphene: remove obsolete configure options

---
 srcpkgs/graphene/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 79b2ac2e945e..6be39623eeae 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -4,7 +4,7 @@ version=1.10.6
 revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+configure_args="-Dinstalled_tests=false
  -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"

From b72f7f1c8ddfa9409b614922dde47978e1ff9fcb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:39 +0100
Subject: [PATCH 13/41] grilo: remove obsolete configure options

---
 srcpkgs/grilo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 64bae9bd4e2f..e47ec38542a5 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -4,7 +4,7 @@ version=0.3.13
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala)
+configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
  -Denable-gtk-doc=false"
 hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
 makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel

From fc032748d5b5b947ce8da7f36a8f65a0799969af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 17:31:43 +0100
Subject: [PATCH 14/41] gnome-passwordsafe: fix build

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

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index fe91bcd9ed23..8f68cbf329f1 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -2,7 +2,7 @@
 pkgname=gnome-passwordsafe
 version=5.0
 revision=2
-wrksrc="PasswordSafe-${version}"
+wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection
  python3-pykeepass"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/PasswordSafe"
 distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2"
-checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983
+checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449

From 4d3074e07960681836499a4ecc47316e098b40df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:22 +0100
Subject: [PATCH 15/41] libgudev: remove obsolete configure options

---
 srcpkgs/libgudev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 47d1b8fc365d..e7603d00ce2f 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
- -Dvala=$(vopt_if vala enabled disabled)"
+ -Dvapi=$(vopt_if vala enabled disabled)"
 hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"

From 8fd6614b321da956f24189dd398e9b01644e379c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:34 +0100
Subject: [PATCH 16/41] libfprint: remove obsolete configure options

---
 srcpkgs/libfprint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index 33ac4c2a0571..16e6b2ffa1e0 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc=libfprint-v$version
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
+configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
  libgusb-devel libglib-devel"

From 199a390160a4638915d9cbea5e047e9eb0bfde73 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 19:59:48 +0100
Subject: [PATCH 17/41] gst1-editing-services: remove obsolete configure
 options

---
 srcpkgs/gst1-editing-services/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index f06a4d294879..1613a7ababfd 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dgtk_doc=disabled"
+configure_args="-Ddoc=disabled"
 hostmakedepends="flex perl pkg-config gobject-introspection"
 makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel"
 short_desc="GStreamer 1.x Editing Services"

From 6b845ba27d960e687490fc6a41c6015dc6b9731f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:01:59 +0100
Subject: [PATCH 18/41] gst-plugins-base1: remove obsolete configure options

---
 srcpkgs/gst-plugins-base1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 3e22f2d1bf48..fc954cc96cf5 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled
+configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"

From ce1aa942005aa7ff75ac195e93f1e77ccdcb7bb8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:01 +0100
Subject: [PATCH 19/41] gst-plugins-bad1: remove obsolete configure options

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

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 1157ba3e7ded..451f73cb9f55 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -5,9 +5,9 @@ revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
-configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
+configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
- -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled
+ -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
  -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled

From 2edd8b877030e685a687dbce576619a9e414baf9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:12 +0100
Subject: [PATCH 20/41] hexchat: remove obsolete configure options

---
 srcpkgs/hexchat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 97937999bb0d..7b3bc658d5aa 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -3,7 +3,7 @@ pkgname=hexchat
 version=2.16.0
 revision=3
 build_style=meson
-configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"

From 1573fbf1193fdc82976d0b1ba3d4f5c6a1e50aa9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:02:20 +0100
Subject: [PATCH 21/41] igt-gpu-tools: fix build with meson 0.60

---
 .../patches/meson-fix-underscorify-call.patch | 36 +++++++++++++++++++
 srcpkgs/igt-gpu-tools/template                |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch

diff --git a/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
new file mode 100644
index 000000000000..142e2fa44fb6
--- /dev/null
+++ b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc8..297b0ad2 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+ 
+ lib_intermediates = []
+ foreach f: lib_sources
+-    name = f.underscorify(f)
++    name = f.underscorify()
+     lib = static_library('igt-' + name,
+ 	[ f, lib_version ],
+ 	include_directories: inc,
+-- 
+GitLab
+
diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3b222ecd18d8..3f8b4e2b6166 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -22,7 +22,7 @@ lib32disabled=yes
 archs="i686* x86_64*"
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
-	configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled"
+	configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled"
 fi
 
 post_install() {

From 2a6afca79a68e734840f87a1696f9669f0eca8a3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 20:54:21 +0100
Subject: [PATCH 22/41] libgweather: remove obsolete configure options

---
 srcpkgs/libgweather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index 6d9b85a07d04..857006ea8786 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -4,8 +4,7 @@ version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
- -Dzoneinfo_dir=/usr/share/zoneinfo"
+configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
 depends="tzdata"

From 251d541ce35594c43fb021f593de7b03ccb038cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:04:25 +0100
Subject: [PATCH 23/41] light-locker: fix build and license

---
 srcpkgs/light-locker/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template
index e3bb799ba171..d50c71480a33 100644
--- a/srcpkgs/light-locker/template
+++ b/srcpkgs/light-locker/template
@@ -1,15 +1,15 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.9.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel
- libXxf86misc-devel elogind-devel"
+ libXxf86misc-devel libXxf86vm-devel elogind-devel"
 depends="lightdm"
 short_desc="Simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://github.com/the-cavalry/light-locker"
 distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz"
 checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c

From fbf677ebe6be2526d4d7e9326a9482c05105fb93 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:19:07 +0100
Subject: [PATCH 24/41] ncmpc: disable html manual

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

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 683ec13e85a3..a7d76aa3ce9e 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,9 +1,9 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
 version=0.45
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dlirc=disabled"
+configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
 makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
 short_desc="Ncurses-based mpd client"

From 98ac505398c06e0cdb10917cb40d54ff36292241 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:22:30 +0100
Subject: [PATCH 25/41] pixman: remove obsolete configure options

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

diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 456e9d1628e8..eba3b82c9fa7 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -5,8 +5,8 @@ revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
-configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled
- -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled"
+configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled
+ -Dopenmp=disabled -Dgtk=disabled"
 hostmakedepends="pkg-config perl"
 makedepends="libpng-devel"
 short_desc="Library of low-level pixel manipulation routines"

From 9104394f1340082acdcebe45e1810a6ed07ffc82 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:33:52 +0100
Subject: [PATCH 26/41] seatd: fix configure arguments

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

diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template
index c619787ae3eb..178f1b3d8aa9 100644
--- a/srcpkgs/seatd/template
+++ b/srcpkgs/seatd/template
@@ -3,7 +3,8 @@ pkgname=seatd
 version=0.6.3
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false"
+configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind)
+ -Dwerror=false"
 hostmakedepends="pkg-config scdoc"
 makedepends="$(vopt_if elogind elogind-devel)"
 short_desc="Minimal seat management daemon"

From 72a251967d8b9cfc7bca1d9aa22eea85ccfd522b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:34:04 +0100
Subject: [PATCH 27/41] spice-gtk: remove obsolete configure options

---
 srcpkgs/spice-gtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 7218e837891f..351923f41e7f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -7,8 +7,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
- -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids
- -Dpulse=disabled -Dgtk_doc=disabled"
+ -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel

From a03d4e00146c6abe7bda8613d6e4f7e2dc36a361 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:37:05 +0100
Subject: [PATCH 28/41] switchboard: remove obsolete configure options

---
 srcpkgs/switchboard/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index 45031a8d8b76..ebb706e5d9e5 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -3,7 +3,6 @@ pkgname=switchboard
 version=2.3.7
 revision=2
 build_style=meson
-configure_args="-Dlibunity=false"
 hostmakedepends="pkg-config vala gettext"
 makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
 short_desc="Extensible System Settings app designed for elementary OS"

From aa5ffdd6c4b22b80acc67e77061153f6d67ded19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:41:37 +0100
Subject: [PATCH 29/41] cglm: update to 0.8.4, switch to meson

---
 srcpkgs/cglm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index 5b553c7c0d12..05885c452520 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -2,7 +2,7 @@
 pkgname=cglm
 version=0.8.4
 revision=1
-build_style=cmake
+build_style=meson
 short_desc="Highly Optimized Graphics Math (glm) for C"
 maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"

From 6100b8add0c5abaf473e0e037ce2566eda181bca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:56:50 +0100
Subject: [PATCH 30/41] totem: remove gir build option

---
 srcpkgs/totem/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 8871c546b50a..f80a2620b2f1 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -4,12 +4,9 @@ version=3.38.0
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Denable-python=no -Denable-nautilus=yes
- -Denable-introspection=$(vopt_if gir yes no)
- -Denable-vala=$(vopt_if gir yes no)"
-hostmakedepends="intltool itstool pkg-config
- $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1
- glib-devel"
+configure_args="-Denable-python=no"
+hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1
+ gst-plugins-good1 glib-devel"
 # XXX missing lirc plugin.
 makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1
@@ -31,16 +28,11 @@ do_check() {
 	:
 }
 
-build_options="gir"
-build_options_default="gir"
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -51,8 +43,6 @@ totem-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 	}
 }

From 78eeaf649151ced7a024587572de36271dca1ed9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 21:57:22 +0100
Subject: [PATCH 31/41] tracker3: remove deprecated networkmanager option

---
 srcpkgs/tracker3/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..a6f8135b77d6 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,16 +1,15 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=3
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
-configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled
- -Dstemmer=disabled -Dsystemd_user_services=false"
+configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
+ -Dsystemd_user_services=false"
 hostmakedepends="gettext pkg-config glib-devel vala asciidoc"
 makedepends="dbus-devel libglib-devel icu-devel json-glib-devel
- libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel
- bash-completion"
+ libsoup-devel libxml2-devel sqlite-devel bash-completion"
 checkdepends="tar python3-gobject"
 short_desc="Personal search tool and storage system"
 maintainer="q66 <daniel@octaforge.org>"

From b27b1ae2d830dbe0a3124e9659bfb2639e17d9ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:00:29 +0100
Subject: [PATCH 32/41] tracker-miners: remove taglib configure option

---
 srcpkgs/tracker-miners/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..9c4762cf56ca 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
  -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
@@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ libvorbis-devel poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz"
 short_desc="Data miners for tracker"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -24,8 +24,4 @@ license="GPL-2.0-or-later"
 homepage="https://developer.gnome.org/libtracker-miner/stable"
 distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
 checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa
-
-# relies on unsupported ops in chroot
-do_check() {
-	:
-}
+make_check=no # relies on unsupported ops in chroot

From bcfd67c725684886fe7ce8390cbb1df148fb61e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 13 Nov 2021 22:18:35 +0100
Subject: [PATCH 33/41] tracker3-miners: remove obsolete configure options

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

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..4c752fe55add 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -5,20 +5,20 @@ revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
-configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
- -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
+configure_args="-Dtracker_core=system -Dextract=true
+ -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled
  -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled
- -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled
- -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
+ -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled
+ -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled
  -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu
  -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer
  -Dsystemd_user_services=false -Dnetwork_manager=enabled"
 hostmakedepends="pkg-config glib-devel intltool asciidoc"
-makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel
+makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel
  libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel
  libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel
  libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel
- libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel
+ poppler-glib-devel totem-pl-parser-devel
  upower-devel zlib-devel gst-plugins-base1-devel giflib-devel
  NetworkManager-devel libharfbuzz"
 short_desc="Data miners for tracker3"

From 6f959725fbbfd5ae4e13575dc4ff7087925be327 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 13:48:40 +0100
Subject: [PATCH 34/41] libwacom: remove obsolete configure options

---
 srcpkgs/libwacom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index c4922df7a205..b6003b1c6d3e 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -4,7 +4,7 @@ version=1.12
 revision=1
 build_style=meson
 build_helper="qemu"
-configure_args="-Ddocumentation=disabled -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+configure_args="-Ddocumentation=disabled"
 hostmakedepends="pkg-config"
 makedepends="libgudev-devel libxml2-devel"
 checkdepends="python3-pytest python3-libevdev python3-pyudev"

From 67154d669916e9f41196f5428473c52923096c28 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 14:21:50 +0100
Subject: [PATCH 35/41] gnome-settings-daemon: fix build with meson 0.60

---
 .../meson-fix-string-bool-comparison.patch    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
new file mode 100644
index 000000000000..19cb682ca296
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch
@@ -0,0 +1,29 @@
+From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 16 Jul 2021 16:02:36 +0200
+Subject: [PATCH] build: Fix str/bool comparison
+
+gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==.
+The result of this is undefined and will become a hard error in a future Meson release.
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index fdf71713..ba2a90ca 100644
+--- a/meson.build
++++ b/meson.build
+@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release')
+   common_flags += ['-DG_DISABLE_CAST_CHECKS']
+ endif
+ 
+-# Workaround for meson's bug
+-# https://github.com/mesonbuild/meson/pull/1896
+-if get_option('b_ndebug') == true
++if get_option('b_ndebug') == 'true'
+   common_flags += ['-DG_DISABLE_ASSERT']
+ endif
+ 
+-- 
+GitLab
+

From 1cf190f119d939f0ca80a23824ff3521baaf1af9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 18:57:28 +0100
Subject: [PATCH 36/41] vala-panel: fix build with meson 0.60

---
 .../LINGUAS-remove-a-duplicate-entry.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch

diff --git a/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch
new file mode 100644
index 000000000000..36548f5dab6e
--- /dev/null
+++ b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch
@@ -0,0 +1,19 @@
+From 52f40ce779cfa224266dd427cfe57afd83a28362 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 14 Nov 2021 17:15:55 +0100
+Subject: [PATCH] LINGUAS: remove a duplicate entry
+
+---
+ po/LINGUAS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index e66ec1c..3ee3bdd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
+-- 
+2.33.1
+

From 03fd08a8eed71c72972fb409f012f8ef42b66833 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 14 Nov 2021 18:59:05 +0100
Subject: [PATCH 37/41] vala-panel-appmenu: fix build with meson 0.60

---
 .../LINGUAS-remove-a-duplicate-entry.patch    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch

diff --git a/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch
new file mode 100644
index 000000000000..3b31ed15b1f5
--- /dev/null
+++ b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch
@@ -0,0 +1,19 @@
+From 442bcebcc00ea3a51057de0d1290593be7f9deb3 Mon Sep 17 00:00:00 2001
+From: Konstantin <ria.freelander@gmail.com>
+Date: Wed, 27 Oct 2021 07:47:37 +0000
+Subject: [PATCH] Update LINGUAS
+
+---
+ po/LINGUAS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/LINGUAS b/po/LINGUAS
+index e66ec1c..3ee3bdd 100644
+--- a/po/LINGUAS
++++ b/po/LINGUAS
+@@ -1 +1 @@
+-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu
+-- 
+GitLab
+

From 1b5d8c95d086856779b71b34b760b496fce6bbfb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:30:31 +0100
Subject: [PATCH 38/41] gitg: remove obsolete configure options

---
 srcpkgs/gitg/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index 2f8f671038da..bf10d435baef 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -15,7 +15,3 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gitg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
-fi

From 85ee6099a1e032f7c0384c2c1ddbfb63b279a2a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:30:45 +0100
Subject: [PATCH 39/41] gedit: remove obsolete configure options

---
 srcpkgs/gedit/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index e93ff8905272..2f8b48a2199d 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -5,7 +5,6 @@ revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
-configure_args="-Dplugins=true"
 hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
  libpeas-devel tepl-devel python3-gobject-devel"

From 9a8b1614edcca0f429c4395816c98c2ea3adf81d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 13:31:59 +0100
Subject: [PATCH 40/41] gtk-vnc: fix build

---
 srcpkgs/gtk-vnc/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 46a535d1e0f3..0186c4f7c00a 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -5,9 +5,10 @@ revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dwith-vala=$(vopt_if gir enabled disabled)"
-hostmakedepends="gettext gettext-devel glib-devel intltool libgcrypt-devel
- pkg-config $(vopt_if gir vala)"
-makedepends="gnutls-devel gtk+3-devel libsasl-devel $(vopt_if gir vala)"
+hostmakedepends="gettext gettext-devel glib-devel intltool pkg-config
+ $(vopt_if gir vala)"
+makedepends="gnutls-devel gtk+3-devel libsasl-devel libgcrypt-devel
+ $(vopt_if gir vala)"
 short_desc="VNC viewer widget for GTK"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 540b12679e21e268fd53368ee63ce33a58f2387a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 17 Nov 2021 18:16:46 +0100
Subject: [PATCH 41/41] pulseeffects-legacy: fix build

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

diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index ec5a16528474..585f25a55c8f 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -4,8 +4,8 @@ version=4.8.5
 revision=3
 wrksrc="easyeffects-${version}"
 build_style=meson
-hostmakedepends="itstool pkg-config gettext"
-makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
+hostmakedepends="itstool pkg-config gettext glib-devel"
+makedepends="boost-devel gsettings-desktop-schemas-devel
  gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
  pulseaudio-devel sratom-devel zita-convolver-devel libbs2b-devel
  libsamplerate-devel libsndfile-devel rnnoise-devel"

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Merged]: meson 0.60
  2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
                   ` (7 preceding siblings ...)
  2021-12-16 23:17 ` [PR PATCH] [Updated] " paper42
@ 2021-12-16 23:25 ` paper42
  8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2021-12-16 23:25 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

meson 0.60
https://github.com/void-linux/void-packages/pull/34059

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I ran the configure phase on all packages with meson build_style, currently broken builds:

## regressions from 0.59.4

- [x] igt-gpu-tools

```Checking whether type "struct sysinfo" has member "totalram" : YES 
Running compile:
Working directory:  /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n
Command line:  cc /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c -o /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/output.exe -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_FILE_OFFSET_BITS=64 -O0 -std=gnu11 -D_GNU_SOURCE -Wl,-z,relro -Wl,-z,now -Wl,--as-needed 

Code:
 #include <sys/mman.h>
#include <limits.h>

        #if defined __stub_memfd_create || defined __stub___memfd_create
        fail fail fail this function is not going to work
        #endif

int main(void) {
            void *a = (void*) &memfd_create;
            long long b = (long long) a;
            return (int) b;
        }
Compiler stdout:

Compiler stderr:
 In file included from /usr/include/sys/mman.h:22,
                 from /builddir/igt-gpu-tools-1.25/build/meson-private/tmpv83fdo1n/testfile.c:1:
/usr/include/features.h:397:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
  397 | #  warning _FORTIFY_SOURCE requires compiling with optimization (-O)
      |    ^~~~~~~

Checking for function "memfd_create" : YES 
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

lib/meson.build:131:4: ERROR: Function does not take positional arguments.
```

- [x] NetworkManager
```
=> NetworkManager-1.32.12_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libgio-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgobject-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libglib-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libgmodule-2.0.so.0 <-> glib>=2.70.0_1
   SONAME: libdl.so.2 <-> glibc>=2.32_1
   SONAME: libndp.so.0 <-> libndp>=1.3_1
   SONAME: libudev.so.1 <-> eudev-libudev>=1.6_1
   SONAME: libelogind.so.0 <-> libelogind>=238.1_2
   SONAME: libcurl.so.4 <-> libcurl>=7.75.0_2
   SONAME: libpsl.so.5 <-> libpsl>=0.20.2_1
   SONAME: libsmime3.so <-> nss>=3.12.4_1
   SONAME: libnss3.so <-> nss>=3.12.4_1
   SONAME: libnspr4.so <-> nspr>=4.8_1
   SONAME: libpthread.so.0 <-> glibc>=2.32_1
   SONAME: libc.so.6 <-> glibc>=2.32_1
   SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
   SONAME: libnm.so.0 <-> libnm-1.32.12_1
   SONAME: libnewt.so.0.52 <-> newt>=0.52.18_1
   SONAME: libreadline.so.8 <-> libreadline8>=8.0_1
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
   SONAME: src/core/devices/wwan/libnm-wwan.so <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libmm-glib.so.0 <-> libmm-glib>=1.0.0_1
=> ERROR: NetworkManager-1.32.12_1: cannot guess required shlibs, aborting!
```

- [x] vala-panel{,-appmenu}
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/vala-panel-0.5.0
Build dir: /builddir/vala-panel-0.5.0/build
Build type: native build
Project name: vala-panel
Project version: 0.5.0
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Vala compiler for the host machine: valac (valac 0.52.4)
Host machine cpu family: x86_64
Host machine cpu: x86_64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency glib-2.0 found: YES 2.70.0
Run-time dependency gio-2.0 found: YES 2.70.0
Run-time dependency gio-unix-2.0 found: YES 2.70.0
Run-time dependency gmodule-2.0 found: YES 2.70.0
Run-time dependency gtk+-3.0 found: YES 3.24.30
Run-time dependency gdk-x11-3.0 found: YES 3.24.30
Run-time dependency gdk-wayland-3.0 found: YES 3.24.30
Run-time dependency gtk-layer-shell-0 found: YES 0.6.0
Library m found: YES
Configuring config.h using configuration
Program /usr/bin/meson found: YES (/usr/bin/meson)

po/meson.build:1:5: ERROR: Tried to create target "vala-panel-nb.mo", but a target of that name already exists.
```

- [x] gnome-settings-daemon

imported an upstream patch
```
The Meson build system
Version: 0.60.1
Source dir: /builddir/gnome-settings-daemon-40.0.1
Build dir: /builddir/gnome-settings-daemon-40.0.1/build
Build type: native build
Project name: gnome-settings-daemon
Project version: 40.0.1
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64

meson.build:87:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
```

- [x] libsixel

This will be fixed in meson 0.60.2, I imported a patch for now - mesonbuild/meson#9530
```
=> xbps-src: updating repositories for host (x86_64)...
The Meson build system
Version: 0.60.1
Source dir: /builddir/libsixel-1.10.3
Build dir: /builddir/libsixel-1.10.3/build
Build type: native build
Project name: libsixel
Project version: 1.10.3
C compiler for the host machine: cc (gcc 10.2.1 "cc (GCC) 10.2.1 20201203")
C linker for the host machine: cc ld.bfd 2.35.1
Host machine cpu family: x86_64
Host machine cpu: x86_64
Checking for function "unreachable" : YES 
Compiler for C supports arguments -Wformat=2: YES 
Compiler for C supports arguments -Wsign-conversion: YES 
Compiler for C supports arguments -Wuninitialized: YES 
Compiler for C supports arguments -Wstrict-overflow: YES 
Compiler for C supports arguments -Wshadow: YES 
Compiler for C supports arguments -Wdouble-promotion: YES 
Compiler for C supports arguments -Wswitch-default: YES 
Compiler for C supports arguments -Wunused-function: YES 
Compiler for C supports arguments -Wunused-but-set-variable: YES 
Compiler for C supports arguments -Bsymbolic: YES 
Library m found: YES
Checking for function "malloc" : YES 
Checking for function "realloc" : YES 
Checking for function "memset" : YES 
Checking for function "getopt_long" : YES 
Has header "assert.h" : YES 
Has header "math.h" : YES 
Has header "ctype.h" : YES 
Has header "memory.h" : YES 
Has header "string.h" : YES 
Has header "unistd.h" : YES 
Has header "stdint.h" : YES 
Has header "getopt.h" : YES 
Has header "sys/types.h" : YES 
Has header "sys/stat.h" : YES 
Has header "fcntl.h" : YES 
Has header "errno.h" : YES 
Has header "limits.h" : YES 
Has header "sys/time.h" : YES 
Has header "time.h" : YES 
Has header "signal.h" : YES 
Has header "sys/select.h" : YES 
Has header "sys/signal.h" : YES 
Has header "termios.h" : YES 
Has header "sys/ioctl.h" : YES 
Has header "inttypes.h" : YES 
Dependency gdk-pixbuf-2.0 skipped: feature gdk-pixbuf2 disabled
Library gd found: NO
Dependency libcurl skipped: feature libcurl disabled
Found pkg-config: /usr/bin/pkg-config (0.29.2)
Run-time dependency libjpeg found: YES 2.1.1
Run-time dependency libpng found: YES 1.6.37
Program python2 found: NO (disabled by: python2 )
Configuring config.h using configuration
Configuring sixel.h using configuration
Program bash found: YES (/usr/bin/bash)
Configuring libsixel-config using configuration
meson.build:161: WARNING: Perl, PHP and Ruby modules are available but not installed by Meson. If you want them, please refer to their individual installation directories for instructions after building libsixel.

meson.build:163:0: ERROR: Format placeholder @9@ out of range.
```

## unrelated build failures

- [x] gst-plugins-base1
```
FAILED: gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o 
cc -Igst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p -I. -I.. -Igst-libs -I../gst-libs -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/orc-0.4 -I/usr/include/gudev-1.0 -I/usr/include/libdrm -flto=auto -fdiagnostics-color=always -DNDEBUG -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -fvisibility=hidden -fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -Wmissing-declarations -Wredundant-decls -Wundef -Wwrite-strings -Wformat -Wformat-nonliteral -Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wvla -Wpointer-arith -Wmissing-prototypes -Wdeclaration-after-statement -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -fPIC -pthread -DHAVE_CONFIG_H -DBUILDING_GST_GL -MD -MQ gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -MF gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o.d -o gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/gstglwindow.c.o -c ../gst-libs/gst/gl/gstglwindow.c
In file included from ../gst-libs/gst/gl/gstglwindow.c:54:
../gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h:25:10: fatal error: xdg-shell-client-protocol.h: No such file or directory
   25 | #include "xdg-shell-client-protocol.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
[235/783] Compiling C object gst-libs/gst/gl/libgstgl-1.0.so.0.1804.0.p/egl_gstegl.c.o
ninja: build stopped: subcommand failed.
```

the meson musl test failure is a bug known upstream - mesonbuild/meson#8283

[skip ci]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-12-16 23:25 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-13 21:54 [PR PATCH] meson 0.60 paper42
2021-11-13 21:57 ` [PR PATCH] [Updated] " paper42
2021-11-14 13:06 ` paper42
2021-11-14 14:07 ` paper42
2021-11-14 14:38 ` eli-schwartz
2021-11-14 18:24 ` [PR PATCH] [Updated] " paper42
2021-11-26  0:30 ` paper42
2021-12-02  1:01 ` eli-schwartz
2021-12-16 23:17 ` [PR PATCH] [Updated] " paper42
2021-12-16 23:25 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).