From d5c66d82817c768a4e04da2f56c460598460dd55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:41:55 +0200
Subject: [PATCH] rest: update to 0.9.1.

---
 common/shlibs                    |  2 ++
 srcpkgs/rest/patches/cross.patch | 10 ++++++++++
 srcpkgs/rest/template            | 31 ++++++++++++++++++-------------
 3 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/rest/patches/cross.patch

diff --git a/common/shlibs b/common/shlibs
index 82ede873858..71adfca7d66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -876,7 +876,9 @@ libcogl-gles2.so.20 cogl-1.18.0_1
 libcogl-path.so.20 cogl-1.18.0_1
 libp11-kit.so.0 p11-kit-0.7_1
 librest-0.7.so.0 rest0-0.8.1_1
+librest-1.0.so.0 rest-0.9.1_1
 librest-extras-0.7.so.0 rest0-0.8.1_1
+librest-extras-1.0.so.0 rest-0.9.1_1
 libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
 libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
 liboauth.so.0 liboauth-0.9.4_1
diff --git a/srcpkgs/rest/patches/cross.patch b/srcpkgs/rest/patches/cross.patch
new file mode 100644
index 00000000000..ae113dc8e81
--- /dev/null
+++ b/srcpkgs/rest/patches/cross.patch
@@ -0,0 +1,10 @@
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -1,6 +1,7 @@
+ if get_option('gtk_doc') and get_option('introspection')
+   dependency('gi-docgen', version: '>= 2021.6',
+     fallback: ['gi-docgen', 'dummy_dep'],
++    native: true,
+   )
+ 
+   gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template
index aa4299c8ffd..155cd753357 100644
--- a/srcpkgs/rest/template
+++ b/srcpkgs/rest/template
@@ -1,36 +1,41 @@
 # Template file for 'rest'
 pkgname=rest
-version=0.8.1
-revision=3
-build_style=gnu-configure
+version=0.9.1
+revision=1
+build_style=meson
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-static
- --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
-hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc"
-makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
+configure_args="$(vopt_bool gir introspection) -Dexamples=false -Dsoup2=false
+ -Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt"
+hostmakedepends="pkg-config glib-devel gi-docgen"
+makedepends="libsoup3-devel json-glib-devel libxml2-devel"
 depends="ca-certificates"
 short_desc="RESTful library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9
+homepage="https://gitlab.gnome.org/GNOME/librest"
+changelog="https://gitlab.gnome.org/GNOME/librest/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/rest/${version%.*}/rest-${version}.tar.xz"
+checksum=9266a5c10ece383e193dfb7ffb07b509cc1f51521ab8dad76af96ed14212c2e3
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
-pre_configure() {
-	autoreconf -fi
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
 }
 
 rest-devel_package() {
-	depends="rest-${version}_${revision} libglib-devel libsoup-devel
+	depends="${sourcepkg}>=${version}_${revision} libglib-devel libsoup3-devel
 	 libxml2-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0