From ac3dedcf3fa4f2b1905a01ca8ebfa084bbfe2120 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 2 Nov 2021 22:52:09 +0100 Subject: [PATCH 01/41] meson: update to 0.60.2. --- srcpkgs/meson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 6cbcd3c9e966..2ac20eb33795 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.59.4 +version=0.60.2 revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" -checksum=a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84 +checksum=64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921 # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then From 9911307b34304a8a044d1f143ed5314ec0762923 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 15:27:14 +0100 Subject: [PATCH 02/41] bijiben: remove obsolete zeitgeist support bijiben 40.0 dropped zeitgeist support --- srcpkgs/bijiben/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index 8c3e51c3fc37..604076fdb93c 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -1,14 +1,13 @@ # Template file for 'bijiben' pkgname=bijiben version=40.1 -revision=1 +revision=2 build_helper="gir" build_style=meson -configure_args="-Dzeitgeist=true" hostmakedepends="itstool pkg-config gettext glib-devel" makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel - zeitgeist-devel libhandy1-devel" -depends="desktop-file-utils tracker3 zeitgeist" + libhandy1-devel" +depends="desktop-file-utils tracker3" short_desc="Intuitive note editor with strong GNOME desktop integration" maintainer="Enno Boland " license="GPL-3.0-or-later" From 385342017e604104e354b6dee39e61aeb01e8e64 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 15:41:10 +0100 Subject: [PATCH 03/41] colord-gtk: fix building vala bindings --- srcpkgs/colord-gtk/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template index 65463f110590..634a9322dae3 100644 --- a/srcpkgs/colord-gtk/template +++ b/srcpkgs/colord-gtk/template @@ -1,10 +1,10 @@ # Template file for 'colord-gtk' pkgname=colord-gtk version=0.2.0 -revision=1 +revision=2 build_style=meson build_helper=gir -configure_args="-Dtests=false -Dvala=$(vopt_if vala true false) +configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false) -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)" hostmakedepends="pkg-config intltool glib-devel libxslt $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel) @@ -13,7 +13,7 @@ makedepends="colord-devel gtk+3-devel" short_desc="GTK support library for colord" maintainer="Orphaned " license="LGPL-2.1-or-later" -homepage="http://www.freedesktop.org/software/colord" +homepage="https://github.com/hughsie/colord-gtk" distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz" checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717 @@ -30,5 +30,8 @@ colord-gtk-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.so" vmove usr/share/gir-1.0 + if [ "$build_option_vala" ]; then + vmove usr/share/vala + fi } } From 81b181a5d45d34572a471ba6003a465cf464ffb0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 15:52:14 +0100 Subject: [PATCH 04/41] efl: drop removed configure args --- srcpkgs/efl/template | 2 -- 1 file changed, 2 deletions(-) diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 8786d5d94edf..c116523094ea 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -10,8 +10,6 @@ configure_args=" -Dnetwork-backend=none -Decore-imf-loaders-disabler=$(vopt_if ibus '' ibus,)scim -Devas-loaders-disabler=avif,$(vopt_if lottie '[]' json) - -Demotion-loaders-disabler=$(vopt_if gstreamer '' gstreamer1,)$(vopt_if vlc '' libvlc,)gstreamer,xine - -Demotion-generic-loaders-disabler=vlc -Dopengl=$(vopt_if opengl $(vopt_if gles2 es-egl full) none) $(vopt_bool elogind systemd) $(vopt_bool x11 x11) From 08e4bab1f5226b717f06d15e84fb565152ee956b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 15:59:16 +0100 Subject: [PATCH 05/41] enlightenment: drop a removed configure argument --- srcpkgs/enlightenment/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index db9c886dc920..360a0f5368e6 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -3,7 +3,7 @@ pkgname=enlightenment version=0.24.2 revision=1 build_style=meson -configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false +configure_args="--sysconfdir=/etc -Dpam=true -Dsystemd=false $(vopt_bool wayland wl)" hostmakedepends="efl pkg-config gettext $(vopt_if wayland xorg-server-xwayland)" makedepends="gettext-devel efl-devel pam-devel xkeyboard-config From 3f5d889ba0136181dffe7113b4e2850186de9400 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 16:03:04 +0100 Subject: [PATCH 06/41] epiphany: drop a removed configure option --- srcpkgs/epiphany/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index c58e2fa54ef6..0ffa06f547fe 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -4,7 +4,7 @@ version=40.2 revision=1 build_helper="gir" build_style=meson -configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled" +configure_args="-Dunit_tests=disabled" hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel From f16bcf3eaf8d8acfa9c683f8be48919fce561100 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 17:01:58 +0100 Subject: [PATCH 07/41] gnome-bluetooth: remove obsolete configure options --- srcpkgs/gnome-bluetooth/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index 83d89c0a8acb..e6861631b08d 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -4,8 +4,7 @@ version=3.34.5 revision=1 build_helper="gir" build_style=meson -configure_args="-Dicon-update=false -Dgtk_doc=false - -Dintrospection=$(vopt_if gir true false)" +configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel" makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel gvfs-devel bluez eudev-libudev-devel libcanberra-devel" From b17f99a1f48dd48b81d283c3717468d8587e4ef2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 17:02:06 +0100 Subject: [PATCH 08/41] gnome-initial-setup: remove obsolete configure options --- srcpkgs/gnome-initial-setup/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 30a4a6ed4762..075e4b86324f 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -3,8 +3,7 @@ pkgname=gnome-initial-setup version=40.4 revision=1 build_style=meson -configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled - -Dsystemd=false" +configure_args="-Dparental_controls=disabled -Dsystemd=false" hostmakedepends="pkg-config glib-devel gettext" makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel From cda71a5186e24c20068c991c1d4065ce5fed3785 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 17:02:13 +0100 Subject: [PATCH 09/41] gedit: remove obsolete configure options * gir is not optional anymore, so also removing the build option --- srcpkgs/gedit/template | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index b4e862c26ad0..e93ff8905272 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -5,12 +5,10 @@ revision=2 build_helper="gir" build_style=meson pycompile_dirs="usr/lib/gedit/plugins" -configure_args="-Dplugins=true - $(vopt_bool gir vapi) $(vopt_bool gir introspection)" -hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext - $(vopt_if gir vala)" +configure_args="-Dplugins=true" +hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala" makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel - libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')" + libpeas-devel tepl-devel python3-gobject-devel" depends="desktop-file-utils gsettings-desktop-schemas iso-codes" short_desc="Text editor for GNOME" maintainer="Enno Boland " @@ -21,9 +19,6 @@ checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691 shlib_provides="libgedit-40.0.so" python_version=3 -build_options="gir" -build_options_default="gir" - gedit-devel_package() { depends="${sourcepkg}>=${version}_${revision} gtksourceview4-devel libpeas-devel tepl-devel" @@ -31,9 +26,7 @@ gedit-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - if [ "$build_option_gir" ]; then - vmove usr/share/gedit/gir-1.0 - vmove usr/share/vala - fi + vmove usr/share/gedit/gir-1.0 + vmove usr/share/vala } } From 512a42536db494fb3c7a4a5c9e5ccb464eb95cd0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 17:02:17 +0100 Subject: [PATCH 10/41] gnome-builder: remove obsolete configure options --- srcpkgs/gnome-builder/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index a3ce20126d78..26cf768c391a 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -4,7 +4,7 @@ version=3.40.2 revision=3 build_style=meson build_helper=qemu -configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false" +configure_args="-Dhelp=true -Dnetwork_tests=false" hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext" makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel From 93265c6edd26e9136e0dcb4c7c20473d26fa117c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 17:02:34 +0100 Subject: [PATCH 11/41] NetworkManager: remove obsolete configure options --- srcpkgs/NetworkManager/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index e99d04798939..7001b27dc0e3 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -4,7 +4,7 @@ version=1.32.12 revision=1 build_style=meson build_helper="gir qemu" -configure_args="-Dpolkit_agent=true -Dsystemd_journal=false +configure_args="-Dsystemd_journal=false -Dlibaudit=no -Dovs=false -Dselinux=false -Dmodify_system=true -Dsystemdsystemunitdir=no -Dpppd=/usr/bin/pppd -Dqt=false From 1eebe94a63f45158b42bcb887756eaaa71b4d417 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 17:21:42 +0100 Subject: [PATCH 12/41] graphene: remove obsolete configure options --- srcpkgs/graphene/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template index 79b2ac2e945e..6be39623eeae 100644 --- a/srcpkgs/graphene/template +++ b/srcpkgs/graphene/template @@ -4,7 +4,7 @@ version=1.10.6 revision=3 build_style=meson build_helper="gir" -configure_args="-Dbenchmarks=false -Dinstalled_tests=false +configure_args="-Dinstalled_tests=false -Dintrospection=$(vopt_if gir enabled disabled)" hostmakedepends="pkg-config" makedepends="libglib-devel" From b72f7f1c8ddfa9409b614922dde47978e1ff9fcb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 17:31:39 +0100 Subject: [PATCH 13/41] grilo: remove obsolete configure options --- srcpkgs/grilo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template index 64bae9bd4e2f..e47ec38542a5 100644 --- a/srcpkgs/grilo/template +++ b/srcpkgs/grilo/template @@ -4,7 +4,7 @@ version=0.3.13 revision=1 build_style=meson build_helper="gir" -configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir vala) +configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala) -Denable-gtk-doc=false" hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)" makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel From fc032748d5b5b947ce8da7f36a8f65a0799969af Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 17:31:43 +0100 Subject: [PATCH 14/41] gnome-passwordsafe: fix build --- srcpkgs/gnome-passwordsafe/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template index fe91bcd9ed23..8f68cbf329f1 100644 --- a/srcpkgs/gnome-passwordsafe/template +++ b/srcpkgs/gnome-passwordsafe/template @@ -2,7 +2,7 @@ pkgname=gnome-passwordsafe version=5.0 revision=2 -wrksrc="PasswordSafe-${version}" +wrksrc="secrets-${version}-d95c00ac99eebcb548f792b2b4217fedaa901f20" build_style=meson hostmakedepends="gettext glib-devel pkg-config gobject-introspection python3-pykeepass" @@ -15,4 +15,4 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/PasswordSafe" distfiles="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${version}/PasswordSafe-${version}.tar.bz2" -checksum=ac80d9b49eba965870cfc57e989aa8ceeb82b95ac8b706342267d8039a94b983 +checksum=6c5328307517d7a96f951df45404d695eb64ce192c44e5488362b19118718449 From 4d3074e07960681836499a4ecc47316e098b40df Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 19:59:22 +0100 Subject: [PATCH 15/41] libgudev: remove obsolete configure options --- srcpkgs/libgudev/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template index 47d1b8fc365d..e7603d00ce2f 100644 --- a/srcpkgs/libgudev/template +++ b/srcpkgs/libgudev/template @@ -5,7 +5,7 @@ revision=1 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir enabled disabled) - -Dvala=$(vopt_if vala enabled disabled)" + -Dvapi=$(vopt_if vala enabled disabled)" hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)" makedepends="libglib-devel eudev-libudev-devel" short_desc="Library providing GObject bindings for libudev" From 8fd6614b321da956f24189dd398e9b01644e379c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 19:59:34 +0100 Subject: [PATCH 16/41] libfprint: remove obsolete configure options --- srcpkgs/libfprint/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template index 33ac4c2a0571..16e6b2ffa1e0 100644 --- a/srcpkgs/libfprint/template +++ b/srcpkgs/libfprint/template @@ -5,7 +5,7 @@ revision=1 wrksrc=libfprint-v$version build_style=meson build_helper="gir qemu" -configure_args="-Dudev_rules=disabled -Dx11-examples=false -Dgtk-examples=false -Ddoc=false" +configure_args="-Dudev_rules=disabled -Dgtk-examples=false -Ddoc=false" hostmakedepends="pkg-config glib-devel" makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel libgusb-devel libglib-devel" From 199a390160a4638915d9cbea5e047e9eb0bfde73 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 19:59:48 +0100 Subject: [PATCH 17/41] gst1-editing-services: remove obsolete configure options --- srcpkgs/gst1-editing-services/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index f06a4d294879..1613a7ababfd 100644 --- a/srcpkgs/gst1-editing-services/template +++ b/srcpkgs/gst1-editing-services/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname/gst1/gst}-${version}" build_style=meson build_helper="gir" -configure_args="-Dgtk_doc=disabled" +configure_args="-Ddoc=disabled" hostmakedepends="flex perl pkg-config gobject-introspection" makedepends="glib-devel gst-plugins-base1-devel gst-plugins-bad1-devel" short_desc="GStreamer 1.x Editing Services" From 6b845ba27d960e687490fc6a41c6015dc6b9731f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 20:01:59 +0100 Subject: [PATCH 18/41] gst-plugins-base1: remove obsolete configure options --- srcpkgs/gst-plugins-base1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index 3e22f2d1bf48..fc954cc96cf5 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname/1/}-${version}" build_style=meson build_helper="gir" -configure_args="-Dtremor=disabled -Dexamples=disabled -Dgtk_doc=disabled +configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled -Dcdparanoia=$(vopt_if cdparanoia enabled disabled) -Dintrospection=$(vopt_if gir enabled disabled) -Dsndio=$(vopt_if sndio enabled disabled)" From ce1aa942005aa7ff75ac195e93f1e77ccdcb7bb8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 20:02:01 +0100 Subject: [PATCH 19/41] gst-plugins-bad1: remove obsolete configure options --- srcpkgs/gst-plugins-bad1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 1157ba3e7ded..451f73cb9f55 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -5,9 +5,9 @@ revision=1 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson -configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false +configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled - -Dwasapi=disabled -Dnvenc=disabled -Dnvdec=disabled -Ddc1394=disabled + -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled From 2edd8b877030e685a687dbce576619a9e414baf9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 20:02:12 +0100 Subject: [PATCH 20/41] hexchat: remove obsolete configure options --- srcpkgs/hexchat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index 97937999bb0d..7b3bc658d5aa 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -3,7 +3,7 @@ pkgname=hexchat version=2.16.0 revision=3 build_style=meson -configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false +configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-perl=/usr/bin/perl -Dwith-python=python3 -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled" hostmakedepends="gettext pkg-config glib-devel" From 1573fbf1193fdc82976d0b1ba3d4f5c6a1e50aa9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 20:02:20 +0100 Subject: [PATCH 21/41] igt-gpu-tools: fix build with meson 0.60 --- .../patches/meson-fix-underscorify-call.patch | 36 +++++++++++++++++++ srcpkgs/igt-gpu-tools/template | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch diff --git a/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch new file mode 100644 index 000000000000..142e2fa44fb6 --- /dev/null +++ b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch @@ -0,0 +1,36 @@ +From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001 +From: Petri Latvala +Date: Thu, 28 Oct 2021 11:05:31 +0300 +Subject: [PATCH] lib/meson.build: Fix underscorify call +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +f.underscorify() is correct, f.underscorify(f) is an error that later +meson versions don't like at all. + +Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107 +Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities") +Cc: Arkadiusz Hiler +Signed-off-by: Petri Latvala +Reviewed-by: José Roberto de Souza +--- + lib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/meson.build b/lib/meson.build +index c3080fc8..297b0ad2 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', + + lib_intermediates = [] + foreach f: lib_sources +- name = f.underscorify(f) ++ name = f.underscorify() + lib = static_library('igt-' + name, + [ f, lib_version ], + include_directories: inc, +-- +GitLab + diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template index 3b222ecd18d8..3f8b4e2b6166 100644 --- a/srcpkgs/igt-gpu-tools/template +++ b/srcpkgs/igt-gpu-tools/template @@ -22,7 +22,7 @@ lib32disabled=yes archs="i686* x86_64*" if [ -z "${XBPS_CHECK_PKGS}" ]; then - configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled" + configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled" fi post_install() { From 2a6afca79a68e734840f87a1696f9669f0eca8a3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 20:54:21 +0100 Subject: [PATCH 22/41] libgweather: remove obsolete configure options --- srcpkgs/libgweather/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 6d9b85a07d04..857006ea8786 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -4,8 +4,7 @@ version=40.0 revision=1 build_style=meson build_helper="gir" -configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection) - -Dzoneinfo_dir=/usr/share/zoneinfo" +configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo" hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)" makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" depends="tzdata" From 251d541ce35594c43fb021f593de7b03ccb038cb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:04:25 +0100 Subject: [PATCH 23/41] light-locker: fix build and license --- srcpkgs/light-locker/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template index e3bb799ba171..d50c71480a33 100644 --- a/srcpkgs/light-locker/template +++ b/srcpkgs/light-locker/template @@ -1,15 +1,15 @@ # Template file for 'light-locker' pkgname=light-locker version=1.9.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config intltool glib-devel" makedepends="dbus-glib-devel gtk+3-devel libSM-devel libXScrnSaver-devel - libXxf86misc-devel elogind-devel" + libXxf86misc-devel libXxf86vm-devel elogind-devel" depends="lightdm" short_desc="Simple session-locker for lightdm" maintainer="Emanuel Serpa " -license="GPL-3" +license="GPL-2.0-or-later" homepage="https://github.com/the-cavalry/light-locker" distfiles="https://github.com/the-cavalry/light-locker/archive/v${version}.tar.gz" checksum=9915ed34b6c38f519e17902541a180b8b2d775c26edd8ed5aba024722039157c From fbf677ebe6be2526d4d7e9326a9482c05105fb93 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:19:07 +0100 Subject: [PATCH 24/41] ncmpc: disable html manual --- srcpkgs/ncmpc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template index 683ec13e85a3..a7d76aa3ce9e 100644 --- a/srcpkgs/ncmpc/template +++ b/srcpkgs/ncmpc/template @@ -1,9 +1,9 @@ # Template file for 'ncmpc' pkgname=ncmpc version=0.45 -revision=1 +revision=2 build_style=meson -configure_args="-Dlirc=disabled" +configure_args="-Dlirc=disabled -Dhtml_manual=false" hostmakedepends="pkg-config python3-Sphinx" makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel" short_desc="Ncurses-based mpd client" From 98ac505398c06e0cdb10917cb40d54ff36292241 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:22:30 +0100 Subject: [PATCH 25/41] pixman: remove obsolete configure options --- srcpkgs/pixman/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template index 456e9d1628e8..eba3b82c9fa7 100644 --- a/srcpkgs/pixman/template +++ b/srcpkgs/pixman/template @@ -5,8 +5,8 @@ revision=1 build_style=meson # gtk is only necessary for demos, disabled to avoid dependency loop # openmp is only used in demos and tests, and things still test without it -configure_args="-Dtests=enabled -Dgnu-inline-asm=enabled -Dlibpng=enabled - -Diwmmxt=disabled -Dopenmp=disabled -Dgtk=disabled" +configure_args="-Dgnu-inline-asm=enabled -Dlibpng=enabled -Diwmmxt=disabled + -Dopenmp=disabled -Dgtk=disabled" hostmakedepends="pkg-config perl" makedepends="libpng-devel" short_desc="Library of low-level pixel manipulation routines" From 9104394f1340082acdcebe45e1810a6ed07ffc82 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:33:52 +0100 Subject: [PATCH 26/41] seatd: fix configure arguments --- srcpkgs/seatd/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template index c619787ae3eb..178f1b3d8aa9 100644 --- a/srcpkgs/seatd/template +++ b/srcpkgs/seatd/template @@ -3,7 +3,8 @@ pkgname=seatd version=0.6.3 revision=1 build_style=meson -configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false" +configure_args="-Dexamples=disabled $(vopt_if elogind -Dlibseat-logind=elogind) + -Dwerror=false" hostmakedepends="pkg-config scdoc" makedepends="$(vopt_if elogind elogind-devel)" short_desc="Minimal seat management daemon" From 72a251967d8b9cfc7bca1d9aa22eea85ccfd522b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:34:04 +0100 Subject: [PATCH 27/41] spice-gtk: remove obsolete configure options --- srcpkgs/spice-gtk/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index 7218e837891f..351923f41e7f 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -7,8 +7,7 @@ build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir enabled disabled) -Dvapi=$(vopt_if vala enabled disabled) -Dsmartcard=disabled -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled - -Dcelt051=disabled -Dusb-ids-path=/usr/share/hwdata/usb.ids - -Dpulse=disabled -Dgtk_doc=disabled" + -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled" hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel spice-protocol python3-six python3-parsing perl" makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel From a03d4e00146c6abe7bda8613d6e4f7e2dc36a361 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:37:05 +0100 Subject: [PATCH 28/41] switchboard: remove obsolete configure options --- srcpkgs/switchboard/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template index 45031a8d8b76..ebb706e5d9e5 100644 --- a/srcpkgs/switchboard/template +++ b/srcpkgs/switchboard/template @@ -3,7 +3,6 @@ pkgname=switchboard version=2.3.7 revision=2 build_style=meson -configure_args="-Dlibunity=false" hostmakedepends="pkg-config vala gettext" makedepends="granite-devel clutter-gtk-devel gtk+3-devel" short_desc="Extensible System Settings app designed for elementary OS" From aa5ffdd6c4b22b80acc67e77061153f6d67ded19 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:41:37 +0100 Subject: [PATCH 29/41] cglm: update to 0.8.4, switch to meson --- srcpkgs/cglm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template index 5b553c7c0d12..05885c452520 100644 --- a/srcpkgs/cglm/template +++ b/srcpkgs/cglm/template @@ -2,7 +2,7 @@ pkgname=cglm version=0.8.4 revision=1 -build_style=cmake +build_style=meson short_desc="Highly Optimized Graphics Math (glm) for C" maintainer="Nicu Borta " license="MIT" From 6100b8add0c5abaf473e0e037ce2566eda181bca Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:56:50 +0100 Subject: [PATCH 30/41] totem: remove gir build option --- srcpkgs/totem/template | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 8871c546b50a..f80a2620b2f1 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -4,12 +4,9 @@ version=3.38.0 revision=1 build_style=meson build_helper="gir" -configure_args="-Denable-python=no -Denable-nautilus=yes - -Denable-introspection=$(vopt_if gir yes no) - -Denable-vala=$(vopt_if gir yes no)" -hostmakedepends="intltool itstool pkg-config - $(vopt_if gir vala) gstreamer1 gst-plugins-base1 gst-plugins-good1 - glib-devel" +configure_args="-Denable-python=no" +hostmakedepends="intltool itstool pkg-config gstreamer1 gst-plugins-base1 + gst-plugins-good1 glib-devel" # XXX missing lirc plugin. makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel evolution-data-server-devel gnome-desktop-devel grilo-devel gst-plugins-good1 @@ -31,16 +28,11 @@ do_check() { : } -build_options="gir" -build_options_default="gir" - libtotem_package() { short_desc+=" - runtime library" pkg_install() { vmove "usr/lib/*.so.*" - if [ "$build_option_gir" ]; then - vmove usr/lib/girepository-1.0 - fi + vmove usr/lib/girepository-1.0 } } @@ -51,8 +43,6 @@ totem-devel_package() { vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/pkgconfig - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi + vmove usr/share/gir-1.0 } } From 78eeaf649151ced7a024587572de36271dca1ed9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 21:57:22 +0100 Subject: [PATCH 31/41] tracker3: remove deprecated networkmanager option --- srcpkgs/tracker3/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template index 12ba53374733..a6f8135b77d6 100644 --- a/srcpkgs/tracker3/template +++ b/srcpkgs/tracker3/template @@ -1,16 +1,15 @@ # Template file for 'tracker3' pkgname=tracker3 version=3.0.2 -revision=2 +revision=3 wrksrc=tracker-${version} build_style=meson build_helper="gir" -configure_args="-Ddocs=false -Dman=true -Dnetwork_manager=enabled - -Dstemmer=disabled -Dsystemd_user_services=false" +configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled + -Dsystemd_user_services=false" hostmakedepends="gettext pkg-config glib-devel vala asciidoc" makedepends="dbus-devel libglib-devel icu-devel json-glib-devel - libsoup-devel libxml2-devel sqlite-devel NetworkManager-devel - bash-completion" + libsoup-devel libxml2-devel sqlite-devel bash-completion" checkdepends="tar python3-gobject" short_desc="Personal search tool and storage system" maintainer="q66 " From b27b1ae2d830dbe0a3124e9659bfb2639e17d9ee Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 22:00:29 +0100 Subject: [PATCH 32/41] tracker-miners: remove taglib configure option --- srcpkgs/tracker-miners/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template index 77802c21ea8f..9c4762cf56ca 100644 --- a/srcpkgs/tracker-miners/template +++ b/srcpkgs/tracker-miners/template @@ -6,7 +6,7 @@ build_style=meson configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled - -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled + -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled -Dbattery_detection=upower -Dcharset_detection=icu -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer @@ -16,7 +16,7 @@ makedepends="tracker-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel - libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel + libvorbis-devel poppler-glib-devel totem-pl-parser-devel upower-devel zlib-devel gst-plugins-base1-devel giflib-devel libharfbuzz" short_desc="Data miners for tracker" maintainer="Enno Boland " @@ -24,8 +24,4 @@ license="GPL-2.0-or-later" homepage="https://developer.gnome.org/libtracker-miner/stable" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" checksum=9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa - -# relies on unsupported ops in chroot -do_check() { - : -} +make_check=no # relies on unsupported ops in chroot From bcfd67c725684886fe7ce8390cbb1df148fb61e6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 22:18:35 +0100 Subject: [PATCH 33/41] tracker3-miners: remove obsolete configure options --- srcpkgs/tracker3-miners/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template index 9d266c66397f..4c752fe55add 100644 --- a/srcpkgs/tracker3-miners/template +++ b/srcpkgs/tracker3-miners/template @@ -5,20 +5,20 @@ revision=2 wrksrc=tracker-miners-${version} build_style=meson # missing libgrss for miner_rss -configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true - -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled +configure_args="-Dtracker_core=system -Dextract=true + -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dgif=enabled -Dgsf=enabled -Diptc=enabled -Diso=enabled -Djpeg=enabled - -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled -Dtaglib=enabled - -Dtiff=enabled -Dvorbis=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled + -Dpdf=enabled -Dplaylist=enabled -Dpng=enabled -Draw=enabled + -Dtiff=enabled -Dxml=enabled -Dxmp=enabled -Dxps=enabled -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer -Dsystemd_user_services=false -Dnetwork_manager=enabled" hostmakedepends="pkg-config glib-devel intltool asciidoc" -makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libflac-devel +makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel libosinfo-devel libpng-devel libseccomp-devel tiff-devel libxml2-devel - libvorbis-devel poppler-glib-devel taglib-devel totem-pl-parser-devel + poppler-glib-devel totem-pl-parser-devel upower-devel zlib-devel gst-plugins-base1-devel giflib-devel NetworkManager-devel libharfbuzz" short_desc="Data miners for tracker3" From 6f959725fbbfd5ae4e13575dc4ff7087925be327 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 14 Nov 2021 13:48:40 +0100 Subject: [PATCH 34/41] libwacom: remove obsolete configure options --- srcpkgs/libwacom/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template index c4922df7a205..b6003b1c6d3e 100644 --- a/srcpkgs/libwacom/template +++ b/srcpkgs/libwacom/template @@ -4,7 +4,7 @@ version=1.12 revision=1 build_style=meson build_helper="qemu" -configure_args="-Ddocumentation=disabled -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static" +configure_args="-Ddocumentation=disabled" hostmakedepends="pkg-config" makedepends="libgudev-devel libxml2-devel" checkdepends="python3-pytest python3-libevdev python3-pyudev" From 67154d669916e9f41196f5428473c52923096c28 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 14 Nov 2021 14:21:50 +0100 Subject: [PATCH 35/41] gnome-settings-daemon: fix build with meson 0.60 --- .../meson-fix-string-bool-comparison.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch new file mode 100644 index 000000000000..19cb682ca296 --- /dev/null +++ b/srcpkgs/gnome-settings-daemon/patches/meson-fix-string-bool-comparison.patch @@ -0,0 +1,29 @@ +From 28e28e9e598342c897ae5ca350d0da6f4aea057b Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 16 Jul 2021 16:02:36 +0200 +Subject: [PATCH] build: Fix str/bool comparison + +gnome-settings-daemon/meson.build:87: WARNING: Trying to compare values of different types (str, bool) using ==. +The result of this is undefined and will become a hard error in a future Meson release. +--- + meson.build | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index fdf71713..ba2a90ca 100644 +--- a/meson.build ++++ b/meson.build +@@ -82,9 +82,7 @@ elif gsd_buildtype.contains('release') + common_flags += ['-DG_DISABLE_CAST_CHECKS'] + endif + +-# Workaround for meson's bug +-# https://github.com/mesonbuild/meson/pull/1896 +-if get_option('b_ndebug') == true ++if get_option('b_ndebug') == 'true' + common_flags += ['-DG_DISABLE_ASSERT'] + endif + +-- +GitLab + From 1cf190f119d939f0ca80a23824ff3521baaf1af9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 14 Nov 2021 18:57:28 +0100 Subject: [PATCH 36/41] vala-panel: fix build with meson 0.60 --- .../LINGUAS-remove-a-duplicate-entry.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch diff --git a/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch new file mode 100644 index 000000000000..36548f5dab6e --- /dev/null +++ b/srcpkgs/vala-panel/patches/LINGUAS-remove-a-duplicate-entry.patch @@ -0,0 +1,19 @@ +From 52f40ce779cfa224266dd427cfe57afd83a28362 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Sun, 14 Nov 2021 17:15:55 +0100 +Subject: [PATCH] LINGUAS: remove a duplicate entry + +--- + po/LINGUAS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/LINGUAS b/po/LINGUAS +index e66ec1c..3ee3bdd 100644 +--- a/po/LINGUAS ++++ b/po/LINGUAS +@@ -1 +1 @@ +-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu ++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu +-- +2.33.1 + From 03fd08a8eed71c72972fb409f012f8ef42b66833 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 14 Nov 2021 18:59:05 +0100 Subject: [PATCH 37/41] vala-panel-appmenu: fix build with meson 0.60 --- .../LINGUAS-remove-a-duplicate-entry.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch diff --git a/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch new file mode 100644 index 000000000000..3b31ed15b1f5 --- /dev/null +++ b/srcpkgs/vala-panel-appmenu/patches/LINGUAS-remove-a-duplicate-entry.patch @@ -0,0 +1,19 @@ +From 442bcebcc00ea3a51057de0d1290593be7f9deb3 Mon Sep 17 00:00:00 2001 +From: Konstantin +Date: Wed, 27 Oct 2021 07:47:37 +0000 +Subject: [PATCH] Update LINGUAS + +--- + po/LINGUAS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/LINGUAS b/po/LINGUAS +index e66ec1c..3ee3bdd 100644 +--- a/po/LINGUAS ++++ b/po/LINGUAS +@@ -1 +1 @@ +-aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nb nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu ++aa ab ae af ak am an ar as ast av ay az ba be bg bh bi bm bn bo br bs ca ce ch ckb co cr cs cu cv cy da de dv dz ee el en_AU en_CA en_GB eo es et eu fa ff fi fj fo fr fr_CA fy ga gd gl gn gu gv ha he hi ho hr ht hu hy hz ia id ie ig ii ik io is it iu ja jv ka kg ki kj kk kl km kn ko kr ks ku kv kw ky la lb lg li ln lo lt lu lv mg mh mi mk ml mn mo mr ms mt my na nb nd ne ng nl nn nr nv ny oc oj om or os pa pi pl ps pt pt_BR qu rm rn ro ru rue rw sa sc sd se sg si sk sl sm sma sn so sq sr ss st su sv sw ta te tg th ti tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa wo xh yi yo za zh zh_CN zh_HK zh_TW zu +-- +GitLab + From 1b5d8c95d086856779b71b34b760b496fce6bbfb Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 17 Nov 2021 13:30:31 +0100 Subject: [PATCH 38/41] gitg: remove obsolete configure options --- srcpkgs/gitg/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template index 2f8f671038da..bf10d435baef 100644 --- a/srcpkgs/gitg/template +++ b/srcpkgs/gitg/template @@ -15,7 +15,3 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Gitg" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a - -if [ "$CROSS_BUILD" ]; then - configure_args+=" -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static" -fi From 85ee6099a1e032f7c0384c2c1ddbfb63b279a2a9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 17 Nov 2021 13:30:45 +0100 Subject: [PATCH 39/41] gedit: remove obsolete configure options --- srcpkgs/gedit/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index e93ff8905272..2f8b48a2199d 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -5,7 +5,6 @@ revision=2 build_helper="gir" build_style=meson pycompile_dirs="usr/lib/gedit/plugins" -configure_args="-Dplugins=true" hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala" makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel libpeas-devel tepl-devel python3-gobject-devel" From 9a8b1614edcca0f429c4395816c98c2ea3adf81d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 17 Nov 2021 13:31:59 +0100 Subject: [PATCH 40/41] gtk-vnc: fix build --- srcpkgs/gtk-vnc/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template index 46a535d1e0f3..0186c4f7c00a 100644 --- a/srcpkgs/gtk-vnc/template +++ b/srcpkgs/gtk-vnc/template @@ -5,9 +5,10 @@ revision=1 build_helper="gir" build_style=meson configure_args="-Dwith-vala=$(vopt_if gir enabled disabled)" -hostmakedepends="gettext gettext-devel glib-devel intltool libgcrypt-devel - pkg-config $(vopt_if gir vala)" -makedepends="gnutls-devel gtk+3-devel libsasl-devel $(vopt_if gir vala)" +hostmakedepends="gettext gettext-devel glib-devel intltool pkg-config + $(vopt_if gir vala)" +makedepends="gnutls-devel gtk+3-devel libsasl-devel libgcrypt-devel + $(vopt_if gir vala)" short_desc="VNC viewer widget for GTK" maintainer="Enno Boland " license="GPL-2.0-or-later" From 540b12679e21e268fd53368ee63ce33a58f2387a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 17 Nov 2021 18:16:46 +0100 Subject: [PATCH 41/41] pulseeffects-legacy: fix build --- srcpkgs/pulseeffects-legacy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template index ec5a16528474..585f25a55c8f 100644 --- a/srcpkgs/pulseeffects-legacy/template +++ b/srcpkgs/pulseeffects-legacy/template @@ -4,8 +4,8 @@ version=4.8.5 revision=3 wrksrc="easyeffects-${version}" build_style=meson -hostmakedepends="itstool pkg-config gettext" -makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel +hostmakedepends="itstool pkg-config gettext glib-devel" +makedepends="boost-devel gsettings-desktop-schemas-devel gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel pulseaudio-devel sratom-devel zita-convolver-devel libbs2b-devel libsamplerate-devel libsndfile-devel rnnoise-devel"