From 329a0132e34d5b620bca85c0ccd6df7c2317a906 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 14:45:55 +0100 Subject: [PATCH 01/11] meson: update to 0.62.0. --- srcpkgs/meson/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 1d705f560cdb8cdc2bd98a56d99001d86f794288 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:07:16 +0100 Subject: [PATCH 02/11] 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 " From f4d59cdcd6549b3703251fe4a491b17fae7be3aa Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:12:33 +0100 Subject: [PATCH 03/11] 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 " From 0afa8e72824ea710acf6886b55d3f441ec39c8f4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:21:38 +0100 Subject: [PATCH 04/11] babl: fix for meson 0.62 --- srcpkgs/babl/patches/meson-0.62.patch | 11 +++++++++++ 1 file changed, 11 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..52a6ef563127 --- /dev/null +++ b/srcpkgs/babl/patches/meson-0.62.patch @@ -0,0 +1,11 @@ +--- 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)) From c190f35aaa0f6db436804fa2057e1a1029a57f37 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:33:02 +0100 Subject: [PATCH 05/11] 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 c10ff9e73e9b2be4e5802cbc4853e1b0845da321 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 16:54:30 +0100 Subject: [PATCH 06/11] 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 " From 31df67be9c00d64025a17de4602f45547c622003 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 18:01:30 +0100 Subject: [PATCH 07/11] 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 65fae318a5780407a7a1b2a273f4b338258eff55 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 26 Mar 2022 19:03:54 +0100 Subject: [PATCH 08/11] 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 dbc6d3b3acd022f022053d555a935663a4a36514 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 09:57:24 +0200 Subject: [PATCH 09/11] 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 " From 2df09a2a968ef8456604fd1e05ac6e2b778096e0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 09:57:42 +0200 Subject: [PATCH 10/11] 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 578a5680c21904e39186e8b1a03f3708d3f5b4ad Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 27 Mar 2022 10:46:12 +0200 Subject: [PATCH 11/11] 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"