* Re: [PR REVIEW] meson: update to 0.62.0.
2022-03-27 9:31 [PR PATCH] meson: update to 0.62.0 paper42
@ 2022-03-27 11:24 ` eli-schwartz
2022-03-27 20:23 ` [PR PATCH] [Updated] " paper42
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: eli-schwartz @ 2022-03-27 11:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by eli-schwartz on void-packages repository
https://github.com/void-linux/void-packages/pull/36372#discussion_r835891930
Comment:
https://gitlab.gnome.org/GNOME/babl/-/merge_requests/45
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] meson: update to 0.62.0.
2022-03-27 9:31 [PR PATCH] meson: update to 0.62.0 paper42
2022-03-27 11:24 ` [PR REVIEW] " eli-schwartz
@ 2022-03-27 20:23 ` paper42
2022-03-27 20:24 ` [PR REVIEW] " paper42
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-03-27 20:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.62
https://github.com/void-linux/void-packages/pull/36372
meson: update to 0.62.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **WIP**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36372.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.62-36372.patch --]
[-- Type: text/x-diff, Size: 16198 bytes --]
From d67179d8925ac032700e019efe07b5cc3efdf85b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:45:55 +0100
Subject: [PATCH 01/15] meson: update to 0.62.0.
---
...me-fallback-to-gtk-update-icon-cache.patch | 26 +++++++++++++++++++
srcpkgs/meson/template | 6 ++---
2 files changed, 28 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
new file mode 100644
index 000000000000..56a3f7cf3410
--- /dev/null
+++ b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
@@ -0,0 +1,26 @@
+From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Wed, 23 Mar 2022 22:15:11 +0100
+Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
+
+Commit a0cade8f introduced a typo and wrongly check for
+gtk4-update-icon-cache twice.
+If gtk4-update-icon-cache (gtk4) is not found, look for
+gtk-update-icon-cache (gtk3) instead.
+---
+ mesonbuild/modules/gnome.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 673a781a41d..501be9ae4da 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
+ prog = state.find_program('gtk4-update-icon-cache', required=False)
+ found = isinstance(prog, build.Executable) or prog.found()
+ if not found:
+- prog = state.find_program('gtk4-update-icon-cache')
++ prog = state.find_program('gtk-update-icon-cache')
+ icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
+ script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
+ script.skip_if_destdir = True
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2f9ccaaa4691..2a4453076e8f 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
# Template file for 'meson'
pkgname=meson
-version=0.61.4
+version=0.62.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
+checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -40,8 +40,6 @@ post_install() {
vmkdir usr/share/vim/vimfiles
cp -rt ${DESTDIR}/usr/share/vim/vimfiles data/syntax-highlighting/vim/*/
- vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp
-
vcompletion data/shell-completions/bash/meson bash
vcompletion data/shell-completions/zsh/_meson zsh
}
From 6101f39d70afca00de4716ad67134866b8f4a79c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:07:16 +0100
Subject: [PATCH 02/15] accountsservice: fix for meson 0.62
---
srcpkgs/accountsservice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index c00a4077d8f7..804d57e9e421 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -6,7 +6,7 @@ build_style=meson
build_helper="gir"
configure_args="-Dsystemdsystemunitdir=no
$(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit"
+hostmakedepends="glib-devel pkg-config polkit gettext"
makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
short_desc="D-Bus interfaces for querying and manipulating user account information"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 9dbb945f874ce1ffb757304a8ea44a93a30f5ff8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:12:33 +0100
Subject: [PATCH 03/15] atomix: fix for meson 0.62
---
srcpkgs/atomix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index a59e134ebd91..31f34e1efc59 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -3,7 +3,7 @@ pkgname=atomix
version=3.34.0
revision=1
build_style=meson
-hostmakedepends="glib-devel itstool pkg-config"
+hostmakedepends="glib-devel itstool pkg-config gettext"
makedepends="libgnome-games-support-devel"
short_desc="GNOME puzzle game where you build molecules"
maintainer="Orphaned <orphan@voidlinux.org>"
From 4cdd08a4304608cd02efa000c886be3f72e23cde Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:21:38 +0100
Subject: [PATCH 04/15] babl: fix for meson 0.62
---
srcpkgs/babl/patches/meson-0.62.patch | 33 +++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/babl/patches/meson-0.62.patch
diff --git a/srcpkgs/babl/patches/meson-0.62.patch b/srcpkgs/babl/patches/meson-0.62.patch
new file mode 100644
index 000000000000..a105c98cb0db
--- /dev/null
+++ b/srcpkgs/babl/patches/meson-0.62.patch
@@ -0,0 +1,33 @@
+From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 13 Mar 2022 20:26:05 -0400
+Subject: [PATCH] meson: fix misspelled kwarg name
+
+set10 doesn't have a `Description` kwarg, it does have a `description`
+kwarg though.
+
+This caused the conf variable to not have a description when it should
+have one, and newer versions of Meson with better argument validation
+error out with:
+
+meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description"
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 55054f441..8c93be9d1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,7 @@ lib_name = meson.project_name() + '-' + api_version
+ stability_version_number = (major_version != 0 ? minor_version : micro_version)
+ stable = (stability_version_number % 2 == 0)
+
+-conf.set10('BABL_UNSTABLE', not stable, Description:
++conf.set10('BABL_UNSTABLE', not stable, description:
+ 'Define to 1 if this is an unstable version of BABL.')
+
+ conf.set ('BABL_MAJOR_VERSION', '@0@'.format(major_version))
+--
+GitLab
+
From d3794ba4e503214f4f8c99bc5e6008224337b3b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:33:02 +0100
Subject: [PATCH 05/15] cawbird: fix for meson 0.62
---
srcpkgs/cawbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index a307ed212e54..85c5d621bcc0 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -3,7 +3,7 @@ pkgname=cawbird
version=1.3.2
revision=2
build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
sqlite-devel"
From 9f8343076c092d24e2f766e27d1a9ecaf8afdd26 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:54:30 +0100
Subject: [PATCH 06/15] clipped: fix for meson 0.62
---
srcpkgs/clipped/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clipped/template b/srcpkgs/clipped/template
index 3ced5834bfc8..9386038b3f42 100644
--- a/srcpkgs/clipped/template
+++ b/srcpkgs/clipped/template
@@ -3,7 +3,7 @@ pkgname=clipped
version=1.1.1
revision=1
build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
makedepends="libgee08-devel libXtst-devel sqlite-devel gtk+3-devel"
short_desc="Clipboard manager"
maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
From 85598f5cf656fd0dd7999a7364f1a74769b60b45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 18:01:30 +0100
Subject: [PATCH 07/15] eolie: fix for meson 0.62
---
srcpkgs/eolie/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 52c0f08d2f45..d709b2c7cfce 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -6,7 +6,7 @@ _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
build_style=meson
pycompile_module="eolie"
hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config
- gobject-introspection python3-MarkupSafe"
+ gobject-introspection python3-MarkupSafe gettext"
makedepends="gtk+3-devel libglib-devel python3-gobject-devel webkit2gtk-devel"
depends="gtkspell3 python3-dateutil python3-gobject webkit2gtk python3-PyFxA"
short_desc="Web browser for GNOME"
From 026a4c4feb079b183370adec723e92583a62a2b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 19:03:54 +0100
Subject: [PATCH 08/15] gamehub: fix for meson 0.62
---
srcpkgs/gamehub/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index e8f110b3eb8d..7e8b35ef9af0 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -4,7 +4,7 @@ version=0.16.1
revision=1
wrksrc="GameHub-${version}-2-master"
build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
libgee08-devel libsoup-devel sqlite-devel libxml2-devel polkit-devel
libmanette-devel libX11-devel libXtst-devel"
From b0eb5e8bb5434364390d097b6ec82b10f96637b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:24 +0200
Subject: [PATCH 09/15] gnome-multi-writer: fix for meson 0.62
---
srcpkgs/gnome-multi-writer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-multi-writer/template b/srcpkgs/gnome-multi-writer/template
index 7d0e5085a6ab..cc21737d0601 100644
--- a/srcpkgs/gnome-multi-writer/template
+++ b/srcpkgs/gnome-multi-writer/template
@@ -4,7 +4,7 @@ version=3.32.1
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="docbook2mdoc glib-devel pkg-config polkit"
+hostmakedepends="docbook2mdoc glib-devel pkg-config polkit gettext"
makedepends="gtk+3-devel libgusb-devel udisks2-devel polkit-devel libcanberra-devel"
short_desc="Writes ISO files to multiple USB devices at once"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 1900a258f1c7d2672d6bf88dc6d0c54c86067106 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 10:46:12 +0200
Subject: [PATCH 10/15] gnome-passbook: fix for meson 0.62
---
srcpkgs/gnome-passbook/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 7348a1944502..30cd8e93b721 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -5,7 +5,7 @@ revision=3
_release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
wrksrc="passbook-${version}"
build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
makedepends="gobject-introspection gtk+3-devel libglib-devel"
depends="python3-pykeepass python3-gobject gtk+3"
short_desc="Password manager for GNOME"
From b08f422f190582206928d08806364d5ab33e07e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:42 +0200
Subject: [PATCH 11/15] gnome-power-manager: fix for meson 0.62
---
srcpkgs/gnome-power-manager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 58422cd9da3b..0c3c1ff4306c 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -3,7 +3,7 @@ pkgname=gnome-power-manager
version=3.32.0
revision=1
build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
makedepends="gtk+3-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme upower"
short_desc="GNOME power management tool"
From 06c0cf741d1996225c6c4520954da589047058b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 14:17:00 +0200
Subject: [PATCH 12/15] gupnp-tools: update to 0.10.0.
---
srcpkgs/gupnp-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 09507922f46c..cad194d50f86 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -3,7 +3,7 @@ pkgname=gupnp-tools
version=0.10.0
revision=2
build_style=meson
-hostmakedepends="pkg-config glib-devel gobject-introspection"
+hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel
libxml2-devel libsoup-devel"
short_desc="Free replacements of Intel UPnP tools that use GUPnP"
From 35b9903a7b3aa62b656152983d65b92529c8dd26 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:58 +0200
Subject: [PATCH 13/15] io.elementary.icons: update to 6.1.0.
---
srcpkgs/io.elementary.icons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index 95dbc0ca3ddb..1e1945d0bb73 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -4,7 +4,7 @@ version=6.1.0
revision=1
wrksrc="icons-${version}"
build_style=meson
-hostmakedepends="xcursorgen librsvg-utils"
+hostmakedepends="xcursorgen librsvg-utils gettext"
# gdk-pixbuf needs librsvg to render SVG icons
depends="librsvg"
short_desc="Named, vector icons for elementary OS"
From 8f397f92b041162c8c86dedde4fd8cd73002bec7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:34:06 +0200
Subject: [PATCH 14/15] quickDocs: update to 2.2.6.
---
srcpkgs/quickDocs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index c4a22e6bbe7d..b2cbb667c8d1 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -3,7 +3,7 @@ pkgname=quickDocs
version=2.2.6
revision=2
build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"
short_desc="Fast developer docs reader"
maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
From 076a9510adcb2e178242006bdccf72dc5a9e18ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:51 +0200
Subject: [PATCH 15/15] rygel: update to 0.40.2.
---
srcpkgs/rygel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 06c85e2bcf4e..1493b825a564 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -6,7 +6,7 @@ build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false
-Dsystemd-user-units-dir=none"
-hostmakedepends="pkg-config glib-devel vala docbook2x"
+hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel
gupnp-av-devel gupnp-dlna-devel tracker3-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel"
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR REVIEW] meson: update to 0.62.0.
2022-03-27 9:31 [PR PATCH] meson: update to 0.62.0 paper42
2022-03-27 11:24 ` [PR REVIEW] " eli-schwartz
2022-03-27 20:23 ` [PR PATCH] [Updated] " paper42
@ 2022-03-27 20:24 ` paper42
2022-03-27 20:25 ` [PR PATCH] [Updated] " paper42
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-03-27 20:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36372#discussion_r835957757
Comment:
patch imported, thanks
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] meson: update to 0.62.0.
2022-03-27 9:31 [PR PATCH] meson: update to 0.62.0 paper42
` (2 preceding siblings ...)
2022-03-27 20:24 ` [PR REVIEW] " paper42
@ 2022-03-27 20:25 ` paper42
2022-04-06 17:01 ` paper42
2022-04-06 17:02 ` [PR PATCH] [Merged]: " paper42
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-03-27 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.62
https://github.com/void-linux/void-packages/pull/36372
meson: update to 0.62.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **WIP**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36372.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.62-36372.patch --]
[-- Type: text/x-diff, Size: 16204 bytes --]
From d67179d8925ac032700e019efe07b5cc3efdf85b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:45:55 +0100
Subject: [PATCH 01/15] meson: update to 0.62.0.
---
...me-fallback-to-gtk-update-icon-cache.patch | 26 +++++++++++++++++++
srcpkgs/meson/template | 6 ++---
2 files changed, 28 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
new file mode 100644
index 000000000000..56a3f7cf3410
--- /dev/null
+++ b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
@@ -0,0 +1,26 @@
+From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Wed, 23 Mar 2022 22:15:11 +0100
+Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
+
+Commit a0cade8f introduced a typo and wrongly check for
+gtk4-update-icon-cache twice.
+If gtk4-update-icon-cache (gtk4) is not found, look for
+gtk-update-icon-cache (gtk3) instead.
+---
+ mesonbuild/modules/gnome.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 673a781a41d..501be9ae4da 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
+ prog = state.find_program('gtk4-update-icon-cache', required=False)
+ found = isinstance(prog, build.Executable) or prog.found()
+ if not found:
+- prog = state.find_program('gtk4-update-icon-cache')
++ prog = state.find_program('gtk-update-icon-cache')
+ icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
+ script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
+ script.skip_if_destdir = True
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2f9ccaaa4691..2a4453076e8f 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
# Template file for 'meson'
pkgname=meson
-version=0.61.4
+version=0.62.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
+checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -40,8 +40,6 @@ post_install() {
vmkdir usr/share/vim/vimfiles
cp -rt ${DESTDIR}/usr/share/vim/vimfiles data/syntax-highlighting/vim/*/
- vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp
-
vcompletion data/shell-completions/bash/meson bash
vcompletion data/shell-completions/zsh/_meson zsh
}
From 6101f39d70afca00de4716ad67134866b8f4a79c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:07:16 +0100
Subject: [PATCH 02/15] accountsservice: fix for meson 0.62
---
srcpkgs/accountsservice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index c00a4077d8f7..804d57e9e421 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -6,7 +6,7 @@ build_style=meson
build_helper="gir"
configure_args="-Dsystemdsystemunitdir=no
$(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit"
+hostmakedepends="glib-devel pkg-config polkit gettext"
makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
short_desc="D-Bus interfaces for querying and manipulating user account information"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 9dbb945f874ce1ffb757304a8ea44a93a30f5ff8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:12:33 +0100
Subject: [PATCH 03/15] atomix: fix for meson 0.62
---
srcpkgs/atomix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index a59e134ebd91..31f34e1efc59 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -3,7 +3,7 @@ pkgname=atomix
version=3.34.0
revision=1
build_style=meson
-hostmakedepends="glib-devel itstool pkg-config"
+hostmakedepends="glib-devel itstool pkg-config gettext"
makedepends="libgnome-games-support-devel"
short_desc="GNOME puzzle game where you build molecules"
maintainer="Orphaned <orphan@voidlinux.org>"
From 4cdd08a4304608cd02efa000c886be3f72e23cde Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:21:38 +0100
Subject: [PATCH 04/15] babl: fix for meson 0.62
---
srcpkgs/babl/patches/meson-0.62.patch | 33 +++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/babl/patches/meson-0.62.patch
diff --git a/srcpkgs/babl/patches/meson-0.62.patch b/srcpkgs/babl/patches/meson-0.62.patch
new file mode 100644
index 000000000000..a105c98cb0db
--- /dev/null
+++ b/srcpkgs/babl/patches/meson-0.62.patch
@@ -0,0 +1,33 @@
+From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 13 Mar 2022 20:26:05 -0400
+Subject: [PATCH] meson: fix misspelled kwarg name
+
+set10 doesn't have a `Description` kwarg, it does have a `description`
+kwarg though.
+
+This caused the conf variable to not have a description when it should
+have one, and newer versions of Meson with better argument validation
+error out with:
+
+meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description"
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 55054f441..8c93be9d1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,7 @@ lib_name = meson.project_name() + '-' + api_version
+ stability_version_number = (major_version != 0 ? minor_version : micro_version)
+ stable = (stability_version_number % 2 == 0)
+
+-conf.set10('BABL_UNSTABLE', not stable, Description:
++conf.set10('BABL_UNSTABLE', not stable, description:
+ 'Define to 1 if this is an unstable version of BABL.')
+
+ conf.set ('BABL_MAJOR_VERSION', '@0@'.format(major_version))
+--
+GitLab
+
From d3794ba4e503214f4f8c99bc5e6008224337b3b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:33:02 +0100
Subject: [PATCH 05/15] cawbird: fix for meson 0.62
---
srcpkgs/cawbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index a307ed212e54..85c5d621bcc0 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -3,7 +3,7 @@ pkgname=cawbird
version=1.3.2
revision=2
build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
sqlite-devel"
From 9f8343076c092d24e2f766e27d1a9ecaf8afdd26 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:54:30 +0100
Subject: [PATCH 06/15] clipped: fix for meson 0.62
---
srcpkgs/clipped/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clipped/template b/srcpkgs/clipped/template
index 3ced5834bfc8..9386038b3f42 100644
--- a/srcpkgs/clipped/template
+++ b/srcpkgs/clipped/template
@@ -3,7 +3,7 @@ pkgname=clipped
version=1.1.1
revision=1
build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
makedepends="libgee08-devel libXtst-devel sqlite-devel gtk+3-devel"
short_desc="Clipboard manager"
maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
From 85598f5cf656fd0dd7999a7364f1a74769b60b45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 18:01:30 +0100
Subject: [PATCH 07/15] eolie: fix for meson 0.62
---
srcpkgs/eolie/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 52c0f08d2f45..d709b2c7cfce 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -6,7 +6,7 @@ _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
build_style=meson
pycompile_module="eolie"
hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config
- gobject-introspection python3-MarkupSafe"
+ gobject-introspection python3-MarkupSafe gettext"
makedepends="gtk+3-devel libglib-devel python3-gobject-devel webkit2gtk-devel"
depends="gtkspell3 python3-dateutil python3-gobject webkit2gtk python3-PyFxA"
short_desc="Web browser for GNOME"
From 026a4c4feb079b183370adec723e92583a62a2b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 19:03:54 +0100
Subject: [PATCH 08/15] gamehub: fix for meson 0.62
---
srcpkgs/gamehub/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index e8f110b3eb8d..7e8b35ef9af0 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -4,7 +4,7 @@ version=0.16.1
revision=1
wrksrc="GameHub-${version}-2-master"
build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
libgee08-devel libsoup-devel sqlite-devel libxml2-devel polkit-devel
libmanette-devel libX11-devel libXtst-devel"
From b0eb5e8bb5434364390d097b6ec82b10f96637b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:24 +0200
Subject: [PATCH 09/15] gnome-multi-writer: fix for meson 0.62
---
srcpkgs/gnome-multi-writer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-multi-writer/template b/srcpkgs/gnome-multi-writer/template
index 7d0e5085a6ab..cc21737d0601 100644
--- a/srcpkgs/gnome-multi-writer/template
+++ b/srcpkgs/gnome-multi-writer/template
@@ -4,7 +4,7 @@ version=3.32.1
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="docbook2mdoc glib-devel pkg-config polkit"
+hostmakedepends="docbook2mdoc glib-devel pkg-config polkit gettext"
makedepends="gtk+3-devel libgusb-devel udisks2-devel polkit-devel libcanberra-devel"
short_desc="Writes ISO files to multiple USB devices at once"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 1900a258f1c7d2672d6bf88dc6d0c54c86067106 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 10:46:12 +0200
Subject: [PATCH 10/15] gnome-passbook: fix for meson 0.62
---
srcpkgs/gnome-passbook/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 7348a1944502..30cd8e93b721 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -5,7 +5,7 @@ revision=3
_release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
wrksrc="passbook-${version}"
build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
makedepends="gobject-introspection gtk+3-devel libglib-devel"
depends="python3-pykeepass python3-gobject gtk+3"
short_desc="Password manager for GNOME"
From b08f422f190582206928d08806364d5ab33e07e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:42 +0200
Subject: [PATCH 11/15] gnome-power-manager: fix for meson 0.62
---
srcpkgs/gnome-power-manager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 58422cd9da3b..0c3c1ff4306c 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -3,7 +3,7 @@ pkgname=gnome-power-manager
version=3.32.0
revision=1
build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
makedepends="gtk+3-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme upower"
short_desc="GNOME power management tool"
From 915a80049577c76bbbfbcf5a92c551dc30472853 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 14:17:00 +0200
Subject: [PATCH 12/15] gupnp-tools: fix for meson 0.62
---
srcpkgs/gupnp-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 09507922f46c..cad194d50f86 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -3,7 +3,7 @@ pkgname=gupnp-tools
version=0.10.0
revision=2
build_style=meson
-hostmakedepends="pkg-config glib-devel gobject-introspection"
+hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel
libxml2-devel libsoup-devel"
short_desc="Free replacements of Intel UPnP tools that use GUPnP"
From 3fa987dca6d6db0e7906c482b978c924c5638a55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:58 +0200
Subject: [PATCH 13/15] io.elementary.icons: fix for meson 0.62
---
srcpkgs/io.elementary.icons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index 95dbc0ca3ddb..1e1945d0bb73 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -4,7 +4,7 @@ version=6.1.0
revision=1
wrksrc="icons-${version}"
build_style=meson
-hostmakedepends="xcursorgen librsvg-utils"
+hostmakedepends="xcursorgen librsvg-utils gettext"
# gdk-pixbuf needs librsvg to render SVG icons
depends="librsvg"
short_desc="Named, vector icons for elementary OS"
From dc33c2909fb895ff4ebd4149daa02a882218866d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:34:06 +0200
Subject: [PATCH 14/15] quickDocs: fix for meson 0.62
---
srcpkgs/quickDocs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index c4a22e6bbe7d..b2cbb667c8d1 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -3,7 +3,7 @@ pkgname=quickDocs
version=2.2.6
revision=2
build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"
short_desc="Fast developer docs reader"
maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
From 939c6216a6f886d5f59642f958563a0f3160ae8c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:51 +0200
Subject: [PATCH 15/15] rygel: fix for meson 0.62
---
srcpkgs/rygel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 06c85e2bcf4e..1493b825a564 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -6,7 +6,7 @@ build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false
-Dsystemd-user-units-dir=none"
-hostmakedepends="pkg-config glib-devel vala docbook2x"
+hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel
gupnp-av-devel gupnp-dlna-devel tracker3-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel"
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] meson: update to 0.62.0.
2022-03-27 9:31 [PR PATCH] meson: update to 0.62.0 paper42
` (3 preceding siblings ...)
2022-03-27 20:25 ` [PR PATCH] [Updated] " paper42
@ 2022-04-06 17:01 ` paper42
2022-04-06 17:02 ` [PR PATCH] [Merged]: " paper42
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-04-06 17:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.62
https://github.com/void-linux/void-packages/pull/36372
meson: update to 0.62.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **WIP**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36372.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.62-36372.patch --]
[-- Type: text/x-diff, Size: 14429 bytes --]
From eb5b0765a88ae6d02dc562a21c49f91f97db3c88 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:45:55 +0100
Subject: [PATCH 01/15] meson: update to 0.62.0.
---
srcpkgs/meson/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index adfa2d52f7ab..2a4453076e8f 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
# Template file for 'meson'
pkgname=meson
-version=0.61.4
-revision=2
+version=0.62.0
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
+checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -40,8 +40,6 @@ post_install() {
vmkdir usr/share/vim/vimfiles
cp -rt ${DESTDIR}/usr/share/vim/vimfiles data/syntax-highlighting/vim/*/
- vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp
-
vcompletion data/shell-completions/bash/meson bash
vcompletion data/shell-completions/zsh/_meson zsh
}
From a6dc739c0e32f34591fd2cf6ca36579b2d468607 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:07:16 +0100
Subject: [PATCH 02/15] accountsservice: fix for meson 0.62
---
srcpkgs/accountsservice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index c00a4077d8f7..804d57e9e421 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -6,7 +6,7 @@ build_style=meson
build_helper="gir"
configure_args="-Dsystemdsystemunitdir=no
$(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit"
+hostmakedepends="glib-devel pkg-config polkit gettext"
makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
short_desc="D-Bus interfaces for querying and manipulating user account information"
maintainer="Enno Boland <gottox@voidlinux.org>"
From e2b0aa90acd2db4a092a7275f7e2c223497bff55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:12:33 +0100
Subject: [PATCH 03/15] atomix: fix for meson 0.62
---
srcpkgs/atomix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index a59e134ebd91..31f34e1efc59 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -3,7 +3,7 @@ pkgname=atomix
version=3.34.0
revision=1
build_style=meson
-hostmakedepends="glib-devel itstool pkg-config"
+hostmakedepends="glib-devel itstool pkg-config gettext"
makedepends="libgnome-games-support-devel"
short_desc="GNOME puzzle game where you build molecules"
maintainer="Orphaned <orphan@voidlinux.org>"
From ebdc57f0727d924c46dbf984092ff313c098e2f5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:21:38 +0100
Subject: [PATCH 04/15] babl: fix for meson 0.62
---
srcpkgs/babl/patches/meson-0.62.patch | 33 +++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/babl/patches/meson-0.62.patch
diff --git a/srcpkgs/babl/patches/meson-0.62.patch b/srcpkgs/babl/patches/meson-0.62.patch
new file mode 100644
index 000000000000..a105c98cb0db
--- /dev/null
+++ b/srcpkgs/babl/patches/meson-0.62.patch
@@ -0,0 +1,33 @@
+From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 13 Mar 2022 20:26:05 -0400
+Subject: [PATCH] meson: fix misspelled kwarg name
+
+set10 doesn't have a `Description` kwarg, it does have a `description`
+kwarg though.
+
+This caused the conf variable to not have a description when it should
+have one, and newer versions of Meson with better argument validation
+error out with:
+
+meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description"
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 55054f441..8c93be9d1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,7 @@ lib_name = meson.project_name() + '-' + api_version
+ stability_version_number = (major_version != 0 ? minor_version : micro_version)
+ stable = (stability_version_number % 2 == 0)
+
+-conf.set10('BABL_UNSTABLE', not stable, Description:
++conf.set10('BABL_UNSTABLE', not stable, description:
+ 'Define to 1 if this is an unstable version of BABL.')
+
+ conf.set ('BABL_MAJOR_VERSION', '@0@'.format(major_version))
+--
+GitLab
+
From dba94703b58f94087b8edb3b4a899f2632b62af5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:33:02 +0100
Subject: [PATCH 05/15] cawbird: fix for meson 0.62
---
srcpkgs/cawbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index a307ed212e54..85c5d621bcc0 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -3,7 +3,7 @@ pkgname=cawbird
version=1.3.2
revision=2
build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
sqlite-devel"
From 192aa8a51f7afb871f25e41c2e9a92905fd4b908 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:54:30 +0100
Subject: [PATCH 06/15] clipped: fix for meson 0.62
---
srcpkgs/clipped/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clipped/template b/srcpkgs/clipped/template
index 3ced5834bfc8..9386038b3f42 100644
--- a/srcpkgs/clipped/template
+++ b/srcpkgs/clipped/template
@@ -3,7 +3,7 @@ pkgname=clipped
version=1.1.1
revision=1
build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
makedepends="libgee08-devel libXtst-devel sqlite-devel gtk+3-devel"
short_desc="Clipboard manager"
maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
From 97e7420a7ae77938a4d685cd060217746784afab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 18:01:30 +0100
Subject: [PATCH 07/15] eolie: fix for meson 0.62
---
srcpkgs/eolie/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 52c0f08d2f45..d709b2c7cfce 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -6,7 +6,7 @@ _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
build_style=meson
pycompile_module="eolie"
hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config
- gobject-introspection python3-MarkupSafe"
+ gobject-introspection python3-MarkupSafe gettext"
makedepends="gtk+3-devel libglib-devel python3-gobject-devel webkit2gtk-devel"
depends="gtkspell3 python3-dateutil python3-gobject webkit2gtk python3-PyFxA"
short_desc="Web browser for GNOME"
From 2f9893cca8d9497531e73c2af121b23c607de759 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 19:03:54 +0100
Subject: [PATCH 08/15] gamehub: fix for meson 0.62
---
srcpkgs/gamehub/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index e8f110b3eb8d..7e8b35ef9af0 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -4,7 +4,7 @@ version=0.16.1
revision=1
wrksrc="GameHub-${version}-2-master"
build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
libgee08-devel libsoup-devel sqlite-devel libxml2-devel polkit-devel
libmanette-devel libX11-devel libXtst-devel"
From b2cc876b09b7a0078cbfa072393b990f5a3c8cfd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:24 +0200
Subject: [PATCH 09/15] gnome-multi-writer: fix for meson 0.62
---
srcpkgs/gnome-multi-writer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-multi-writer/template b/srcpkgs/gnome-multi-writer/template
index 7d0e5085a6ab..cc21737d0601 100644
--- a/srcpkgs/gnome-multi-writer/template
+++ b/srcpkgs/gnome-multi-writer/template
@@ -4,7 +4,7 @@ version=3.32.1
revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="docbook2mdoc glib-devel pkg-config polkit"
+hostmakedepends="docbook2mdoc glib-devel pkg-config polkit gettext"
makedepends="gtk+3-devel libgusb-devel udisks2-devel polkit-devel libcanberra-devel"
short_desc="Writes ISO files to multiple USB devices at once"
maintainer="Enno Boland <gottox@voidlinux.org>"
From edd3909cdb56bd0e55ffd74c615b523ec4b03439 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 10:46:12 +0200
Subject: [PATCH 10/15] gnome-passbook: fix for meson 0.62
---
srcpkgs/gnome-passbook/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 7348a1944502..30cd8e93b721 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -5,7 +5,7 @@ revision=3
_release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
wrksrc="passbook-${version}"
build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
makedepends="gobject-introspection gtk+3-devel libglib-devel"
depends="python3-pykeepass python3-gobject gtk+3"
short_desc="Password manager for GNOME"
From 2e6f4ce6880bf85af92b824803caa8905c07068c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:42 +0200
Subject: [PATCH 11/15] gnome-power-manager: fix for meson 0.62
---
srcpkgs/gnome-power-manager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 58422cd9da3b..0c3c1ff4306c 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -3,7 +3,7 @@ pkgname=gnome-power-manager
version=3.32.0
revision=1
build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
makedepends="gtk+3-devel upower-devel"
depends="desktop-file-utils hicolor-icon-theme upower"
short_desc="GNOME power management tool"
From 5ea25ad5e910d5b9ce8cc7be1dfd3e54cd954ae4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 14:17:00 +0200
Subject: [PATCH 12/15] gupnp-tools: fix for meson 0.62
---
srcpkgs/gupnp-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 09507922f46c..cad194d50f86 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -3,7 +3,7 @@ pkgname=gupnp-tools
version=0.10.0
revision=2
build_style=meson
-hostmakedepends="pkg-config glib-devel gobject-introspection"
+hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel
libxml2-devel libsoup-devel"
short_desc="Free replacements of Intel UPnP tools that use GUPnP"
From 249ccb435febe9f0a5ab883c0a628714ec6673d2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:58 +0200
Subject: [PATCH 13/15] io.elementary.icons: fix for meson 0.62
---
srcpkgs/io.elementary.icons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index 95dbc0ca3ddb..1e1945d0bb73 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -4,7 +4,7 @@ version=6.1.0
revision=1
wrksrc="icons-${version}"
build_style=meson
-hostmakedepends="xcursorgen librsvg-utils"
+hostmakedepends="xcursorgen librsvg-utils gettext"
# gdk-pixbuf needs librsvg to render SVG icons
depends="librsvg"
short_desc="Named, vector icons for elementary OS"
From 935eee326369ad5ec3012f5dc40093dc4ae59a36 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:34:06 +0200
Subject: [PATCH 14/15] quickDocs: fix for meson 0.62
---
srcpkgs/quickDocs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index c4a22e6bbe7d..b2cbb667c8d1 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -3,7 +3,7 @@ pkgname=quickDocs
version=2.2.6
revision=2
build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"
short_desc="Fast developer docs reader"
maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
From 34ce8314477588adcb1e9361c0edc59c17a698b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:51 +0200
Subject: [PATCH 15/15] rygel: fix for meson 0.62
---
srcpkgs/rygel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 06c85e2bcf4e..1493b825a564 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -6,7 +6,7 @@ build_style=meson
build_helper="gir"
configure_args="-Dexamples=false -Dtests=false
-Dsystemd-user-units-dir=none"
-hostmakedepends="pkg-config glib-devel vala docbook2x"
+hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel
gupnp-av-devel gupnp-dlna-devel tracker3-devel
libmediaart-devel gssdp-devel gst1-editing-services-devel"
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Merged]: meson: update to 0.62.0.
2022-03-27 9:31 [PR PATCH] meson: update to 0.62.0 paper42
` (4 preceding siblings ...)
2022-04-06 17:01 ` paper42
@ 2022-04-06 17:02 ` paper42
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2022-04-06 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1080 bytes --]
There's a merged pull request on the void-packages repository
meson: update to 0.62.0.
https://github.com/void-linux/void-packages/pull/36372
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **WIP**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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] 7+ messages in thread