From 7f127935170f581795c8b55a68b850b5ae79ca93 Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Wed, 19 Feb 2025 08:37:10 +0100
Subject: [PATCH] testing/libguestfs: upgrade to 1.56.1

https://github.com/libguestfs/libguestfs/compare/v1.52.2...v1.56.1
---
 testing/libguestfs/APKBUILD                  |  9 ++--
 testing/libguestfs/fix-missing-error-h.patch | 46 --------------------
 2 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 testing/libguestfs/fix-missing-error-h.patch

diff --git a/testing/libguestfs/APKBUILD b/testing/libguestfs/APKBUILD
index 5866b36af83..6e50ae453a5 100644
--- a/testing/libguestfs/APKBUILD
+++ b/testing/libguestfs/APKBUILD
@@ -3,8 +3,8 @@
 pkgname=libguestfs
 # NOTE: Upgrade only to even-numbered versions (e.g. 1.50.x, 1.52.x)!
 # Odd-numbered versions are development versions.
-pkgver=1.52.0
-pkgrel=3
+pkgver=1.56.1
+pkgrel=0
 pkgdesc="Access and modify virtual machine disk images"
 url="https://libguestfs.org/"
 # riscv64, loongarch64: blocked by ocaml
@@ -30,6 +30,7 @@ makedepends="
 	gperf
 	hivex-dev
 	jansson-dev
+	json-c-dev
 	libcap-dev
 	libconfig-dev
 	libtirpc-dev
@@ -57,7 +58,6 @@ subpackages="
 	"
 source="https://download.libguestfs.org/${pkgver%.*}-stable/libguestfs-$pkgver.tar.gz
 	fix-missing-int64_t.patch
-	fix-missing-error-h.patch
 	"
 options="!check"  # XXX: Test suite does not support Alpine Linux at this moment
 
@@ -144,7 +144,6 @@ _ruby() {
 }
 
 sha512sums="
-48dfaabb6b371ab3476b42310d363addf2fd1dfe43876be3bc984953f6919a30c7de13ef235d83fdd39117d71aa6bbfb5fbb645c1b17bc3031798a2a2b3df9d7  libguestfs-1.52.0.tar.gz
+8ec8db8b3de7471c7ab77161fa98349d7b6f88a803ab563f1859606a2ef55737f323b1cf3ef2ebb3055770f4140aabb056f97099ef76fa7ad0f7bd792cc699fc  libguestfs-1.56.1.tar.gz
 9ca7a2ac8572553394d42eda0e02f8b694651288ce58f1f4c7569eaab81cd3295b0992dcd6452a42b4b284cec54a666fd277eafcee05d54d05b1e84560ac7b06  fix-missing-int64_t.patch
-e4d0cac4ba856d871ca524ebeb4dedf25b3a956fe6a1ab4c93481eba03954fb684621c63085526fc1846b3bffd4cbe30dadfba2b92844d24b8ec277c0e84bf5c  fix-missing-error-h.patch
 "
diff --git a/testing/libguestfs/fix-missing-error-h.patch b/testing/libguestfs/fix-missing-error-h.patch
deleted file mode 100644
index 7cdf3eaf8a3..00000000000
--- a/testing/libguestfs/fix-missing-error-h.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Thu, 12 Oct 2023 01:05:47 +0200
-Subject: [PATCH] Fix <error.h> not found in libvirt-is-version.c
-
-    libvirt-is-version.c:26:10: fatal error: error.h: No such file or directory
-       26 | #include <error.h>
-          |          ^~~~~~~~~
-
-    libvirt-is-version.c:(.text+0x61): undefined reference to `error'
-    ld: libvirt_is_version-libvirt-is-version.o: in function `main':
-    libvirt-is-version.c:(.text.startup+0xa9): undefined reference to `error'
-
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -178,10 +178,12 @@
- 
- libvirt_is_version_LDADD = \
- 	$(LIBVIRT_LIBS) \
--	$(LTLIBINTL)
-+	$(LTLIBINTL) \
-+	../gnulib/lib/libgnu.la
- 
- libvirt_is_version_CPPFLAGS = \
--	-DLOCALEBASEDIR=\""$(datadir)/locale"\"
-+	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-+	-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
- 
- libvirt_is_version_CFLAGS = \
- 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -1115,10 +1115,12 @@
- @HAVE_LIBVIRT_TRUE@libvirt_is_version_SOURCES = libvirt-is-version.c
- @HAVE_LIBVIRT_TRUE@libvirt_is_version_LDADD = \
- @HAVE_LIBVIRT_TRUE@	$(LIBVIRT_LIBS) \
--@HAVE_LIBVIRT_TRUE@	$(LTLIBINTL)
-+@HAVE_LIBVIRT_TRUE@	$(LTLIBINTL) \
-+@HAVE_LIBVIRT_TRUE@	../gnulib/lib/libgnu.la
- 
- @HAVE_LIBVIRT_TRUE@libvirt_is_version_CPPFLAGS = \
--@HAVE_LIBVIRT_TRUE@	-DLOCALEBASEDIR=\""$(datadir)/locale"\"
-+@HAVE_LIBVIRT_TRUE@	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
-+@HAVE_LIBVIRT_TRUE@	-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
- 
- @HAVE_LIBVIRT_TRUE@libvirt_is_version_CFLAGS = \
- @HAVE_LIBVIRT_TRUE@	$(WARN_CFLAGS) $(WERROR_CFLAGS) \