From 09c3bdd451038b57902dc39153e30b2f68bd8bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 20:00:09 +0700 Subject: [PATCH 01/10] vala: remove noarch --- srcpkgs/vala/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index 6310bf43ccf..4250b7f044a 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -2,7 +2,7 @@ pkgname=vala # Should be kept in sync with 'valadoc' (shared distfiles) version=0.50.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-valadoc" hostmakedepends="flex libxslt pkg-config" @@ -46,7 +46,6 @@ vala-devel_package() { } vala-doc_package() { - archs=noarch depends="vala-${version}_${revision}" short_desc+=" - devhelp documentation" pkg_install() { From a183ada0a338f428814345ae151238493fa37539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 20:00:09 +0700 Subject: [PATCH 02/10] vigra: remove noarch --- srcpkgs/vigra/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template index 09ffcff4f2a..e9f949b520e 100644 --- a/srcpkgs/vigra/template +++ b/srcpkgs/vigra/template @@ -1,11 +1,11 @@ # Template file for 'vigra' pkgname=vigra version=1.11.1 -revision=5 +revision=6 wrksrc="${pkgname}-Version-${version//./-}" build_style=cmake configure_args="-DWITH_OPENEXR=1" -hostmakedepends="python" +hostmakedepends="python3" makedepends="libpng-devel tiff-devel libjpeg-turbo-devel zlib-devel fftw-devel boost-devel libopenexr-devel" short_desc="Image processing and analysis library" @@ -14,7 +14,7 @@ license="MIT" homepage="https://ukoethe.github.io/vigra/" distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz" checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e -python_version=2 #unverified +python_version=3 pre_configure() { if [ "$CROSS_BUILD" ]; then @@ -28,10 +28,11 @@ post_install() { vlicense LICENSE.txt vmkdir usr/share/$pkgname mv $DESTDIR/usr/doc $DESTDIR/usr/share/$pkgname/doc + vsed -i -e "s,/buildir/.*doc,/usr/share/$pkgname/doc," \ + $DESTDIR/usr/bin/vigra-config } vigra-doc_package() { - archs=noarch depends="vigra>=${version}_${revision}" short_desc+=" - documentation" pkg_install() { @@ -40,7 +41,8 @@ vigra-doc_package() { } vigra-devel_package() { - depends="vigra>=${version}_${revision} $makedepends" + # vigra-config is python script + depends="vigra>=${version}_${revision} $makedepends python3" short_desc+=" - development files" pkg_install() { vmove usr/bin From 548a07bf39ee8028d3e16aedaeb801bd3fb517b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 20:00:09 +0700 Subject: [PATCH 03/10] void-docs: remove noarch --- srcpkgs/void-docs/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/void-docs/template b/srcpkgs/void-docs/template index 1e9845a8621..3aa916455a8 100644 --- a/srcpkgs/void-docs/template +++ b/srcpkgs/void-docs/template @@ -1,8 +1,7 @@ # Template file for 'void-docs' pkgname=void-docs version=2020.08.18 -revision=2 -archs=noarch +revision=3 hostmakedepends="mdBook fd pandoc texlive perl perl-JSON" short_desc="Documentation for Void Linux" maintainer="Érico Nogueira " From 78439486382f17d4ee5400294c7e982b2d5d739a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 20:00:09 +0700 Subject: [PATCH 04/10] void-release-keys: remove noarch --- srcpkgs/void-release-keys/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/void-release-keys/template b/srcpkgs/void-release-keys/template index f9451a73b7b..fc6e28ec242 100644 --- a/srcpkgs/void-release-keys/template +++ b/srcpkgs/void-release-keys/template @@ -1,11 +1,10 @@ # Template file for 'void-release-keys' pkgname=void-release-keys version=1 -revision=1 -archs=noarch +revision=2 short_desc="Void Linux Release Keys" maintainer="Void Release Engineering " -license="Public domain" +license="Public Domain" homepage="http://www.voidlinux.org" do_install() { From b9cc114a220558b6f91f8f3997d9134a43569e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 20:00:09 +0700 Subject: [PATCH 05/10] void-repo-nonfree: remove noarch --- srcpkgs/void-repo-nonfree/template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/void-repo-nonfree/template b/srcpkgs/void-repo-nonfree/template index 02410a5b72a..bdab3342c5a 100644 --- a/srcpkgs/void-repo-nonfree/template +++ b/srcpkgs/void-repo-nonfree/template @@ -1,8 +1,7 @@ # Template file for 'void-repo-nonfree' pkgname=void-repo-nonfree version=9 -revision=4 -archs=noarch +revision=5 build_style=meta short_desc="Void Linux drop-in file for the nonfree repository" maintainer="Orphaned " @@ -34,7 +33,6 @@ do_install() { } void-repo-debug_package() { - archs=noarch short_desc="${short_desc/nonfree/debug}" pkg_install() { vmove usr/share/xbps.d/20-repository-debug.conf From 0ec1697d04144c1a3becb9f47c9f968eb345ac9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 20:00:10 +0700 Subject: [PATCH 06/10] void-updates: remove noarch --- srcpkgs/void-updates/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/void-updates/template b/srcpkgs/void-updates/template index 97236f068c8..ab6cd4a9625 100644 --- a/srcpkgs/void-updates/template +++ b/srcpkgs/void-updates/template @@ -1,8 +1,7 @@ # Template file for 'void-updates' pkgname=void-updates version=20190330 -revision=1 -archs=noarch +revision=2 build_style=gnu-makefile depends="git curl" short_desc="Void Linux package updates" From 618cf5e62906e42894dc4e7437fb08509d4aae1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 20:00:10 +0700 Subject: [PATCH 07/10] vpm: remove noarch --- srcpkgs/vpm/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/vpm/template b/srcpkgs/vpm/template index a1b826c402f..aecb07ba66c 100644 --- a/srcpkgs/vpm/template +++ b/srcpkgs/vpm/template @@ -1,8 +1,7 @@ # Template file for 'vpm' pkgname=vpm version=1.3 -revision=1 -archs=noarch +revision=2 short_desc="XBPS package management helper for VoidLinux" maintainer="Armin Jenewein " license="GPL-3.0-or-later" From 9513c10bb71f8a46f414e0cea11d41567e822a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 20:00:10 +0700 Subject: [PATCH 08/10] vsv: remove noarch --- srcpkgs/vsv/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/vsv/template b/srcpkgs/vsv/template index 0144340eb46..a54965bf714 100644 --- a/srcpkgs/vsv/template +++ b/srcpkgs/vsv/template @@ -1,8 +1,7 @@ # Template file for 'vsv' pkgname=vsv version=1.3.4 -revision=1 -archs=noarch +revision=2 depends="bash coreutils psmisc" short_desc="Manage and view runit services" maintainer="Dave Eddy " From 80561a99b5dbac76f4070824bb537dee27cf3b9d Mon Sep 17 00:00:00 2001 From: Joshua Kraemer Date: Sat, 7 Nov 2020 21:35:16 +0100 Subject: [PATCH 09/10] vala-panel: update to 0.5.0 Close: #26383 --- .../patches/remove-obsolete-error_h.patch | 61 ------------------- srcpkgs/vala-panel/patches/wayland.patch | 13 ++++ srcpkgs/vala-panel/template | 24 +++++--- 3 files changed, 27 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/vala-panel/patches/remove-obsolete-error_h.patch create mode 100644 srcpkgs/vala-panel/patches/wayland.patch diff --git a/srcpkgs/vala-panel/patches/remove-obsolete-error_h.patch b/srcpkgs/vala-panel/patches/remove-obsolete-error_h.patch deleted file mode 100644 index b0b5440065c..00000000000 --- a/srcpkgs/vala-panel/patches/remove-obsolete-error_h.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git applets/drawing/monitors/mem.c applets/drawing/monitors/mem.c -index 80bdc7a..cc1db92 100644 ---- applets/drawing/monitors/mem.c -+++ applets/drawing/monitors/mem.c -@@ -17,7 +17,6 @@ - */ - - #include --#include - #include - #include - -diff --git applets/drawing/monitors/monitor.c applets/drawing/monitors/monitor.c -index c84dfca..bb296e1 100644 ---- applets/drawing/monitors/monitor.c -+++ applets/drawing/monitors/monitor.c -@@ -17,7 +17,6 @@ - */ - - #include --#include - #include - #include - -diff --git applets/drawing/monitors/swap.c applets/drawing/monitors/swap.c -index 33e6b8b..be8437c 100644 ---- applets/drawing/monitors/swap.c -+++ applets/drawing/monitors/swap.c -@@ -17,7 +17,6 @@ - */ - - #include --#include - #include - #include - -diff --git applets/drawing/netmon/monitor.c applets/drawing/netmon/monitor.c -index f98b0db..e58eea7 100644 ---- applets/drawing/netmon/monitor.c -+++ applets/drawing/netmon/monitor.c -@@ -18,7 +18,6 @@ - - #include - #include --#include - #include - #include - -diff --git applets/drawing/netmon/net.c applets/drawing/netmon/net.c -index c139341..9647030 100644 ---- applets/drawing/netmon/net.c -+++ applets/drawing/netmon/net.c -@@ -18,7 +18,6 @@ - - #include - #include --#include - #include - #include - - diff --git a/srcpkgs/vala-panel/patches/wayland.patch b/srcpkgs/vala-panel/patches/wayland.patch new file mode 100644 index 00000000000..95e150c6550 --- /dev/null +++ b/srcpkgs/vala-panel/patches/wayland.patch @@ -0,0 +1,13 @@ +--- meson.build.orig 2020-11-23 23:23:28.989158257 +0700 ++++ meson.build 2020-11-23 23:24:02.056503894 +0700 +@@ -90,8 +90,8 @@ + conf_data.set('PLUGINS_DATA', applets_datadir) + conf_data.set('DATADIR', project_datadir) + conf_data.set('PROFILES_DIR', profiles_dir) +-conf_data.set('PLATFORM_X11','x11' in platforms) +-conf_data.set('PLATFORM_LAYER_SHELL','layer-shell' in platforms) ++conf_data.set('PLATFORM_X11',platforms['x11']) ++conf_data.set('PLATFORM_LAYER_SHELL',platforms['layer-shell']) + + config = configure_file(input : join_paths('util','config.h.in'), + output : 'config.h', diff --git a/srcpkgs/vala-panel/template b/srcpkgs/vala-panel/template index 86ac40b49a7..81ab10b9d2f 100644 --- a/srcpkgs/vala-panel/template +++ b/srcpkgs/vala-panel/template @@ -1,22 +1,26 @@ # Template file for 'vala-panel' pkgname=vala-panel -version=0.4.88 +_glhash=da591ffc8460b2a473e1aba3e3dcf178 +version=0.5.0 revision=1 -build_style=cmake -hostmakedepends="gettext pkg-config vala glib-devel" -makedepends="vala-devel cmake-vala gtk+3-devel" -short_desc="GTK+3 desktop panel inspired by LXPanel" -maintainer="John Eira " +build_style=meson +configure_args="$(vopt_if wayland -Dplatforms=x11,layer-shell -Dplatforms=x11)" +hostmakedepends="vala pkg-config gettext glib-devel" +makedepends="gtk+3-devel libwnck-devel $(vopt_if wayland gtk-layer-shell-devel)" +short_desc="GTK+3 desktop panel forked from LXPanel" +maintainer="Joshua Krämer " license="LGPL-3.0-or-later" homepage="https://gitlab.com/vala-panel-project/vala-panel" -distfiles="https://gitlab.com/vala-panel-project/vala-panel/uploads/c42b5fbbfb42c5889e7184f5ead03f65/vala-panel-${version}.tar.xz" -checksum=09635f557e3d52894267a66297552119e874a25f9366bf5a1eeda8cfba948462 +distfiles="https://gitlab.com/vala-panel-project/vala-panel/uploads/$_glhash/vala-panel-${version}.tar.xz" +checksum=ee3a9e000133da43b218ecd1738463c2de3f45783a5a09a11b9c263df4e233d1 -CFLAGS="-I$XBPS_CROSS_BASE/usr/include/harfbuzz" +# Package build options +build_options="wayland" +build_options_default="wayland" vala-panel-devel_package() { short_desc+=" - development files" - depends="vala-panel-${version}_${revision}" + depends="vala-panel>=${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig From 69a47ab2e5827b379d7394e85b6eb95fa8b7f52b 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 10/10] vala-panel-appmenu: update to 0.7.6. --- srcpkgs/vala-panel-appmenu/template | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template index 0913a270047..c1780d28d2e 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,8 +14,8 @@ 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 @@ -86,7 +85,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