From 86e541d825e9eac6505e034444d33c3033cf27b1 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:52:43 +0100
Subject: [PATCH] libhandy: adopt, various improvements

* enable tests
* install demo to libhandy-demo
* fix license
* combine vala and gir build options
---
 srcpkgs/libhandy-demo     |  1 +
 srcpkgs/libhandy/template | 36 +++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/libhandy-demo

diff --git a/srcpkgs/libhandy-demo b/srcpkgs/libhandy-demo
new file mode 120000
index 00000000000..a94d500bb81
--- /dev/null
+++ b/srcpkgs/libhandy-demo
@@ -0,0 +1 @@
+libhandy
\ No newline at end of file
diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index c19c3897efa..796cd46e735 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -1,26 +1,26 @@
 # Template file for 'libhandy'
 pkgname=libhandy
 version=0.0.13
-revision=2
+revision=3
 wrksrc="libhandy-v${version}"
 build_style=meson
 build_helper="gir"
-# tests need X anyway, so no need to build them
-configure_args="-Dexamples=false -Dtests=false $(vopt_bool vala vapi)
- -Dglade_catalog=$(vopt_if glade enabled disabled)
+configure_args="-Dexamples=true -Dtests=true
+ $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
-short_desc="Library full of GTK+ widgets for mobile phones"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
+checkdepends="xvfb-run"
+short_desc="GTK+3 building blocks for modern adaptive applications"
+maintainer="Paper <paper@tilde.institute>"
+license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy"
-distfiles="$homepage/-/archive/v${version}/libhandy-v${version}.tar.gz"
+distfiles="https://gitlab.gnome.org/GNOME/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
 checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f
 
-build_options="gir vala glade"
+build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"
-build_options_default="gir vala glade"
+build_options_default="gir glade"
 
 # https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/559
 CFLAGS="-DGPC_OBJECT_DELIMITER=GLADE_PROPERTY_DEF_OBJECT_DELIMITER"
@@ -28,6 +28,10 @@ CFLAGS+=" -Dglade_widget_action_get_class=glade_widget_action_get_def"
 # https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd
 CFLAGS+=" -DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS"
 
+do_check() {
+	xvfb-run ninja -C build test
+}
+
 libhandy-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
 	short_desc+=" - development files"
@@ -41,9 +45,15 @@ libhandy-devel_package() {
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}
 }
+
+libhandy-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/handy-0.0-demo
+	}
+}