* Re: [PR PATCH] [Updated] meson: update to 1.1.1.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
@ 2023-08-01 19:50 ` mhmdanas
2023-08-01 19:56 ` [PR PATCH] [Updated] meson: update to 1.2.0 mhmdanas
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: mhmdanas @ 2023-08-01 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages meson-1.1.1
https://github.com/void-linux/void-packages/pull/44306
meson: update to 1.1.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@paper42
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44306.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-1.1.1-44306.patch --]
[-- Type: text/x-diff, Size: 10592 bytes --]
From b856e2371f5f3791a362b2a64d8dbac2ad22433a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 1 Aug 2023 20:49:37 +0100
Subject: [PATCH 1/2] gobject-introspection: fix leaks.
They cause Meson's checks to fail.
---
.../patches/fix-leaks.patch | 46 +++++++++++++++++++
srcpkgs/gobject-introspection/template | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gobject-introspection/patches/fix-leaks.patch
diff --git a/srcpkgs/gobject-introspection/patches/fix-leaks.patch b/srcpkgs/gobject-introspection/patches/fix-leaks.patch
new file mode 100644
index 0000000000000..fa23ee7457889
--- /dev/null
+++ b/srcpkgs/gobject-introspection/patches/fix-leaks.patch
@@ -0,0 +1,46 @@
+From bf96a92ef263820d40e233814a46932cae00db41 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Tue, 18 Jul 2023 11:07:59 -0400
+Subject: [PATCH] gdump: Fix leaked io streams
+
+This makes Meson unit test fail:
+https://github.com/mesonbuild/meson/issues/11754
+---
+
+MR: https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/411
+
+ girepository/gdump.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/girepository/gdump.c b/girepository/gdump.c
+index 055a8b8c1..449b260a4 100644
+--- a/girepository/gdump.c
++++ b/girepository/gdump.c
+@@ -594,6 +594,7 @@ g_irepository_dump (const char *arg, GError **error)
+ if (output == NULL)
+ {
+ g_input_stream_close (G_INPUT_STREAM (input), NULL, NULL);
++ g_object_unref (input);
+ return FALSE;
+ }
+
+@@ -674,11 +675,12 @@ g_irepository_dump (const char *arg, GError **error)
+ ioerror = NULL;
+ else
+ ioerror = error;
+- if (!g_input_stream_close (G_INPUT_STREAM (in), NULL, ioerror))
+- return FALSE;
+- if (!g_output_stream_close (G_OUTPUT_STREAM (output), NULL, ioerror))
+- return FALSE;
++ caught_error |= !g_input_stream_close (G_INPUT_STREAM (in), NULL, ioerror);
++ caught_error |= !g_output_stream_close (G_OUTPUT_STREAM (output), NULL, ioerror);
+ }
+
++ g_object_unref (in);
++ g_object_unref (output);
++
+ return !caught_error;
+ }
+--
+GitLab
+
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 69f59b52fa0cc..b9e1e618784da 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,7 +1,7 @@
# Template file for 'gobject-introspection'
pkgname=gobject-introspection
version=1.76.1
-revision=1
+revision=2
build_style=meson
pycompile_dirs="usr/lib/${pkgname}/giscanner"
hostmakedepends="flex pkg-config"
From fed5aeb66175b27a24674e971b09f056a8dda281 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 7 Jun 2023 14:27:53 +0100
Subject: [PATCH 2/2] meson: update to 1.2.0.
---
srcpkgs/meson/patches/fix-tests.diff | 127 +++++++++++++++++++++++++++
srcpkgs/meson/template | 9 +-
2 files changed, 131 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/meson/patches/fix-tests.diff
diff --git a/srcpkgs/meson/patches/fix-tests.diff b/srcpkgs/meson/patches/fix-tests.diff
new file mode 100644
index 0000000000000..fcc34dc4f4d96
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-tests.diff
@@ -0,0 +1,127 @@
+Taken from https://github.com/eli-schwartz/meson/commit/9da567b88c809250186cce4b0e8c68301852de9f,
+with minor modifications.
+
+diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt
+index 863b355c345..36927b882b5 100644
+--- a/cross/armclang-linux.txt
++++ b/cross/armclang-linux.txt
+@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar
+ #cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
+ #strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [host_machine]
+ system = 'baremetal'
+diff --git a/cross/linux-mingw-w64-32bit.txt b/cross/linux-mingw-w64-32bit.txt
+index caf1da1a045..91ad9c5029a 100644
+--- a/cross/linux-mingw-w64-32bit.txt
++++ b/cross/linux-mingw-w64-32bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
+ objc = '/usr/bin/i686-w64-mingw32-gcc'
+ ar = '/usr/bin/i686-w64-mingw32-ar'
+ strip = '/usr/bin/i686-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
+ windres = '/usr/bin/i686-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ ld = '/usr/bin/i686-w64-mingw32-ld'
+diff --git a/cross/linux-mingw-w64-64bit.txt b/cross/linux-mingw-w64-64bit.txt
+index 7403803b4c0..08fa7041043 100644
+--- a/cross/linux-mingw-w64-64bit.txt
++++ b/cross/linux-mingw-w64-64bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ objc = '/usr/bin/x86_64-w64-mingw32-gcc'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ cmake = '/usr/bin/cmake'
+diff --git a/cross/none.txt b/cross/none.txt
+index 1fbe4713ac0..9eadf974c32 100644
+--- a/cross/none.txt
++++ b/cross/none.txt
+@@ -15,5 +15,5 @@ fc = ['false']
+ objc = ['false']
+ objcpp = ['false']
+ ar = ['false']
+-pkgconfig = ['false']
++pkg-config = ['false']
+ cmake = ['false']
+diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
+index 408c2ceaecb..6409e396b57 100644
+--- a/cross/ubuntu-armhf.txt
++++ b/cross/ubuntu-armhf.txt
+@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ ld = '/usr/bin/arm-linux/gnueabihf-ld'
+
+ [built-in options]
+diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
+index 27a7dd96984..df93730424d 100755
+--- a/mesonbuild/scripts/env2mfile.py
++++ b/mesonbuild/scripts/env2mfile.py
+@@ -213,7 +213,7 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo:
+ except ValueError:
+ pass
+ try:
+- infos.binaries['pkgconfig'] = locate_path("%s-pkg-config" % host_arch)
++ infos.binaries['pkg-config'] = locate_path("%s-pkg-config" % host_arch)
+ except ValueError:
+ pass # pkg-config is optional
+ try:
+diff --git a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+index a00a7d1366c..d687b29817a 100644
+--- a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
++++ b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+@@ -6,7 +6,7 @@ cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [properties]
+ root = '/usr/arm-linux-gnueabihf'
+diff --git a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+index a5a39318d2c..3615f92f763 100644
+--- a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
++++ b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+@@ -3,7 +3,7 @@ c = '/usr/bin/x86_64-w64-mingw32-gcc'
+ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'broken'
+
+diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
+index 12eafd59598..4327d99fcd0 100644
+--- a/unittests/allplatformstests.py
++++ b/unittests/allplatformstests.py
+@@ -2722,7 +2722,7 @@ def test_native_dep_pkgconfig(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = '{}'
++ pkg-config = '{}'
+
+ [properties]
+
+@@ -2749,7 +2749,7 @@ def test_pkg_config_libdir(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = 'pkg-config'
++ pkg-config = 'pkg-config'
+
+ [properties]
+ pkg_config_libdir = ['{}']
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index c329092f20c0c..1c0ea62408a6a 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,20 +1,20 @@
# Template file for 'meson'
pkgname=meson
-version=1.1.0
+version=1.2.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
- cross-arm-linux-gnueabihf"
+ gcc-objc++ clang qt5-devel qt6-tools cmake llvm git pkg-config vala
+ python3-devel cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f
+checksum=1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -31,7 +31,6 @@ post_patch() {
do_check() {
# meson depends on trillion of things to perform actual tests
# see checkdepends=() on arch
- # 1 test still fails
( CC=gcc ./run_unittests.py )
}
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] meson: update to 1.2.0.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
2023-08-01 19:50 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-08-01 19:56 ` mhmdanas
2023-08-01 21:04 ` mhmdanas
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: mhmdanas @ 2023-08-01 19:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages meson-1.1.1
https://github.com/void-linux/void-packages/pull/44306
meson: update to 1.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@paper42
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44306.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-1.1.1-44306.patch --]
[-- Type: text/x-diff, Size: 7891 bytes --]
From a1f002a6f8d7a2501d5ab261469c18a3d719349d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 7 Jun 2023 14:27:53 +0100
Subject: [PATCH] meson: update to 1.2.0.
---
srcpkgs/meson/patches/fix-tests.diff | 127 +++++++++++++++++++++++++++
srcpkgs/meson/template | 9 +-
2 files changed, 131 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/meson/patches/fix-tests.diff
diff --git a/srcpkgs/meson/patches/fix-tests.diff b/srcpkgs/meson/patches/fix-tests.diff
new file mode 100644
index 0000000000000..fcc34dc4f4d96
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-tests.diff
@@ -0,0 +1,127 @@
+Taken from https://github.com/eli-schwartz/meson/commit/9da567b88c809250186cce4b0e8c68301852de9f,
+with minor modifications.
+
+diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt
+index 863b355c345..36927b882b5 100644
+--- a/cross/armclang-linux.txt
++++ b/cross/armclang-linux.txt
+@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar
+ #cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
+ #strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [host_machine]
+ system = 'baremetal'
+diff --git a/cross/linux-mingw-w64-32bit.txt b/cross/linux-mingw-w64-32bit.txt
+index caf1da1a045..91ad9c5029a 100644
+--- a/cross/linux-mingw-w64-32bit.txt
++++ b/cross/linux-mingw-w64-32bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
+ objc = '/usr/bin/i686-w64-mingw32-gcc'
+ ar = '/usr/bin/i686-w64-mingw32-ar'
+ strip = '/usr/bin/i686-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
+ windres = '/usr/bin/i686-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ ld = '/usr/bin/i686-w64-mingw32-ld'
+diff --git a/cross/linux-mingw-w64-64bit.txt b/cross/linux-mingw-w64-64bit.txt
+index 7403803b4c0..08fa7041043 100644
+--- a/cross/linux-mingw-w64-64bit.txt
++++ b/cross/linux-mingw-w64-64bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ objc = '/usr/bin/x86_64-w64-mingw32-gcc'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ cmake = '/usr/bin/cmake'
+diff --git a/cross/none.txt b/cross/none.txt
+index 1fbe4713ac0..9eadf974c32 100644
+--- a/cross/none.txt
++++ b/cross/none.txt
+@@ -15,5 +15,5 @@ fc = ['false']
+ objc = ['false']
+ objcpp = ['false']
+ ar = ['false']
+-pkgconfig = ['false']
++pkg-config = ['false']
+ cmake = ['false']
+diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
+index 408c2ceaecb..6409e396b57 100644
+--- a/cross/ubuntu-armhf.txt
++++ b/cross/ubuntu-armhf.txt
+@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ ld = '/usr/bin/arm-linux/gnueabihf-ld'
+
+ [built-in options]
+diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
+index 27a7dd96984..df93730424d 100755
+--- a/mesonbuild/scripts/env2mfile.py
++++ b/mesonbuild/scripts/env2mfile.py
+@@ -213,7 +213,7 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo:
+ except ValueError:
+ pass
+ try:
+- infos.binaries['pkgconfig'] = locate_path("%s-pkg-config" % host_arch)
++ infos.binaries['pkg-config'] = locate_path("%s-pkg-config" % host_arch)
+ except ValueError:
+ pass # pkg-config is optional
+ try:
+diff --git a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+index a00a7d1366c..d687b29817a 100644
+--- a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
++++ b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+@@ -6,7 +6,7 @@ cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [properties]
+ root = '/usr/arm-linux-gnueabihf'
+diff --git a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+index a5a39318d2c..3615f92f763 100644
+--- a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
++++ b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+@@ -3,7 +3,7 @@ c = '/usr/bin/x86_64-w64-mingw32-gcc'
+ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'broken'
+
+diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
+index 12eafd59598..4327d99fcd0 100644
+--- a/unittests/allplatformstests.py
++++ b/unittests/allplatformstests.py
+@@ -2722,7 +2722,7 @@ def test_native_dep_pkgconfig(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = '{}'
++ pkg-config = '{}'
+
+ [properties]
+
+@@ -2749,7 +2749,7 @@ def test_pkg_config_libdir(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = 'pkg-config'
++ pkg-config = 'pkg-config'
+
+ [properties]
+ pkg_config_libdir = ['{}']
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index c329092f20c0c..1c0ea62408a6a 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,20 +1,20 @@
# Template file for 'meson'
pkgname=meson
-version=1.1.0
+version=1.2.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
- cross-arm-linux-gnueabihf"
+ gcc-objc++ clang qt5-devel qt6-tools cmake llvm git pkg-config vala
+ python3-devel cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f
+checksum=1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -31,7 +31,6 @@ post_patch() {
do_check() {
# meson depends on trillion of things to perform actual tests
# see checkdepends=() on arch
- # 1 test still fails
( CC=gcc ./run_unittests.py )
}
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] meson: update to 1.2.0.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
2023-08-01 19:50 ` [PR PATCH] [Updated] " mhmdanas
2023-08-01 19:56 ` [PR PATCH] [Updated] meson: update to 1.2.0 mhmdanas
@ 2023-08-01 21:04 ` mhmdanas
2023-08-05 20:02 ` mhmdanas
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: mhmdanas @ 2023-08-01 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages meson-1.1.1
https://github.com/void-linux/void-packages/pull/44306
meson: update to 1.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@paper42
Requires #45377 for tests to succeed.
Marking as draft pending further testing from my side.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44306.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-1.1.1-44306.patch --]
[-- Type: text/x-diff, Size: 7852 bytes --]
From af0c9f14bf1229fbc5c55aae6ef42c38909337b9 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 7 Jun 2023 14:27:53 +0100
Subject: [PATCH] meson: update to 1.2.0.
---
srcpkgs/meson/patches/fix-tests.diff | 127 +++++++++++++++++++++++++++
srcpkgs/meson/template | 9 +-
2 files changed, 131 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/meson/patches/fix-tests.diff
diff --git a/srcpkgs/meson/patches/fix-tests.diff b/srcpkgs/meson/patches/fix-tests.diff
new file mode 100644
index 0000000000000..efc78e2100717
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-tests.diff
@@ -0,0 +1,127 @@
+Taken from https://github.com/mesonbuild/meson/pull/12060, with minor
+modifications.
+
+diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt
+index 863b355c345..36927b882b5 100644
+--- a/cross/armclang-linux.txt
++++ b/cross/armclang-linux.txt
+@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar
+ #cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
+ #strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [host_machine]
+ system = 'baremetal'
+diff --git a/cross/linux-mingw-w64-32bit.txt b/cross/linux-mingw-w64-32bit.txt
+index caf1da1a045..91ad9c5029a 100644
+--- a/cross/linux-mingw-w64-32bit.txt
++++ b/cross/linux-mingw-w64-32bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
+ objc = '/usr/bin/i686-w64-mingw32-gcc'
+ ar = '/usr/bin/i686-w64-mingw32-ar'
+ strip = '/usr/bin/i686-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
+ windres = '/usr/bin/i686-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ ld = '/usr/bin/i686-w64-mingw32-ld'
+diff --git a/cross/linux-mingw-w64-64bit.txt b/cross/linux-mingw-w64-64bit.txt
+index 7403803b4c0..08fa7041043 100644
+--- a/cross/linux-mingw-w64-64bit.txt
++++ b/cross/linux-mingw-w64-64bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ objc = '/usr/bin/x86_64-w64-mingw32-gcc'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ cmake = '/usr/bin/cmake'
+diff --git a/cross/none.txt b/cross/none.txt
+index 1fbe4713ac0..9eadf974c32 100644
+--- a/cross/none.txt
++++ b/cross/none.txt
+@@ -15,5 +15,5 @@ fc = ['false']
+ objc = ['false']
+ objcpp = ['false']
+ ar = ['false']
+-pkgconfig = ['false']
++pkg-config = ['false']
+ cmake = ['false']
+diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
+index 408c2ceaecb..6409e396b57 100644
+--- a/cross/ubuntu-armhf.txt
++++ b/cross/ubuntu-armhf.txt
+@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ ld = '/usr/bin/arm-linux/gnueabihf-ld'
+
+ [built-in options]
+diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
+index 27a7dd96984..df93730424d 100755
+--- a/mesonbuild/scripts/env2mfile.py
++++ b/mesonbuild/scripts/env2mfile.py
+@@ -213,7 +213,7 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo:
+ except ValueError:
+ pass
+ try:
+- infos.binaries['pkgconfig'] = locate_path("%s-pkg-config" % host_arch)
++ infos.binaries['pkg-config'] = locate_path("%s-pkg-config" % host_arch)
+ except ValueError:
+ pass # pkg-config is optional
+ try:
+diff --git a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+index a00a7d1366c..d687b29817a 100644
+--- a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
++++ b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+@@ -6,7 +6,7 @@ cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [properties]
+ root = '/usr/arm-linux-gnueabihf'
+diff --git a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+index a5a39318d2c..3615f92f763 100644
+--- a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
++++ b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+@@ -3,7 +3,7 @@ c = '/usr/bin/x86_64-w64-mingw32-gcc'
+ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'broken'
+
+diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
+index 12eafd59598..4327d99fcd0 100644
+--- a/unittests/allplatformstests.py
++++ b/unittests/allplatformstests.py
+@@ -2722,7 +2722,7 @@ def test_native_dep_pkgconfig(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = '{}'
++ pkg-config = '{}'
+
+ [properties]
+
+@@ -2749,7 +2749,7 @@ def test_pkg_config_libdir(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = 'pkg-config'
++ pkg-config = 'pkg-config'
+
+ [properties]
+ pkg_config_libdir = ['{}']
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index c329092f20c0c..1c0ea62408a6a 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,20 +1,20 @@
# Template file for 'meson'
pkgname=meson
-version=1.1.0
+version=1.2.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
- cross-arm-linux-gnueabihf"
+ gcc-objc++ clang qt5-devel qt6-tools cmake llvm git pkg-config vala
+ python3-devel cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f
+checksum=1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -31,7 +31,6 @@ post_patch() {
do_check() {
# meson depends on trillion of things to perform actual tests
# see checkdepends=() on arch
- # 1 test still fails
( CC=gcc ./run_unittests.py )
}
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] meson: update to 1.2.0.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
` (2 preceding siblings ...)
2023-08-01 21:04 ` mhmdanas
@ 2023-08-05 20:02 ` mhmdanas
2023-08-06 12:50 ` [PR REVIEW] " classabbyamp
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: mhmdanas @ 2023-08-05 20:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages meson-1.1.1
https://github.com/void-linux/void-packages/pull/44306
meson: update to 1.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@paper42
Requires #45377 for tests to succeed.
Marking as draft pending further testing from my side.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44306.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-1.1.1-44306.patch --]
[-- Type: text/x-diff, Size: 28440 bytes --]
From a0e70eb834672eaa993710b531cda04e7ec47fdc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 7 Jun 2023 14:27:53 +0100
Subject: [PATCH 01/12] meson: update to 1.2.0.
---
srcpkgs/meson/patches/fix-tests.diff | 127 +++++++++++++++++++++++++++
srcpkgs/meson/template | 9 +-
2 files changed, 131 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/meson/patches/fix-tests.diff
diff --git a/srcpkgs/meson/patches/fix-tests.diff b/srcpkgs/meson/patches/fix-tests.diff
new file mode 100644
index 0000000000000..efc78e2100717
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-tests.diff
@@ -0,0 +1,127 @@
+Taken from https://github.com/mesonbuild/meson/pull/12060, with minor
+modifications.
+
+diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt
+index 863b355c345..36927b882b5 100644
+--- a/cross/armclang-linux.txt
++++ b/cross/armclang-linux.txt
+@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar
+ #cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
+ #strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [host_machine]
+ system = 'baremetal'
+diff --git a/cross/linux-mingw-w64-32bit.txt b/cross/linux-mingw-w64-32bit.txt
+index caf1da1a045..91ad9c5029a 100644
+--- a/cross/linux-mingw-w64-32bit.txt
++++ b/cross/linux-mingw-w64-32bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
+ objc = '/usr/bin/i686-w64-mingw32-gcc'
+ ar = '/usr/bin/i686-w64-mingw32-ar'
+ strip = '/usr/bin/i686-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
+ windres = '/usr/bin/i686-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ ld = '/usr/bin/i686-w64-mingw32-ld'
+diff --git a/cross/linux-mingw-w64-64bit.txt b/cross/linux-mingw-w64-64bit.txt
+index 7403803b4c0..08fa7041043 100644
+--- a/cross/linux-mingw-w64-64bit.txt
++++ b/cross/linux-mingw-w64-64bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ objc = '/usr/bin/x86_64-w64-mingw32-gcc'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ cmake = '/usr/bin/cmake'
+diff --git a/cross/none.txt b/cross/none.txt
+index 1fbe4713ac0..9eadf974c32 100644
+--- a/cross/none.txt
++++ b/cross/none.txt
+@@ -15,5 +15,5 @@ fc = ['false']
+ objc = ['false']
+ objcpp = ['false']
+ ar = ['false']
+-pkgconfig = ['false']
++pkg-config = ['false']
+ cmake = ['false']
+diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
+index 408c2ceaecb..6409e396b57 100644
+--- a/cross/ubuntu-armhf.txt
++++ b/cross/ubuntu-armhf.txt
+@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ ld = '/usr/bin/arm-linux/gnueabihf-ld'
+
+ [built-in options]
+diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
+index 27a7dd96984..df93730424d 100755
+--- a/mesonbuild/scripts/env2mfile.py
++++ b/mesonbuild/scripts/env2mfile.py
+@@ -213,7 +213,7 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo:
+ except ValueError:
+ pass
+ try:
+- infos.binaries['pkgconfig'] = locate_path("%s-pkg-config" % host_arch)
++ infos.binaries['pkg-config'] = locate_path("%s-pkg-config" % host_arch)
+ except ValueError:
+ pass # pkg-config is optional
+ try:
+diff --git a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+index a00a7d1366c..d687b29817a 100644
+--- a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
++++ b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+@@ -6,7 +6,7 @@ cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [properties]
+ root = '/usr/arm-linux-gnueabihf'
+diff --git a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+index a5a39318d2c..3615f92f763 100644
+--- a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
++++ b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+@@ -3,7 +3,7 @@ c = '/usr/bin/x86_64-w64-mingw32-gcc'
+ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'broken'
+
+diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
+index 12eafd59598..4327d99fcd0 100644
+--- a/unittests/allplatformstests.py
++++ b/unittests/allplatformstests.py
+@@ -2722,7 +2722,7 @@ def test_native_dep_pkgconfig(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = '{}'
++ pkg-config = '{}'
+
+ [properties]
+
+@@ -2749,7 +2749,7 @@ def test_pkg_config_libdir(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = 'pkg-config'
++ pkg-config = 'pkg-config'
+
+ [properties]
+ pkg_config_libdir = ['{}']
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index c329092f20c0c..1c0ea62408a6a 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,20 +1,20 @@
# Template file for 'meson'
pkgname=meson
-version=1.1.0
+version=1.2.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
- cross-arm-linux-gnueabihf"
+ gcc-objc++ clang qt5-devel qt6-tools cmake llvm git pkg-config vala
+ python3-devel cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f
+checksum=1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -31,7 +31,6 @@ post_patch() {
do_check() {
# meson depends on trillion of things to perform actual tests
# see checkdepends=() on arch
- # 1 test still fails
( CC=gcc ./run_unittests.py )
}
From 0cd983a3f4ae4d26eaae7d5956b62d4b1242f070 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 4 Aug 2023 19:31:59 +0100
Subject: [PATCH 02/12] rygel: update to 0.42.4.
---
srcpkgs/rygel/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 5239aa389ffa3..4399f2472dff8 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,6 +1,6 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.3
+version=0.42.4
revision=1
build_style=meson
build_helper="gir"
@@ -14,8 +14,9 @@ short_desc="GNOME home media solution"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
+changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=0fdec2128537e8b55c3c540d0a80dc7c249ab29153f4be0197a5f31025a5a5a0
+checksum=6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7
conf_files="/etc/rygel.conf"
From 3cd0cd6338f4af594c01a3224968985cc8e746e9 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 19:38:57 +0100
Subject: [PATCH 03/12] gupnp: update to 1.6.5.
---
srcpkgs/gupnp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index e7d30e366b105..66c6bdde8657c 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -1,6 +1,6 @@
# Template file for 'gupnp'
pkgname=gupnp
-version=1.6.3
+version=1.6.5
revision=1
build_style=meson
build_helper="gir"
@@ -12,8 +12,9 @@ short_desc="GObject-based library for UPnP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GUPnP"
+changelog="https://gitlab.gnome.org/GNOME/gupnp/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gupnp/${version%.*}/gupnp-${version}.tar.xz"
-checksum=4f4f418b07b81164df1f7ab612e28e4c016c2d085b8a4f39f97945f8b15ee248
+checksum=437dff970142e8407087a89855f717e20d27c9d76e05b4cd517df621c7d888cd
build_options="gir"
build_options_default="gir"
From 6ce106393ebf2db1eeb4c2d3015c765d608243d4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:16:27 +0100
Subject: [PATCH 04/12] gtk4: fix build.
---
srcpkgs/gtk4/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 856d29a3d5dc3..10f1175b143dd 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -6,9 +6,9 @@ build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Dgtk_doc=true -Dbuild-tests=false
-Dbuild-testsuite=false -Dbuild-examples=false
- $(vopt_feature broadway broadway-backend)
- $(vopt_feature x11 x11-backend)
- $(vopt_feature wayland wayland-backend)
+ $(vopt_bool broadway-backend)
+ $(vopt_bool x11 x11-backend)
+ $(vopt_bool wayland wayland-backend)
$(vopt_feature gir introspection)
$(vopt_feature colord colord)
$(vopt_feature cloudproviders cloudproviders)
From dd920cd218750e8f110abb519ea23f0b0bc47a56 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:17:18 +0100
Subject: [PATCH 05/12] gtksourceview5: fix build.
---
srcpkgs/gtksourceview5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index bedceef2b01ff..c404f9ffac717 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -4,7 +4,7 @@ version=5.8.0
revision=1
build_style=meson
build_helper="gir"
-configure_args="$(vopt_if gir introspection) $(vopt_bool gir vapi)
+configure_args="$(vopt_feature gir introspection) $(vopt_bool gir vapi)
$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
$(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
From ead0d8251a8e2a38f63add5ea063fec9d05ddb20 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:17:33 +0100
Subject: [PATCH 06/12] gupnp-tools: update to 0.12.1.
---
...ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch | 30 +++++++++++++++++++
srcpkgs/gupnp-tools/template | 4 +--
2 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
diff --git a/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch b/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
new file mode 100644
index 0000000000000..38d4934079c5c
--- /dev/null
+++ b/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
@@ -0,0 +1,30 @@
+From f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Thu, 3 Aug 2023 23:44:15 +0200
+Subject: [PATCH] common: Drop deprecated xmlRecoverMemory
+
+Fixes #27
+---
+ src/common/pretty-print.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c
+index c692664..c8ebc9a 100644
+--- a/src/common/pretty-print.c
++++ b/src/common/pretty-print.c
+@@ -34,7 +34,11 @@ pretty_print_xml (const char *xml)
+ char *text;
+ int length;
+
+- doc = xmlRecoverMemory (xml, strlen (xml));
++ doc = xmlReadMemory (xml,
++ strlen (xml),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+
+ if (!doc)
+ return NULL;
+--
+GitLab
+
diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 8dc5214831f5e..8ddd57b99b2bd 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -1,6 +1,6 @@
# Template file for 'gupnp-tools'
pkgname=gupnp-tools
-version=0.12.0
+version=0.12.1
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://gupnp.org/"
changelog="https://gitlab.gnome.org/GNOME/gupnp-tools/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gupnp-tools/${version%.*}/gupnp-tools-${version}.tar.xz"
-checksum=5ea7607ee365642c555927fedc5b5e1fe08e74f061d0c3eb08bd901b5eb20082
+checksum=53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba
From e1368e9e200ec0738e3a4e8f66e91f6fff864db8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:11 +0100
Subject: [PATCH 07/12] libdex: fix build.
---
srcpkgs/libdex/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libdex/template b/srcpkgs/libdex/template
index e587b3995997d..5340766d9276e 100644
--- a/srcpkgs/libdex/template
+++ b/srcpkgs/libdex/template
@@ -5,7 +5,7 @@ revision=1
build_style=meson
build_helper=gir
configure_args="-Dexamples=false
- $(vopt_feature gtk_doc docs)
+ $(vopt_bool gtk_doc docs)
$(vopt_feature gir introspection)
$(vopt_bool vala vapi)"
hostmakedepends="pkg-config glib-devel gettext
@@ -29,6 +29,12 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
CFLAGS="-D_GNU_SOURCE"
fi
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -Dtests=true"
+else
+ configure_args+=" -Dtests=false"
+fi
+
libdex-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
short_desc+=" - development files"
From 6c7d4e2e78b17daa3d3be164c2af37d47242f9e8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:20 +0100
Subject: [PATCH 08/12] coeurl: fix build.
---
srcpkgs/coeurl/patches/fix-build.diff | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
new file mode 100644
index 0000000000000..6b3b33e6806a2
--- /dev/null
+++ b/srcpkgs/coeurl/patches/fix-build.diff
@@ -0,0 +1,11 @@
+diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
+index f1510b4ba5..ec9710f9d7 100644
+--- a/subprojects/curl.wrap
++++ b/subprojects/curl.wrap
+@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
+ source_filename = curl-7.77.0.tar.xz
+ source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
+
+-[provides]
++[provide]
+ dependency_names = libcurl
From e436b8c758d889a311574ec50cb0c092226a14da Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:53 +0100
Subject: [PATCH 09/12] tau: add missing makedepend.
---
srcpkgs/tau/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template
index d1f9e96249978..2be79dc4723cc 100644
--- a/srcpkgs/tau/template
+++ b/srcpkgs/tau/template
@@ -1,11 +1,11 @@
# Template file for 'tau'
pkgname=tau
version=0.12.0
-revision=1
+revision=2
build_style=meson
-build_helper=rust
+build_helper="rust"
hostmakedepends="cargo gettext pkg-config glib-devel"
-makedepends="libhandy-devel rust-std vte3-devel"
+makedepends="libhandy-devel rust-std vte3-devel oniguruma-devel"
depends="xi-editor"
checkdepends="appstream-glib desktop-file-utils"
short_desc="GTK frontend for the Xi text editor, written in Rust"
From 7982f79a4d51cdc2fc8df3248d8a72fd1cdd6006 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:19:34 +0100
Subject: [PATCH 10/12] gupnp-av: fix build.
---
...768121d54fdcedabe7544863515d6a813354.patch | 63 +++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
diff --git a/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch b/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
new file mode 100644
index 0000000000000..64cd4bdf82dc6
--- /dev/null
+++ b/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
@@ -0,0 +1,63 @@
+From 9557768121d54fdcedabe7544863515d6a813354 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Thu, 3 Aug 2023 23:52:43 +0200
+Subject: [PATCH] Remove deprecates xmlRecoverMemory
+
+Cannot currently remove xmlSchemaValidateStream as validateDoc fails to
+accept the XSD
+---
+ libgupnp-av/gupnp-didl-lite-parser.c | 9 +++++++--
+ libgupnp-av/gupnp-feature-list-parser.c | 9 +++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c
+index 3a5727f..948f934 100644
+--- a/libgupnp-av/gupnp-didl-lite-parser.c
++++ b/libgupnp-av/gupnp-didl-lite-parser.c
+@@ -230,12 +230,17 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser,
+ GUPnPAVXMLDoc *xml_doc = NULL;
+ gboolean result;
+
+- doc = xmlRecoverMemory (didl, strlen (didl));
++ doc = xmlReadMemory (didl,
++ strlen (didl),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+ if (doc == NULL) {
+ g_set_error (error,
+ G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+- "Could not parse DIDL-Lite XML:\n%s", didl);
++ "Could not parse DIDL-Lite XML:\n%s",
++ didl);
+
+ return FALSE;
+ }
+diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c
+index 16208b5..2e7c15d 100644
+--- a/libgupnp-av/gupnp-feature-list-parser.c
++++ b/libgupnp-av/gupnp-feature-list-parser.c
+@@ -114,12 +114,17 @@ gupnp_feature_list_parser_parse_text
+ xmlNode *element;
+ GList *feature_list = NULL;
+
+- doc = xmlRecoverMemory (text, strlen (text));
++ doc = xmlReadMemory (text,
++ strlen (text),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+ if (doc == NULL) {
+ g_set_error (error,
+ G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+- "Could not parse FeatureList XML:\n%s", text);
++ "Could not parse FeatureList XML:\n%s",
++ text);
+
+ return NULL;
+ }
+--
+GitLab
+
From 98b661590884ea928f6a4726ae8b4bc41897b7bc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:19:55 +0100
Subject: [PATCH 11/12] xreader: fix build with meson 1.2.0.
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ++++++++++++++++++
1 file changed, 192 insertions(+)
create mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
new file mode 100644
index 0000000000000..e81d4f95511ed
--- /dev/null
+++ b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
@@ -0,0 +1,192 @@
+From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 4 Aug 2023 09:41:57 -0400
+Subject: [PATCH] Fix building with meson 1.2.
+
+Thanks to @heftig for the patch.
+
+Fixes #612.
+---
+ cut-n-paste/meson.build | 3 ---
+ cut-n-paste/smclient/meson.build | 6 ++++++
+ cut-n-paste/synctex/meson.build | 6 ++++++
+ cut-n-paste/totem-screensaver/meson.build | 6 ++++++
+ cut-n-paste/zoom-control/meson.build | 6 ++++++
+ libdocument/meson.build | 6 ++++--
+ libmisc/meson.build | 6 ++++++
+ libview/meson.build | 6 ++++++
+ shell/meson.build | 26 ++++++++++++++++-------
+ 9 files changed, 58 insertions(+), 13 deletions(-)
+
+diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
+index 0f79ebb8..5fd89d2e 100644
+--- a/cut-n-paste/meson.build
++++ b/cut-n-paste/meson.build
+@@ -2,6 +2,3 @@ subdir('zoom-control')
+ subdir('totem-screensaver')
+ subdir('smclient')
+ subdir('synctex')
+-
+-cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
+-synctex_includes = include_directories('synctex')
+diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
+index ca129a3d..5c9eea93 100644
+--- a/cut-n-paste/smclient/meson.build
++++ b/cut-n-paste/smclient/meson.build
+@@ -22,3 +22,9 @@ libsmclient = static_library(
+ dependencies: smclient_deps,
+ include_directories: include_dirs,
+ )
++
++libsmclient_dep = declare_dependency(
++ link_with: libsmclient,
++ dependencies: smclient_deps,
++ include_directories: [include_root, include_directories('.')],
++)
+diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
+index 0f063adb..305c4f56 100644
+--- a/cut-n-paste/synctex/meson.build
++++ b/cut-n-paste/synctex/meson.build
+@@ -14,3 +14,9 @@ libsynctex = static_library(
+ synctex_sources,
+ dependencies: synctex_deps,
+ )
++
++libsynctex_dep = declare_dependency(
++ link_with: libsynctex,
++ dependencies: synctex_deps,
++ include_directories: include_directories('.'),
++)
+diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
+index faac9b7c..a67c2f96 100644
+--- a/cut-n-paste/totem-screensaver/meson.build
++++ b/cut-n-paste/totem-screensaver/meson.build
+@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
+ dependencies: totem_screensaver_deps,
+ include_directories: include_root,
+ )
++
++libtotemscrsaver_dep = declare_dependency(
++ link_with: libtotemscrsaver,
++ dependencies: totem_screensaver_deps,
++ include_directories: [include_root, include_directories('.')],
++)
+diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
+index f48567fc..2c3320ac 100644
+--- a/cut-n-paste/zoom-control/meson.build
++++ b/cut-n-paste/zoom-control/meson.build
+@@ -20,3 +20,9 @@ libephyzoom = static_library(
+ include_directories: include_root,
+ dependencies: zoom_deps,
+ )
++
++libephyzoom_dep = declare_dependency(
++ link_with: libephyzoom,
++ include_directories: [include_root, include_directories('.')],
++ dependencies: zoom_deps,
++)
+diff --git a/libdocument/meson.build b/libdocument/meson.build
+index 6c0d6e34..5965a582 100644
+--- a/libdocument/meson.build
++++ b/libdocument/meson.build
+@@ -121,14 +121,14 @@ libdocument_deps = [
+ gmodule,
+ gtk,
+ math,
++ libsynctex_dep,
+ ]
+
+ libdocument = library(
+ 'xreaderdocument',
+ libdocument_private_headers + libdocument_sources,
+ dependencies: libdocument_deps,
+- include_directories: [include_root, synctex_includes],
+- link_whole: [libsynctex],
++ include_directories: include_root,
+ soversion: binary_major_version,
+ version: binary_version,
+ install: true,
+@@ -137,6 +137,8 @@ libdocument = library(
+ # this is needed so targets that depend on generated headers can do so
+ libdocument_dep = declare_dependency(
+ link_with: libdocument,
++ dependencies: libdocument_deps,
++ include_directories: include_root,
+ sources: libdoc_enums[1]
+ )
+
+diff --git a/libmisc/meson.build b/libmisc/meson.build
+index 280d3b03..e0140736 100644
+--- a/libmisc/meson.build
++++ b/libmisc/meson.build
+@@ -20,3 +20,9 @@ libmisc = static_library(
+ include_directories: include_dirs,
+ dependencies: libmisc_deps,
+ )
++
++libmisc_dep = declare_dependency(
++ link_with: libmisc,
++ include_directories: include_dirs,
++ dependencies: libmisc_deps,
++)
+diff --git a/libview/meson.build b/libview/meson.build
+index b1c18504..77c7f023 100644
+--- a/libview/meson.build
++++ b/libview/meson.build
+@@ -90,6 +90,12 @@ libview = library(
+ install: true,
+ )
+
++libview_dep = declare_dependency(
++ link_with: libview,
++ include_directories: include_dirs,
++ dependencies: libview_deps,
++)
++
+ install_headers(
+ libview_headers,
+ subdir: libview_header_dir,
+diff --git a/shell/meson.build b/shell/meson.build
+index cff438b3..4060ceec 100644
+--- a/shell/meson.build
++++ b/shell/meson.build
+@@ -132,21 +132,31 @@ if get_option('enable_dbus')
+ )
+ endif
+
++libshell_deps = [
++ xreader_deps,
++ libview_dep,
++ libmisc_dep,
++ libtotemscrsaver_dep,
++ libsmclient_dep,
++ libephyzoom_dep,
++]
++
+ libshell = static_library(
+ 'shell',
+ shell_sources,
+- link_with: libview,
+- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
+- dependencies: xreader_deps,
+- include_directories: [include_dirs, cnc_includes],
++ dependencies: libshell_deps,
++ include_directories: include_dirs,
++)
++
++libshell_dep = declare_dependency(
++ link_whole: libshell, # Need the whole lib for gresource lookup
++ dependencies: libshell_deps,
++ include_directories: include_dirs,
+ )
+
+ xreader = executable(
+ 'xreader',
+ 'main.c',
+- link_with: libview,
+- link_whole: libshell,
+- dependencies: xreader_deps,
+- include_directories: [include_dirs, cnc_includes],
++ dependencies: libshell_dep,
+ install: true,
+ )
From 99c2c5d5ee0177d2b3c20e719bb4bfabd4e471ae Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:57:54 +0100
Subject: [PATCH 12/12] kiwix-tools: add missing makedepend.
---
srcpkgs/kiwix-tools/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template
index 300aba74fecae..3b1f6441cb1d2 100644
--- a/srcpkgs/kiwix-tools/template
+++ b/srcpkgs/kiwix-tools/template
@@ -4,7 +4,8 @@ version=3.1.2
revision=2
build_style=meson
hostmakedepends="pkg-config"
-makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel"
+makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel
+ libcurl-devel"
short_desc="Kiwix command line tools"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR REVIEW] meson: update to 1.2.0.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
` (3 preceding siblings ...)
2023-08-05 20:02 ` mhmdanas
@ 2023-08-06 12:50 ` classabbyamp
2023-08-06 12:51 ` mhmdanas
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-08-06 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/44306#discussion_r1285214184
Comment:
doesn't this need `broadway broadway-backend`? that's what the build option is
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR REVIEW] meson: update to 1.2.0.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
` (4 preceding siblings ...)
2023-08-06 12:50 ` [PR REVIEW] " classabbyamp
@ 2023-08-06 12:51 ` mhmdanas
2023-08-06 14:46 ` [PR PATCH] [Updated] " mhmdanas
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: mhmdanas @ 2023-08-06 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/44306#discussion_r1285214754
Comment:
Good catch, I messed that one up.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] meson: update to 1.2.0.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
` (5 preceding siblings ...)
2023-08-06 12:51 ` mhmdanas
@ 2023-08-06 14:46 ` mhmdanas
2023-08-08 16:05 ` mhmdanas
2023-08-10 3:52 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: mhmdanas @ 2023-08-06 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages meson-1.1.1
https://github.com/void-linux/void-packages/pull/44306
meson: update to 1.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@paper42
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44306.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-1.1.1-44306.patch --]
[-- Type: text/x-diff, Size: 28449 bytes --]
From 64ea7ef0c148a96dbc450879276a452bf4e52e91 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 7 Jun 2023 14:27:53 +0100
Subject: [PATCH 01/12] meson: update to 1.2.0.
---
srcpkgs/meson/patches/fix-tests.diff | 127 +++++++++++++++++++++++++++
srcpkgs/meson/template | 9 +-
2 files changed, 131 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/meson/patches/fix-tests.diff
diff --git a/srcpkgs/meson/patches/fix-tests.diff b/srcpkgs/meson/patches/fix-tests.diff
new file mode 100644
index 0000000000000..efc78e2100717
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-tests.diff
@@ -0,0 +1,127 @@
+Taken from https://github.com/mesonbuild/meson/pull/12060, with minor
+modifications.
+
+diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt
+index 863b355c345..36927b882b5 100644
+--- a/cross/armclang-linux.txt
++++ b/cross/armclang-linux.txt
+@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar
+ #cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
+ #strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [host_machine]
+ system = 'baremetal'
+diff --git a/cross/linux-mingw-w64-32bit.txt b/cross/linux-mingw-w64-32bit.txt
+index caf1da1a045..91ad9c5029a 100644
+--- a/cross/linux-mingw-w64-32bit.txt
++++ b/cross/linux-mingw-w64-32bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
+ objc = '/usr/bin/i686-w64-mingw32-gcc'
+ ar = '/usr/bin/i686-w64-mingw32-ar'
+ strip = '/usr/bin/i686-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
+ windres = '/usr/bin/i686-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ ld = '/usr/bin/i686-w64-mingw32-ld'
+diff --git a/cross/linux-mingw-w64-64bit.txt b/cross/linux-mingw-w64-64bit.txt
+index 7403803b4c0..08fa7041043 100644
+--- a/cross/linux-mingw-w64-64bit.txt
++++ b/cross/linux-mingw-w64-64bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ objc = '/usr/bin/x86_64-w64-mingw32-gcc'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ cmake = '/usr/bin/cmake'
+diff --git a/cross/none.txt b/cross/none.txt
+index 1fbe4713ac0..9eadf974c32 100644
+--- a/cross/none.txt
++++ b/cross/none.txt
+@@ -15,5 +15,5 @@ fc = ['false']
+ objc = ['false']
+ objcpp = ['false']
+ ar = ['false']
+-pkgconfig = ['false']
++pkg-config = ['false']
+ cmake = ['false']
+diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
+index 408c2ceaecb..6409e396b57 100644
+--- a/cross/ubuntu-armhf.txt
++++ b/cross/ubuntu-armhf.txt
+@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ ld = '/usr/bin/arm-linux/gnueabihf-ld'
+
+ [built-in options]
+diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
+index 27a7dd96984..df93730424d 100755
+--- a/mesonbuild/scripts/env2mfile.py
++++ b/mesonbuild/scripts/env2mfile.py
+@@ -213,7 +213,7 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo:
+ except ValueError:
+ pass
+ try:
+- infos.binaries['pkgconfig'] = locate_path("%s-pkg-config" % host_arch)
++ infos.binaries['pkg-config'] = locate_path("%s-pkg-config" % host_arch)
+ except ValueError:
+ pass # pkg-config is optional
+ try:
+diff --git a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+index a00a7d1366c..d687b29817a 100644
+--- a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
++++ b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+@@ -6,7 +6,7 @@ cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [properties]
+ root = '/usr/arm-linux-gnueabihf'
+diff --git a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+index a5a39318d2c..3615f92f763 100644
+--- a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
++++ b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+@@ -3,7 +3,7 @@ c = '/usr/bin/x86_64-w64-mingw32-gcc'
+ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'broken'
+
+diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
+index 12eafd59598..4327d99fcd0 100644
+--- a/unittests/allplatformstests.py
++++ b/unittests/allplatformstests.py
+@@ -2722,7 +2722,7 @@ def test_native_dep_pkgconfig(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = '{}'
++ pkg-config = '{}'
+
+ [properties]
+
+@@ -2749,7 +2749,7 @@ def test_pkg_config_libdir(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = 'pkg-config'
++ pkg-config = 'pkg-config'
+
+ [properties]
+ pkg_config_libdir = ['{}']
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index c329092f20c0c..1c0ea62408a6a 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,20 +1,20 @@
# Template file for 'meson'
pkgname=meson
-version=1.1.0
+version=1.2.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
- cross-arm-linux-gnueabihf"
+ gcc-objc++ clang qt5-devel qt6-tools cmake llvm git pkg-config vala
+ python3-devel cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f
+checksum=1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -31,7 +31,6 @@ post_patch() {
do_check() {
# meson depends on trillion of things to perform actual tests
# see checkdepends=() on arch
- # 1 test still fails
( CC=gcc ./run_unittests.py )
}
From 9cc2a2097f377cdbcc2c7d9ebf9b982b2a2dad4a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 4 Aug 2023 19:31:59 +0100
Subject: [PATCH 02/12] rygel: update to 0.42.4.
---
srcpkgs/rygel/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 5239aa389ffa3..4399f2472dff8 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,6 +1,6 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.3
+version=0.42.4
revision=1
build_style=meson
build_helper="gir"
@@ -14,8 +14,9 @@ short_desc="GNOME home media solution"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
+changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=0fdec2128537e8b55c3c540d0a80dc7c249ab29153f4be0197a5f31025a5a5a0
+checksum=6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7
conf_files="/etc/rygel.conf"
From d3300155a2f85540580b55514dd6330e911384d3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 19:38:57 +0100
Subject: [PATCH 03/12] gupnp: update to 1.6.5.
---
srcpkgs/gupnp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index e7d30e366b105..66c6bdde8657c 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -1,6 +1,6 @@
# Template file for 'gupnp'
pkgname=gupnp
-version=1.6.3
+version=1.6.5
revision=1
build_style=meson
build_helper="gir"
@@ -12,8 +12,9 @@ short_desc="GObject-based library for UPnP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GUPnP"
+changelog="https://gitlab.gnome.org/GNOME/gupnp/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gupnp/${version%.*}/gupnp-${version}.tar.xz"
-checksum=4f4f418b07b81164df1f7ab612e28e4c016c2d085b8a4f39f97945f8b15ee248
+checksum=437dff970142e8407087a89855f717e20d27c9d76e05b4cd517df621c7d888cd
build_options="gir"
build_options_default="gir"
From 23f4394e3eaac1aab7f3236b1b1dba0ac41731a2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:16:27 +0100
Subject: [PATCH 04/12] gtk4: fix build.
---
srcpkgs/gtk4/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 856d29a3d5dc3..b40d51d432537 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -6,9 +6,9 @@ build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Dgtk_doc=true -Dbuild-tests=false
-Dbuild-testsuite=false -Dbuild-examples=false
- $(vopt_feature broadway broadway-backend)
- $(vopt_feature x11 x11-backend)
- $(vopt_feature wayland wayland-backend)
+ $(vopt_bool broadway broadway-backend)
+ $(vopt_bool x11 x11-backend)
+ $(vopt_bool wayland wayland-backend)
$(vopt_feature gir introspection)
$(vopt_feature colord colord)
$(vopt_feature cloudproviders cloudproviders)
From 9f157a63959248be25a512a702bc6ca1288e7413 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:17:18 +0100
Subject: [PATCH 05/12] gtksourceview5: fix build.
---
srcpkgs/gtksourceview5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index bedceef2b01ff..c404f9ffac717 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -4,7 +4,7 @@ version=5.8.0
revision=1
build_style=meson
build_helper="gir"
-configure_args="$(vopt_if gir introspection) $(vopt_bool gir vapi)
+configure_args="$(vopt_feature gir introspection) $(vopt_bool gir vapi)
$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
$(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
From f3c78832b3d2cd877e22e9d3833fbe419986d102 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:17:33 +0100
Subject: [PATCH 06/12] gupnp-tools: update to 0.12.1.
---
...ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch | 30 +++++++++++++++++++
srcpkgs/gupnp-tools/template | 4 +--
2 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
diff --git a/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch b/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
new file mode 100644
index 0000000000000..38d4934079c5c
--- /dev/null
+++ b/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
@@ -0,0 +1,30 @@
+From f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Thu, 3 Aug 2023 23:44:15 +0200
+Subject: [PATCH] common: Drop deprecated xmlRecoverMemory
+
+Fixes #27
+---
+ src/common/pretty-print.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c
+index c692664..c8ebc9a 100644
+--- a/src/common/pretty-print.c
++++ b/src/common/pretty-print.c
+@@ -34,7 +34,11 @@ pretty_print_xml (const char *xml)
+ char *text;
+ int length;
+
+- doc = xmlRecoverMemory (xml, strlen (xml));
++ doc = xmlReadMemory (xml,
++ strlen (xml),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+
+ if (!doc)
+ return NULL;
+--
+GitLab
+
diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 8dc5214831f5e..8ddd57b99b2bd 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -1,6 +1,6 @@
# Template file for 'gupnp-tools'
pkgname=gupnp-tools
-version=0.12.0
+version=0.12.1
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://gupnp.org/"
changelog="https://gitlab.gnome.org/GNOME/gupnp-tools/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gupnp-tools/${version%.*}/gupnp-tools-${version}.tar.xz"
-checksum=5ea7607ee365642c555927fedc5b5e1fe08e74f061d0c3eb08bd901b5eb20082
+checksum=53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba
From 1d18af619dc42081c7461d12a37aa78f8d12bac0 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:11 +0100
Subject: [PATCH 07/12] libdex: fix build.
---
srcpkgs/libdex/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libdex/template b/srcpkgs/libdex/template
index e587b3995997d..5340766d9276e 100644
--- a/srcpkgs/libdex/template
+++ b/srcpkgs/libdex/template
@@ -5,7 +5,7 @@ revision=1
build_style=meson
build_helper=gir
configure_args="-Dexamples=false
- $(vopt_feature gtk_doc docs)
+ $(vopt_bool gtk_doc docs)
$(vopt_feature gir introspection)
$(vopt_bool vala vapi)"
hostmakedepends="pkg-config glib-devel gettext
@@ -29,6 +29,12 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
CFLAGS="-D_GNU_SOURCE"
fi
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -Dtests=true"
+else
+ configure_args+=" -Dtests=false"
+fi
+
libdex-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
short_desc+=" - development files"
From 3f8a4c8595972e5f7a8481a3cc6c08041d79da6b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:20 +0100
Subject: [PATCH 08/12] coeurl: fix build.
---
srcpkgs/coeurl/patches/fix-build.diff | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
new file mode 100644
index 0000000000000..6b3b33e6806a2
--- /dev/null
+++ b/srcpkgs/coeurl/patches/fix-build.diff
@@ -0,0 +1,11 @@
+diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
+index f1510b4ba5..ec9710f9d7 100644
+--- a/subprojects/curl.wrap
++++ b/subprojects/curl.wrap
+@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
+ source_filename = curl-7.77.0.tar.xz
+ source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
+
+-[provides]
++[provide]
+ dependency_names = libcurl
From 4b6a5d7c87524b28670744f1b580d851cde59d3c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:53 +0100
Subject: [PATCH 09/12] tau: add missing makedepend.
---
srcpkgs/tau/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template
index d1f9e96249978..2be79dc4723cc 100644
--- a/srcpkgs/tau/template
+++ b/srcpkgs/tau/template
@@ -1,11 +1,11 @@
# Template file for 'tau'
pkgname=tau
version=0.12.0
-revision=1
+revision=2
build_style=meson
-build_helper=rust
+build_helper="rust"
hostmakedepends="cargo gettext pkg-config glib-devel"
-makedepends="libhandy-devel rust-std vte3-devel"
+makedepends="libhandy-devel rust-std vte3-devel oniguruma-devel"
depends="xi-editor"
checkdepends="appstream-glib desktop-file-utils"
short_desc="GTK frontend for the Xi text editor, written in Rust"
From 796cb3543fc5d5efbde7b08ebe33d35d87753375 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:19:34 +0100
Subject: [PATCH 10/12] gupnp-av: fix build.
---
...768121d54fdcedabe7544863515d6a813354.patch | 63 +++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
diff --git a/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch b/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
new file mode 100644
index 0000000000000..64cd4bdf82dc6
--- /dev/null
+++ b/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
@@ -0,0 +1,63 @@
+From 9557768121d54fdcedabe7544863515d6a813354 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Thu, 3 Aug 2023 23:52:43 +0200
+Subject: [PATCH] Remove deprecates xmlRecoverMemory
+
+Cannot currently remove xmlSchemaValidateStream as validateDoc fails to
+accept the XSD
+---
+ libgupnp-av/gupnp-didl-lite-parser.c | 9 +++++++--
+ libgupnp-av/gupnp-feature-list-parser.c | 9 +++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c
+index 3a5727f..948f934 100644
+--- a/libgupnp-av/gupnp-didl-lite-parser.c
++++ b/libgupnp-av/gupnp-didl-lite-parser.c
+@@ -230,12 +230,17 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser,
+ GUPnPAVXMLDoc *xml_doc = NULL;
+ gboolean result;
+
+- doc = xmlRecoverMemory (didl, strlen (didl));
++ doc = xmlReadMemory (didl,
++ strlen (didl),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+ if (doc == NULL) {
+ g_set_error (error,
+ G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+- "Could not parse DIDL-Lite XML:\n%s", didl);
++ "Could not parse DIDL-Lite XML:\n%s",
++ didl);
+
+ return FALSE;
+ }
+diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c
+index 16208b5..2e7c15d 100644
+--- a/libgupnp-av/gupnp-feature-list-parser.c
++++ b/libgupnp-av/gupnp-feature-list-parser.c
+@@ -114,12 +114,17 @@ gupnp_feature_list_parser_parse_text
+ xmlNode *element;
+ GList *feature_list = NULL;
+
+- doc = xmlRecoverMemory (text, strlen (text));
++ doc = xmlReadMemory (text,
++ strlen (text),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+ if (doc == NULL) {
+ g_set_error (error,
+ G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+- "Could not parse FeatureList XML:\n%s", text);
++ "Could not parse FeatureList XML:\n%s",
++ text);
+
+ return NULL;
+ }
+--
+GitLab
+
From 956cb8e550722e14d5c55c16131612dfcfc921ab Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:19:55 +0100
Subject: [PATCH 11/12] xreader: fix build with meson 1.2.0.
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ++++++++++++++++++
1 file changed, 192 insertions(+)
create mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
new file mode 100644
index 0000000000000..e81d4f95511ed
--- /dev/null
+++ b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
@@ -0,0 +1,192 @@
+From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 4 Aug 2023 09:41:57 -0400
+Subject: [PATCH] Fix building with meson 1.2.
+
+Thanks to @heftig for the patch.
+
+Fixes #612.
+---
+ cut-n-paste/meson.build | 3 ---
+ cut-n-paste/smclient/meson.build | 6 ++++++
+ cut-n-paste/synctex/meson.build | 6 ++++++
+ cut-n-paste/totem-screensaver/meson.build | 6 ++++++
+ cut-n-paste/zoom-control/meson.build | 6 ++++++
+ libdocument/meson.build | 6 ++++--
+ libmisc/meson.build | 6 ++++++
+ libview/meson.build | 6 ++++++
+ shell/meson.build | 26 ++++++++++++++++-------
+ 9 files changed, 58 insertions(+), 13 deletions(-)
+
+diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
+index 0f79ebb8..5fd89d2e 100644
+--- a/cut-n-paste/meson.build
++++ b/cut-n-paste/meson.build
+@@ -2,6 +2,3 @@ subdir('zoom-control')
+ subdir('totem-screensaver')
+ subdir('smclient')
+ subdir('synctex')
+-
+-cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
+-synctex_includes = include_directories('synctex')
+diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
+index ca129a3d..5c9eea93 100644
+--- a/cut-n-paste/smclient/meson.build
++++ b/cut-n-paste/smclient/meson.build
+@@ -22,3 +22,9 @@ libsmclient = static_library(
+ dependencies: smclient_deps,
+ include_directories: include_dirs,
+ )
++
++libsmclient_dep = declare_dependency(
++ link_with: libsmclient,
++ dependencies: smclient_deps,
++ include_directories: [include_root, include_directories('.')],
++)
+diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
+index 0f063adb..305c4f56 100644
+--- a/cut-n-paste/synctex/meson.build
++++ b/cut-n-paste/synctex/meson.build
+@@ -14,3 +14,9 @@ libsynctex = static_library(
+ synctex_sources,
+ dependencies: synctex_deps,
+ )
++
++libsynctex_dep = declare_dependency(
++ link_with: libsynctex,
++ dependencies: synctex_deps,
++ include_directories: include_directories('.'),
++)
+diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
+index faac9b7c..a67c2f96 100644
+--- a/cut-n-paste/totem-screensaver/meson.build
++++ b/cut-n-paste/totem-screensaver/meson.build
+@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
+ dependencies: totem_screensaver_deps,
+ include_directories: include_root,
+ )
++
++libtotemscrsaver_dep = declare_dependency(
++ link_with: libtotemscrsaver,
++ dependencies: totem_screensaver_deps,
++ include_directories: [include_root, include_directories('.')],
++)
+diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
+index f48567fc..2c3320ac 100644
+--- a/cut-n-paste/zoom-control/meson.build
++++ b/cut-n-paste/zoom-control/meson.build
+@@ -20,3 +20,9 @@ libephyzoom = static_library(
+ include_directories: include_root,
+ dependencies: zoom_deps,
+ )
++
++libephyzoom_dep = declare_dependency(
++ link_with: libephyzoom,
++ include_directories: [include_root, include_directories('.')],
++ dependencies: zoom_deps,
++)
+diff --git a/libdocument/meson.build b/libdocument/meson.build
+index 6c0d6e34..5965a582 100644
+--- a/libdocument/meson.build
++++ b/libdocument/meson.build
+@@ -121,14 +121,14 @@ libdocument_deps = [
+ gmodule,
+ gtk,
+ math,
++ libsynctex_dep,
+ ]
+
+ libdocument = library(
+ 'xreaderdocument',
+ libdocument_private_headers + libdocument_sources,
+ dependencies: libdocument_deps,
+- include_directories: [include_root, synctex_includes],
+- link_whole: [libsynctex],
++ include_directories: include_root,
+ soversion: binary_major_version,
+ version: binary_version,
+ install: true,
+@@ -137,6 +137,8 @@ libdocument = library(
+ # this is needed so targets that depend on generated headers can do so
+ libdocument_dep = declare_dependency(
+ link_with: libdocument,
++ dependencies: libdocument_deps,
++ include_directories: include_root,
+ sources: libdoc_enums[1]
+ )
+
+diff --git a/libmisc/meson.build b/libmisc/meson.build
+index 280d3b03..e0140736 100644
+--- a/libmisc/meson.build
++++ b/libmisc/meson.build
+@@ -20,3 +20,9 @@ libmisc = static_library(
+ include_directories: include_dirs,
+ dependencies: libmisc_deps,
+ )
++
++libmisc_dep = declare_dependency(
++ link_with: libmisc,
++ include_directories: include_dirs,
++ dependencies: libmisc_deps,
++)
+diff --git a/libview/meson.build b/libview/meson.build
+index b1c18504..77c7f023 100644
+--- a/libview/meson.build
++++ b/libview/meson.build
+@@ -90,6 +90,12 @@ libview = library(
+ install: true,
+ )
+
++libview_dep = declare_dependency(
++ link_with: libview,
++ include_directories: include_dirs,
++ dependencies: libview_deps,
++)
++
+ install_headers(
+ libview_headers,
+ subdir: libview_header_dir,
+diff --git a/shell/meson.build b/shell/meson.build
+index cff438b3..4060ceec 100644
+--- a/shell/meson.build
++++ b/shell/meson.build
+@@ -132,21 +132,31 @@ if get_option('enable_dbus')
+ )
+ endif
+
++libshell_deps = [
++ xreader_deps,
++ libview_dep,
++ libmisc_dep,
++ libtotemscrsaver_dep,
++ libsmclient_dep,
++ libephyzoom_dep,
++]
++
+ libshell = static_library(
+ 'shell',
+ shell_sources,
+- link_with: libview,
+- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
+- dependencies: xreader_deps,
+- include_directories: [include_dirs, cnc_includes],
++ dependencies: libshell_deps,
++ include_directories: include_dirs,
++)
++
++libshell_dep = declare_dependency(
++ link_whole: libshell, # Need the whole lib for gresource lookup
++ dependencies: libshell_deps,
++ include_directories: include_dirs,
+ )
+
+ xreader = executable(
+ 'xreader',
+ 'main.c',
+- link_with: libview,
+- link_whole: libshell,
+- dependencies: xreader_deps,
+- include_directories: [include_dirs, cnc_includes],
++ dependencies: libshell_dep,
+ install: true,
+ )
From 76c6b2e9f38316c821703c28508d9512d4bfe547 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:57:54 +0100
Subject: [PATCH 12/12] kiwix-tools: add missing makedepend.
---
srcpkgs/kiwix-tools/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template
index 300aba74fecae..3b1f6441cb1d2 100644
--- a/srcpkgs/kiwix-tools/template
+++ b/srcpkgs/kiwix-tools/template
@@ -4,7 +4,8 @@ version=3.1.2
revision=2
build_style=meson
hostmakedepends="pkg-config"
-makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel"
+makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel
+ libcurl-devel"
short_desc="Kiwix command line tools"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] meson: update to 1.2.0.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
` (6 preceding siblings ...)
2023-08-06 14:46 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-08-08 16:05 ` mhmdanas
2023-08-10 3:52 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: mhmdanas @ 2023-08-08 16:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages meson-1.1.1
https://github.com/void-linux/void-packages/pull/44306
meson: update to 1.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@paper42
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44306.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-1.1.1-44306.patch --]
[-- Type: text/x-diff, Size: 29048 bytes --]
From d79b17e8e973e74f15e3236bf4435c45a414b2ee Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 7 Jun 2023 14:27:53 +0100
Subject: [PATCH 01/12] meson: update to 1.2.0.
---
srcpkgs/meson/patches/fix-tests.diff | 140 +++++++++++++++++++++++++++
srcpkgs/meson/template | 9 +-
2 files changed, 144 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/meson/patches/fix-tests.diff
diff --git a/srcpkgs/meson/patches/fix-tests.diff b/srcpkgs/meson/patches/fix-tests.diff
new file mode 100644
index 0000000000000..95e92c108d181
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-tests.diff
@@ -0,0 +1,140 @@
+Taken from https://github.com/mesonbuild/meson/pull/12060, with minor
+modifications.
+
+diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt
+index 863b355c345..36927b882b5 100644
+--- a/cross/armclang-linux.txt
++++ b/cross/armclang-linux.txt
+@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar
+ #cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
+ #strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [host_machine]
+ system = 'baremetal'
+diff --git a/cross/linux-mingw-w64-32bit.txt b/cross/linux-mingw-w64-32bit.txt
+index caf1da1a045..91ad9c5029a 100644
+--- a/cross/linux-mingw-w64-32bit.txt
++++ b/cross/linux-mingw-w64-32bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
+ objc = '/usr/bin/i686-w64-mingw32-gcc'
+ ar = '/usr/bin/i686-w64-mingw32-ar'
+ strip = '/usr/bin/i686-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
+ windres = '/usr/bin/i686-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ ld = '/usr/bin/i686-w64-mingw32-ld'
+diff --git a/cross/linux-mingw-w64-64bit.txt b/cross/linux-mingw-w64-64bit.txt
+index 7403803b4c0..08fa7041043 100644
+--- a/cross/linux-mingw-w64-64bit.txt
++++ b/cross/linux-mingw-w64-64bit.txt
+@@ -4,7 +4,7 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ objc = '/usr/bin/x86_64-w64-mingw32-gcc'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'wine'
+ cmake = '/usr/bin/cmake'
+diff --git a/cross/none.txt b/cross/none.txt
+index 1fbe4713ac0..9eadf974c32 100644
+--- a/cross/none.txt
++++ b/cross/none.txt
+@@ -15,5 +15,5 @@ fc = ['false']
+ objc = ['false']
+ objcpp = ['false']
+ ar = ['false']
+-pkgconfig = ['false']
++pkg-config = ['false']
+ cmake = ['false']
+diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
+index 408c2ceaecb..6409e396b57 100644
+--- a/cross/ubuntu-armhf.txt
++++ b/cross/ubuntu-armhf.txt
+@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++']
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+ ld = '/usr/bin/arm-linux/gnueabihf-ld'
+
+ [built-in options]
+diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
+index 27a7dd96984..df93730424d 100755
+--- a/mesonbuild/scripts/env2mfile.py
++++ b/mesonbuild/scripts/env2mfile.py
+@@ -213,7 +213,7 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo:
+ except ValueError:
+ pass
+ try:
+- infos.binaries['pkgconfig'] = locate_path("%s-pkg-config" % host_arch)
++ infos.binaries['pkg-config'] = locate_path("%s-pkg-config" % host_arch)
+ except ValueError:
+ pass # pkg-config is optional
+ try:
+diff --git a/test cases/common/44 pkgconfig-gen/meson.build b/test cases/common/44 pkgconfig-gen/meson.build
+index adf3e2765e8..fd6371ef4b9 100644
+--- a/test cases/common/44 pkgconfig-gen/meson.build
++++ b/test cases/common/44 pkgconfig-gen/meson.build
+@@ -8,7 +8,7 @@ if not cc.find_library('z', required: false).found()
+ endif
+
+ # First check we have pkg-config >= 0.29
+-pkgconfig = find_program('pkg-config', required: false)
++pkgconfig = find_program('pkg-config', native: true, required: false)
+ if not pkgconfig.found()
+ error('MESON_SKIP_TEST: pkg-config not found')
+ endif
+diff --git a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+index a00a7d1366c..d687b29817a 100644
+--- a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
++++ b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt
+@@ -6,7 +6,7 @@ cpp = '/usr/bin/arm-linux-gnueabihf-g++'
+ rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7']
+ ar = '/usr/arm-linux-gnueabihf/bin/ar'
+ strip = '/usr/arm-linux-gnueabihf/bin/strip'
+-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
++pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+
+ [properties]
+ root = '/usr/arm-linux-gnueabihf'
+diff --git a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+index a5a39318d2c..3615f92f763 100644
+--- a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
++++ b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt
+@@ -3,7 +3,7 @@ c = '/usr/bin/x86_64-w64-mingw32-gcc'
+ cpp = '/usr/bin/x86_64-w64-mingw32-g++'
+ ar = '/usr/bin/x86_64-w64-mingw32-ar'
+ strip = '/usr/bin/x86_64-w64-mingw32-strip'
+-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
++pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+ windres = '/usr/bin/x86_64-w64-mingw32-windres'
+ exe_wrapper = 'broken'
+
+diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
+index 12eafd59598..4327d99fcd0 100644
+--- a/unittests/allplatformstests.py
++++ b/unittests/allplatformstests.py
+@@ -2722,7 +2722,7 @@ def test_native_dep_pkgconfig(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = '{}'
++ pkg-config = '{}'
+
+ [properties]
+
+@@ -2749,7 +2749,7 @@ def test_pkg_config_libdir(self):
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile:
+ crossfile.write(textwrap.dedent(
+ '''[binaries]
+- pkgconfig = 'pkg-config'
++ pkg-config = 'pkg-config'
+
+ [properties]
+ pkg_config_libdir = ['{}']
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index c329092f20c0c..1c0ea62408a6a 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,20 +1,20 @@
# Template file for 'meson'
pkgname=meson
-version=1.1.0
+version=1.2.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
- cross-arm-linux-gnueabihf"
+ gcc-objc++ clang qt5-devel qt6-tools cmake llvm git pkg-config vala
+ python3-devel cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f
+checksum=1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -31,7 +31,6 @@ post_patch() {
do_check() {
# meson depends on trillion of things to perform actual tests
# see checkdepends=() on arch
- # 1 test still fails
( CC=gcc ./run_unittests.py )
}
From 5ed7a845e4539c7ccdd8e8fe77ba441fcd8b1f1d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 4 Aug 2023 19:31:59 +0100
Subject: [PATCH 02/12] rygel: update to 0.42.4.
---
srcpkgs/rygel/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 5239aa389ffa3..4399f2472dff8 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,6 +1,6 @@
# Template file for 'rygel'
pkgname=rygel
-version=0.42.3
+version=0.42.4
revision=1
build_style=meson
build_helper="gir"
@@ -14,8 +14,9 @@ short_desc="GNOME home media solution"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Rygel"
+changelog="https://gitlab.gnome.org/GNOME/rygel/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/rygel/${version%.*}/rygel-${version}.tar.xz"
-checksum=0fdec2128537e8b55c3c540d0a80dc7c249ab29153f4be0197a5f31025a5a5a0
+checksum=6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7
conf_files="/etc/rygel.conf"
From 9507e2ce5972b14186e1985af9e9e822051efc77 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 19:38:57 +0100
Subject: [PATCH 03/12] gupnp: update to 1.6.5.
---
srcpkgs/gupnp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index e7d30e366b105..66c6bdde8657c 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -1,6 +1,6 @@
# Template file for 'gupnp'
pkgname=gupnp
-version=1.6.3
+version=1.6.5
revision=1
build_style=meson
build_helper="gir"
@@ -12,8 +12,9 @@ short_desc="GObject-based library for UPnP"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GUPnP"
+changelog="https://gitlab.gnome.org/GNOME/gupnp/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gupnp/${version%.*}/gupnp-${version}.tar.xz"
-checksum=4f4f418b07b81164df1f7ab612e28e4c016c2d085b8a4f39f97945f8b15ee248
+checksum=437dff970142e8407087a89855f717e20d27c9d76e05b4cd517df621c7d888cd
build_options="gir"
build_options_default="gir"
From dbced1475fec83c1bde5dc498647db5e5182ba3a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:16:27 +0100
Subject: [PATCH 04/12] gtk4: fix build.
---
srcpkgs/gtk4/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 856d29a3d5dc3..b40d51d432537 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -6,9 +6,9 @@ build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Dgtk_doc=true -Dbuild-tests=false
-Dbuild-testsuite=false -Dbuild-examples=false
- $(vopt_feature broadway broadway-backend)
- $(vopt_feature x11 x11-backend)
- $(vopt_feature wayland wayland-backend)
+ $(vopt_bool broadway broadway-backend)
+ $(vopt_bool x11 x11-backend)
+ $(vopt_bool wayland wayland-backend)
$(vopt_feature gir introspection)
$(vopt_feature colord colord)
$(vopt_feature cloudproviders cloudproviders)
From 4636741fe4099c2c39a7a5e0816f35517ae27427 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:17:18 +0100
Subject: [PATCH 05/12] gtksourceview5: fix build.
---
srcpkgs/gtksourceview5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index bedceef2b01ff..c404f9ffac717 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -4,7 +4,7 @@ version=5.8.0
revision=1
build_style=meson
build_helper="gir"
-configure_args="$(vopt_if gir introspection) $(vopt_bool gir vapi)
+configure_args="$(vopt_feature gir introspection) $(vopt_bool gir vapi)
$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
$(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
From 8b62e43b82b9aac12c640de0fe474d39d92eef7a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:17:33 +0100
Subject: [PATCH 06/12] gupnp-tools: update to 0.12.1.
---
...ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch | 30 +++++++++++++++++++
srcpkgs/gupnp-tools/template | 4 +--
2 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
diff --git a/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch b/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
new file mode 100644
index 0000000000000..38d4934079c5c
--- /dev/null
+++ b/srcpkgs/gupnp-tools/patches/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7.patch
@@ -0,0 +1,30 @@
+From f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Thu, 3 Aug 2023 23:44:15 +0200
+Subject: [PATCH] common: Drop deprecated xmlRecoverMemory
+
+Fixes #27
+---
+ src/common/pretty-print.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c
+index c692664..c8ebc9a 100644
+--- a/src/common/pretty-print.c
++++ b/src/common/pretty-print.c
+@@ -34,7 +34,11 @@ pretty_print_xml (const char *xml)
+ char *text;
+ int length;
+
+- doc = xmlRecoverMemory (xml, strlen (xml));
++ doc = xmlReadMemory (xml,
++ strlen (xml),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+
+ if (!doc)
+ return NULL;
+--
+GitLab
+
diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 8dc5214831f5e..8ddd57b99b2bd 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -1,6 +1,6 @@
# Template file for 'gupnp-tools'
pkgname=gupnp-tools
-version=0.12.0
+version=0.12.1
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="http://gupnp.org/"
changelog="https://gitlab.gnome.org/GNOME/gupnp-tools/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gupnp-tools/${version%.*}/gupnp-tools-${version}.tar.xz"
-checksum=5ea7607ee365642c555927fedc5b5e1fe08e74f061d0c3eb08bd901b5eb20082
+checksum=53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba
From f2b2ca7f01b461fa6a27d15ead36e8ae17b1630e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:11 +0100
Subject: [PATCH 07/12] libdex: fix build.
---
srcpkgs/libdex/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libdex/template b/srcpkgs/libdex/template
index e587b3995997d..5340766d9276e 100644
--- a/srcpkgs/libdex/template
+++ b/srcpkgs/libdex/template
@@ -5,7 +5,7 @@ revision=1
build_style=meson
build_helper=gir
configure_args="-Dexamples=false
- $(vopt_feature gtk_doc docs)
+ $(vopt_bool gtk_doc docs)
$(vopt_feature gir introspection)
$(vopt_bool vala vapi)"
hostmakedepends="pkg-config glib-devel gettext
@@ -29,6 +29,12 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
CFLAGS="-D_GNU_SOURCE"
fi
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -Dtests=true"
+else
+ configure_args+=" -Dtests=false"
+fi
+
libdex-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
short_desc+=" - development files"
From e19160393a8aaae2a020c8d84a509d6c880f103a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:20 +0100
Subject: [PATCH 08/12] coeurl: fix build.
---
srcpkgs/coeurl/patches/fix-build.diff | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/coeurl/patches/fix-build.diff
diff --git a/srcpkgs/coeurl/patches/fix-build.diff b/srcpkgs/coeurl/patches/fix-build.diff
new file mode 100644
index 0000000000000..6b3b33e6806a2
--- /dev/null
+++ b/srcpkgs/coeurl/patches/fix-build.diff
@@ -0,0 +1,11 @@
+diff --git a/subprojects/curl.wrap b/subprojects/curl.wrap
+index f1510b4ba5..ec9710f9d7 100644
+--- a/subprojects/curl.wrap
++++ b/subprojects/curl.wrap
+@@ -5,5 +5,5 @@ source_url = https://github.com/curl/curl/releases/download/curl-7_77_0/curl-7.7
+ source_filename = curl-7.77.0.tar.xz
+ source_hash = 0f64582c54282f31c0de9f0a1a596b182776bd4df9a4c4a2a41bbeb54f62594b
+
+-[provides]
++[provide]
+ dependency_names = libcurl
From f617607a018f444a76f972574a44f496519e3e69 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:18:53 +0100
Subject: [PATCH 09/12] tau: add missing makedepend.
---
srcpkgs/tau/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template
index d1f9e96249978..2be79dc4723cc 100644
--- a/srcpkgs/tau/template
+++ b/srcpkgs/tau/template
@@ -1,11 +1,11 @@
# Template file for 'tau'
pkgname=tau
version=0.12.0
-revision=1
+revision=2
build_style=meson
-build_helper=rust
+build_helper="rust"
hostmakedepends="cargo gettext pkg-config glib-devel"
-makedepends="libhandy-devel rust-std vte3-devel"
+makedepends="libhandy-devel rust-std vte3-devel oniguruma-devel"
depends="xi-editor"
checkdepends="appstream-glib desktop-file-utils"
short_desc="GTK frontend for the Xi text editor, written in Rust"
From c95c7101b337e6c3c5e2ea8c10e04f0949712df8 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:19:34 +0100
Subject: [PATCH 10/12] gupnp-av: fix build.
---
...768121d54fdcedabe7544863515d6a813354.patch | 63 +++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
diff --git a/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch b/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
new file mode 100644
index 0000000000000..64cd4bdf82dc6
--- /dev/null
+++ b/srcpkgs/gupnp-av/patches/9557768121d54fdcedabe7544863515d6a813354.patch
@@ -0,0 +1,63 @@
+From 9557768121d54fdcedabe7544863515d6a813354 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Thu, 3 Aug 2023 23:52:43 +0200
+Subject: [PATCH] Remove deprecates xmlRecoverMemory
+
+Cannot currently remove xmlSchemaValidateStream as validateDoc fails to
+accept the XSD
+---
+ libgupnp-av/gupnp-didl-lite-parser.c | 9 +++++++--
+ libgupnp-av/gupnp-feature-list-parser.c | 9 +++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c
+index 3a5727f..948f934 100644
+--- a/libgupnp-av/gupnp-didl-lite-parser.c
++++ b/libgupnp-av/gupnp-didl-lite-parser.c
+@@ -230,12 +230,17 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser,
+ GUPnPAVXMLDoc *xml_doc = NULL;
+ gboolean result;
+
+- doc = xmlRecoverMemory (didl, strlen (didl));
++ doc = xmlReadMemory (didl,
++ strlen (didl),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+ if (doc == NULL) {
+ g_set_error (error,
+ G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+- "Could not parse DIDL-Lite XML:\n%s", didl);
++ "Could not parse DIDL-Lite XML:\n%s",
++ didl);
+
+ return FALSE;
+ }
+diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c
+index 16208b5..2e7c15d 100644
+--- a/libgupnp-av/gupnp-feature-list-parser.c
++++ b/libgupnp-av/gupnp-feature-list-parser.c
+@@ -114,12 +114,17 @@ gupnp_feature_list_parser_parse_text
+ xmlNode *element;
+ GList *feature_list = NULL;
+
+- doc = xmlRecoverMemory (text, strlen (text));
++ doc = xmlReadMemory (text,
++ strlen (text),
++ NULL,
++ NULL,
++ XML_PARSE_NONET | XML_PARSE_RECOVER);
+ if (doc == NULL) {
+ g_set_error (error,
+ G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+- "Could not parse FeatureList XML:\n%s", text);
++ "Could not parse FeatureList XML:\n%s",
++ text);
+
+ return NULL;
+ }
+--
+GitLab
+
From 078d8ceb9caf2422a2f11412b3612555318cdaf6 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:19:55 +0100
Subject: [PATCH 11/12] xreader: fix build with meson 1.2.0.
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ++++++++++++++++++
1 file changed, 192 insertions(+)
create mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
new file mode 100644
index 0000000000000..e81d4f95511ed
--- /dev/null
+++ b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
@@ -0,0 +1,192 @@
+From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 4 Aug 2023 09:41:57 -0400
+Subject: [PATCH] Fix building with meson 1.2.
+
+Thanks to @heftig for the patch.
+
+Fixes #612.
+---
+ cut-n-paste/meson.build | 3 ---
+ cut-n-paste/smclient/meson.build | 6 ++++++
+ cut-n-paste/synctex/meson.build | 6 ++++++
+ cut-n-paste/totem-screensaver/meson.build | 6 ++++++
+ cut-n-paste/zoom-control/meson.build | 6 ++++++
+ libdocument/meson.build | 6 ++++--
+ libmisc/meson.build | 6 ++++++
+ libview/meson.build | 6 ++++++
+ shell/meson.build | 26 ++++++++++++++++-------
+ 9 files changed, 58 insertions(+), 13 deletions(-)
+
+diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
+index 0f79ebb8..5fd89d2e 100644
+--- a/cut-n-paste/meson.build
++++ b/cut-n-paste/meson.build
+@@ -2,6 +2,3 @@ subdir('zoom-control')
+ subdir('totem-screensaver')
+ subdir('smclient')
+ subdir('synctex')
+-
+-cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
+-synctex_includes = include_directories('synctex')
+diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
+index ca129a3d..5c9eea93 100644
+--- a/cut-n-paste/smclient/meson.build
++++ b/cut-n-paste/smclient/meson.build
+@@ -22,3 +22,9 @@ libsmclient = static_library(
+ dependencies: smclient_deps,
+ include_directories: include_dirs,
+ )
++
++libsmclient_dep = declare_dependency(
++ link_with: libsmclient,
++ dependencies: smclient_deps,
++ include_directories: [include_root, include_directories('.')],
++)
+diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
+index 0f063adb..305c4f56 100644
+--- a/cut-n-paste/synctex/meson.build
++++ b/cut-n-paste/synctex/meson.build
+@@ -14,3 +14,9 @@ libsynctex = static_library(
+ synctex_sources,
+ dependencies: synctex_deps,
+ )
++
++libsynctex_dep = declare_dependency(
++ link_with: libsynctex,
++ dependencies: synctex_deps,
++ include_directories: include_directories('.'),
++)
+diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
+index faac9b7c..a67c2f96 100644
+--- a/cut-n-paste/totem-screensaver/meson.build
++++ b/cut-n-paste/totem-screensaver/meson.build
+@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
+ dependencies: totem_screensaver_deps,
+ include_directories: include_root,
+ )
++
++libtotemscrsaver_dep = declare_dependency(
++ link_with: libtotemscrsaver,
++ dependencies: totem_screensaver_deps,
++ include_directories: [include_root, include_directories('.')],
++)
+diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
+index f48567fc..2c3320ac 100644
+--- a/cut-n-paste/zoom-control/meson.build
++++ b/cut-n-paste/zoom-control/meson.build
+@@ -20,3 +20,9 @@ libephyzoom = static_library(
+ include_directories: include_root,
+ dependencies: zoom_deps,
+ )
++
++libephyzoom_dep = declare_dependency(
++ link_with: libephyzoom,
++ include_directories: [include_root, include_directories('.')],
++ dependencies: zoom_deps,
++)
+diff --git a/libdocument/meson.build b/libdocument/meson.build
+index 6c0d6e34..5965a582 100644
+--- a/libdocument/meson.build
++++ b/libdocument/meson.build
+@@ -121,14 +121,14 @@ libdocument_deps = [
+ gmodule,
+ gtk,
+ math,
++ libsynctex_dep,
+ ]
+
+ libdocument = library(
+ 'xreaderdocument',
+ libdocument_private_headers + libdocument_sources,
+ dependencies: libdocument_deps,
+- include_directories: [include_root, synctex_includes],
+- link_whole: [libsynctex],
++ include_directories: include_root,
+ soversion: binary_major_version,
+ version: binary_version,
+ install: true,
+@@ -137,6 +137,8 @@ libdocument = library(
+ # this is needed so targets that depend on generated headers can do so
+ libdocument_dep = declare_dependency(
+ link_with: libdocument,
++ dependencies: libdocument_deps,
++ include_directories: include_root,
+ sources: libdoc_enums[1]
+ )
+
+diff --git a/libmisc/meson.build b/libmisc/meson.build
+index 280d3b03..e0140736 100644
+--- a/libmisc/meson.build
++++ b/libmisc/meson.build
+@@ -20,3 +20,9 @@ libmisc = static_library(
+ include_directories: include_dirs,
+ dependencies: libmisc_deps,
+ )
++
++libmisc_dep = declare_dependency(
++ link_with: libmisc,
++ include_directories: include_dirs,
++ dependencies: libmisc_deps,
++)
+diff --git a/libview/meson.build b/libview/meson.build
+index b1c18504..77c7f023 100644
+--- a/libview/meson.build
++++ b/libview/meson.build
+@@ -90,6 +90,12 @@ libview = library(
+ install: true,
+ )
+
++libview_dep = declare_dependency(
++ link_with: libview,
++ include_directories: include_dirs,
++ dependencies: libview_deps,
++)
++
+ install_headers(
+ libview_headers,
+ subdir: libview_header_dir,
+diff --git a/shell/meson.build b/shell/meson.build
+index cff438b3..4060ceec 100644
+--- a/shell/meson.build
++++ b/shell/meson.build
+@@ -132,21 +132,31 @@ if get_option('enable_dbus')
+ )
+ endif
+
++libshell_deps = [
++ xreader_deps,
++ libview_dep,
++ libmisc_dep,
++ libtotemscrsaver_dep,
++ libsmclient_dep,
++ libephyzoom_dep,
++]
++
+ libshell = static_library(
+ 'shell',
+ shell_sources,
+- link_with: libview,
+- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
+- dependencies: xreader_deps,
+- include_directories: [include_dirs, cnc_includes],
++ dependencies: libshell_deps,
++ include_directories: include_dirs,
++)
++
++libshell_dep = declare_dependency(
++ link_whole: libshell, # Need the whole lib for gresource lookup
++ dependencies: libshell_deps,
++ include_directories: include_dirs,
+ )
+
+ xreader = executable(
+ 'xreader',
+ 'main.c',
+- link_with: libview,
+- link_whole: libshell,
+- dependencies: xreader_deps,
+- include_directories: [include_dirs, cnc_includes],
++ dependencies: libshell_dep,
+ install: true,
+ )
From 8b0e0a27a6fb5a59951534885df7572e4a3bad2b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Sat, 5 Aug 2023 20:57:54 +0100
Subject: [PATCH 12/12] kiwix-tools: add missing makedepend.
---
srcpkgs/kiwix-tools/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template
index 300aba74fecae..3b1f6441cb1d2 100644
--- a/srcpkgs/kiwix-tools/template
+++ b/srcpkgs/kiwix-tools/template
@@ -4,7 +4,8 @@ version=3.1.2
revision=2
build_style=meson
hostmakedepends="pkg-config"
-makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel"
+makedepends="kiwix-lib-devel zlib-devel libmicrohttpd-devel libuuid-devel
+ libcurl-devel"
short_desc="Kiwix command line tools"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Merged]: meson: update to 1.2.0.
2023-06-07 15:08 [PR PATCH] meson: update to 1.1.1 mhmdanas
` (7 preceding siblings ...)
2023-08-08 16:05 ` mhmdanas
@ 2023-08-10 3:52 ` classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-08-10 3:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]
There's a merged pull request on the void-packages repository
meson: update to 1.2.0.
https://github.com/void-linux/void-packages/pull/44306
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@paper42
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 10+ messages in thread