From 7739f17bb480b5af55b7eab9b34e81ddb94bbeb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 24 Nov 2020 00:00:56 +0700 Subject: [PATCH] vala-panel-appmenu: update to 0.7.6. --- srcpkgs/vala-panel-appmenu/template | 31 +++++++++++++---------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template index 0913a270047..2b854784fe6 100644 --- a/srcpkgs/vala-panel-appmenu/template +++ b/srcpkgs/vala-panel-appmenu/template @@ -1,13 +1,12 @@ # Template file for 'vala-panel-appmenu' pkgname=vala-panel-appmenu -version=0.7.2 -revision=2 -build_style=cmake -configure_args="-DENABLE_XFCE=ON -DENABLE_VALAPANEL=ON - -DENABLE_MATE=ON -DENABLE_JAYATANA=OFF -DENABLE_APPMENU_GTK_MODULE=ON" -hostmakedepends="pkg-config vala bamf glib-devel" +_glhash=18896e602f40b03fcb0a8437a2e197d4 +version=0.7.6 +revision=1 +build_style=meson +hostmakedepends="pkg-config vala bamf glib-devel gettext" makedepends="vala-devel bamf-devel gtk+-devel gtk+3-devel - libxkbcommon-devel libpeas-devel libdbusmenu-glib-devel cmake-vala + libxkbcommon-devel libpeas-devel libdbusmenu-glib-devel xfce4-panel-devel xfconf-devel libmate-panel-devel libXt-devel vala-panel-devel" depends="vala-panel-appmenu-data-${version}_${revision}" @@ -15,16 +14,15 @@ short_desc="Global Menu for Vala Panel" maintainer="John Eira " license="LGPL-3.0-or-later" homepage="https://gitlab.com/vala-panel-project/vala-panel-appmenu" -distfiles="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/57fe7a74b38180002154fbd6028075db/vala-panel-appmenu-${version}.tar.xz" -checksum=80884ebd71b665da7a1eac67752596ecbb29d3a8dd9eee9a2e3212dfc0aab6ae +distfiles="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/$_glhash/vala-panel-appmenu-${version}.tar.xz" +checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592 -post_install() { - if [ "$CROSS_BUILD" ]; then - mv ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/lib/gtk-2.0 \ - ${DESTDIR}/usr/lib - - mv ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/lib/gtk-3.0 \ - ${DESTDIR}/usr/lib +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 } @@ -86,7 +84,6 @@ mate-panel-appmenu_package() { vala-panel-appmenu-data_package() { short_desc+=" - common files" - archs=noarch pkg_install() { vmove usr/share/locale vmove usr/share/glib-2.0/schemas/org.valapanel.appmenu.gschema.xml