From 5cd3e6c3070336e1b76324dd870e8f8d4b2f840e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 26 Feb 2024 09:44:03 -0500
Subject: [PATCH] libnvme: update to 1.8.

---
 srcpkgs/libnvme/patches/fix-cross.patch | 26 -------------------------
 srcpkgs/libnvme/template                |  8 ++++----
 2 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/libnvme/patches/fix-cross.patch

diff --git a/srcpkgs/libnvme/patches/fix-cross.patch b/srcpkgs/libnvme/patches/fix-cross.patch
deleted file mode 100644
index 96e77d52863..00000000000
--- a/srcpkgs/libnvme/patches/fix-cross.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/test/ioctl/mock.c
-+++ b/test/ioctl/mock.c
-@@ -114,7 +114,11 @@
- 	} \
- })
- 
-+#if __USE_GNU
- int ioctl(int fd, unsigned long request, ...)
-+#else
-+int ioctl(int fd, int request, ...)
-+#endif
- {
- 	struct mock_cmds *mock_cmds;
- 	bool result64;
-@@ -141,7 +141,11 @@
- 		result64 = true;
- 		break;
- 	default:
-+#if __USE_GNU
- 		fail("unexpected %s %lu", __func__, request);
-+#else
-+		fail("unexpected %s %u", __func__, request);
-+#endif
- 	}
- 	check(mock_cmds->remaining_cmds,
- 	      "unexpected %s command", mock_cmds->name);
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index a869f55db2b..aaefff7ac72 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,10 +1,10 @@
 # Template file for 'libnvme'
 pkgname=libnvme
-version=1.6
-revision=2
+version=1.8
+revision=1
 build_style=meson
 configure_args="-Ddocs=man"
-hostmakedepends="pkg-config swig"
+hostmakedepends="pkg-config swig tar xz"
 makedepends="json-c-devel openssl-devel python3-devel"
 checkdepends="perl"
 short_desc="C Library for NVM Express on Linux"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/linux-nvme/libnvme"
 distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=0dd8ba8b655abe78c09833edb66632aa6bee82aebf117dd252ded968deaaeec7
+checksum=d59939a280eec41eb7a716e1681d0d0c612099385204ffb55d07134a6be08d75
 
 libnvme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} json-c-devel openssl-devel"