From 789bb12f1011efa0b53b8e70cdd43839ff1fc861 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 15:45:27 +0200
Subject: [PATCH] appstream-glib: update to 0.8.1.

---
 ...d-archive_entry_h-order-on-client-as-util.patch | 14 --------------
 ...ntry_h-order-on-libappstream-glib-as-util.patch | 14 --------------
 srcpkgs/appstream-glib/template                    | 12 ++++++------
 3 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
 delete mode 100644 srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch

diff --git a/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch b/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
deleted file mode 100644
index 90d85364681d..000000000000
--- a/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-They are in the wrong order.
-
---- a/client/as-util.c
-+++ b/client/as-util.c
-@@ -27,8 +27,8 @@
- #include <gio/gio.h>
- 
- #include <appstream-glib.h>
--#include <archive_entry.h>
- #include <archive.h>
-+#include <archive_entry.h>
- #include <libsoup/soup.h>
- #include <locale.h>
- #include <stdlib.h>
diff --git a/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch b/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
deleted file mode 100644
index 2502048d75ac..000000000000
--- a/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-They are in the wrong order.
-
---- a/libappstream-glib/as-utils.c
-+++ b/libappstream-glib/as-utils.c
-@@ -34,8 +34,8 @@
- 
- #include <fnmatch.h>
- #include <string.h>
--#include <archive_entry.h>
- #include <archive.h>
-+#include <archive_entry.h>
- #include <libsoup/soup.h>
- #include <stdlib.h>
- #include <uuid.h>
diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template
index 5eaf493d53f6..ef5baf1afdf9 100644
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'appstream-glib'
 pkgname=appstream-glib
-version=0.7.18
+version=0.8.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,25 +8,25 @@ configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gcab gperf pkg-config glib-devel"
 makedepends="gcab-devel gtk+3-devel json-glib-devel libarchive-devel
- libsoup-devel libyaml-devel"
+ libcurl-devel libyaml-devel"
 short_desc="Install and update applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://people.freedesktop.org/~hughsient/appstream-glib/"
 changelog="https://raw.githubusercontent.com/hughsie/appstream-glib/master/NEWS"
-distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002
+distfiles="https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-${version}.tar.xz"
+checksum=68a3d007f5b3aa84592dbef07950d9acf327da97ec8a6e88a90575d9055ddf6d
 
 build_options="gir"
 build_options_default="gir"
 
 post_install() {
-	rm -rf -- "${DESTDIR}"/usr/share/installed-tests
+	rm -r "${DESTDIR}"/usr/share/installed-tests
 }
 
 appstream-glib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gcab-devel gdk-pixbuf-devel
-	 libarchive-devel libsoup-devel libyaml-devel"
+	 libarchive-devel libcurl-devel libyaml-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include