From 7fca77493697cf88f650fcd5cdfaee64c593058c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 23 Jan 2021 14:16:13 +0700 Subject: [PATCH 1/3] wrapper: valac: pass --vapidir after real arguments Due to constant change in vala, some projects includes some old and pre-generated vapi in their source tree and uses that version instead of system one. Pass system vapidir after real arguments in order to prefer its bundled vapi. --- common/hooks/pre-configure/02-script-wrapper.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index 9ca195d5a58..1cbd9df6363 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -112,9 +112,10 @@ vapigen_wrapper() { cat >>${XBPS_WRAPPERDIR}/vapigen<<_EOF #!/bin/sh exec /usr/bin/vapigen \\ + "\$@" \\ --vapidir=${XBPS_CROSS_BASE}/usr/share/vala/vapi \\ --vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\ - --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@" + --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 _EOF chmod 755 ${XBPS_WRAPPERDIR}/vapigen ln -sf vapigen ${XBPS_WRAPPERDIR}/vapigen-${_vala_version} @@ -134,9 +135,10 @@ valac_wrapper() { cat >>${XBPS_WRAPPERDIR}/valac<<_EOF #!/bin/sh exec /usr/bin/valac \\ + "\$@" \\ --vapidir=${XBPS_CROSS_BASE}/usr/share/vala/vapi \\ --vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\ - --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@" + --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 _EOF chmod 755 ${XBPS_WRAPPERDIR}/valac ln -sf valac ${XBPS_WRAPPERDIR}/valac-${_vala_version} From 323cbda2328679970bdbca609347e445fe3bd909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 23 Jan 2021 14:18:24 +0700 Subject: [PATCH 2/3] budgie-desktop: remove vapidir hack --- srcpkgs/budgie-desktop/template | 9 --------- 1 file changed, 9 deletions(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index 2cf2ddb5123..5f9833ca9cb 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -19,15 +19,6 @@ homepage="https://github.com/solus-project/budgie-desktop" distfiles="${homepage}/releases/download/v${version}/budgie-desktop-v${version}.tar.xz" checksum=d7219c1dc6d0e3fe54ac33062bfd420ab94158bcfe9409d09c85d7e7a21c67fa -pre_build() { - # budgie-desktop uses its own polkit bindings - # prepends to override system vapi - if [ -f "$XBPS_WRAPPERDIR/valac" ]; then - sed -i -e "s,/bin/valac,& --vapidir=$wrksrc/vapi," \ - "$XBPS_WRAPPERDIR/valac" - fi -} - budgie-desktop-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}-${version}_${revision}" From 9eeb2d4f017737c32464af5fa8af9e826c458ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 23 Jan 2021 14:19:02 +0700 Subject: [PATCH 3/3] vala-panel-appmenu: remove vapidir hack --- srcpkgs/vala-panel-appmenu/template | 9 --------- 1 file changed, 9 deletions(-) diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template index 2b854784fe6..198254fdf47 100644 --- a/srcpkgs/vala-panel-appmenu/template +++ b/srcpkgs/vala-panel-appmenu/template @@ -17,15 +17,6 @@ homepage="https://gitlab.com/vala-panel-project/vala-panel-appmenu" distfiles="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/$_glhash/vala-panel-appmenu-${version}.tar.xz" checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592 -pre_build() { - # vala-panel-appmenu depends on its own libxfconf-0.vapi - # prepends to override system vapi - if [ -f "$XBPS_WRAPPERDIR/valac" ]; then - sed -i -e "s,/bin/valac,& --vapidir=$wrksrc/vapi," \ - "$XBPS_WRAPPERDIR/valac" - fi -} - appmenu-gtk-module-devel_package() { short_desc="GTK module for exposing menus - development files" depends="appmenu-gtk-module-${version}_${revision}