Re: [PR PATCH] [Updated] meson 0.60

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

[-- 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
+