From cde135c15e2d6715b767ecc6a52567e48d87b183 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <camerontnorman@gmail.com>
Date: Fri, 12 Oct 2018 19:03:24 -0700
Subject: [PATCH] libhandy: update to 0.0.4.

---
 .../libhandy/patches/generated-headers.diff   | 13 ++++++++++
 srcpkgs/libhandy/template                     | 24 +++++++++++--------
 2 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libhandy/patches/generated-headers.diff

diff --git a/srcpkgs/libhandy/patches/generated-headers.diff b/srcpkgs/libhandy/patches/generated-headers.diff
new file mode 100644
index 00000000000..e4dcfcdfe86
--- /dev/null
+++ b/srcpkgs/libhandy/patches/generated-headers.diff
@@ -0,0 +1,13 @@
+diff --git /src/meson.build b/src/meson.build
+index 25eea68e811a78f8600cdea47223aab801e482a9..63fc56cf5451efcc155cb561d2cd712ef4d1db7a 100644
+--- src/meson.build
++++ src/meson.build
+@@ -113,7 +113,7 @@ libhandy = shared_library(
+ )
+ 
+ libhandy_dep = declare_dependency(
+-              sources: libhandy_public_headers,
++              sources: libhandy_generated_headers,
+          dependencies: libhandy_deps,
+             link_with: libhandy,
+   include_directories: include_directories('.'),
diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index 17e4d6d736d..5f5dfad8c18 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -1,35 +1,39 @@
 # Template file for 'libhandy'
 pkgname=libhandy
-version=0.0.3
+version=0.0.4
 revision=1
 wrksrc="libhandy-v${version}"
 build_style=meson
 # tests need X anyway, so no need to build them
-configure_args="-Dexamples=false -Dtests=false
- -Dintrospection=$(vopt_if gir true false) -Dvala=$(vopt_if vala true false)"
+configure_args="-Dexamples=false -Dtests=false $(vopt_bool vala vapi)
+ $(vopt_bool glade glade_catalog) $(vopt_bool gir introspection)"
 hostmakedepends="glib-devel pkg-config $(vopt_if gir gobject-introspection)
- $(vopt_if vala vala-devel)"
+ $(vopt_if vala vala-devel) $(vopt_if glade glade3-devel)"
 makedepends="gtk+3-devel libglib-devel"
 short_desc="A library full of GTK+ widgets for mobile phones"
 maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
-license="GPL-3.0-or-later"
+license="LGPL-2.0-or-later"
 homepage="https://source.puri.sm/Librem5/libhandy"
-distfiles="https://gitlab.gnome.org/Community/Purism/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
-checksum=387bb4da0e5d15d6d83cac5276841e6eda8429548b292ea3ebf002679189c270
+distfiles="${homepage}/-/archive/v${version}/${wrksrc}.tar.gz"
+checksum=2c54b61cefb153b3a6ab8b6ecb520375854301632c998b003dd7dba623ea2a03
 
-build_options="gir vala"
+build_options="gir vala glade"
 
 if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir vala"
+	build_options_default="gir vala glade"
 fi
 
 libhandy-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
+		vmove "usr/lib/*.so"
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/glade
+		if [ "$build_option_glade" ]; then
+			vmove usr/lib/glade
+			vmove usr/share/glade
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi