From 138f97b47ebe8dc2378ac86937ca574767f6f1ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Deckert?= <joergd@bitquell.de>
Date: Tue, 1 Mar 2022 08:25:16 +0100
Subject: [PATCH] open-vmdk: patch for newer gcc

---
 app-emulation/open-vmdk/Manifest              |  3 ++-
 .../open-vmdk/files/diskinfo-20211104.patch   | 26 +++++++++++++++++++
 .../open-vmdk/open-vmdk-20211104.ebuild       |  3 +++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 app-emulation/open-vmdk/files/diskinfo-20211104.patch

diff --git a/app-emulation/open-vmdk/Manifest b/app-emulation/open-vmdk/Manifest
index 74e9d79..d781142 100644
--- a/app-emulation/open-vmdk/Manifest
+++ b/app-emulation/open-vmdk/Manifest
@@ -1,4 +1,5 @@
+AUX diskinfo-20211104.patch 701 BLAKE2B 5f9d03a2154f0b21d1e83eeeb340c4512394558668f7d119ce8616c5021ff2f5fc3da5b21e0e4bd9c4defd66f6d00e6647fe81973fdb6f8c2b99682861a0fb74 SHA512 f5895dd293bfdb58dd87d9540fd05cc39018620284fef8c08b2bcc09da3a4aa319ed0451ee1d8f8a3c405d7cfb262b59a5845873cf216093583593aafa2fe512
 DIST open-vmdk-20141215.zip 30087 BLAKE2B 1b1f6542aa4e4b73a3b0780ed54401fa7bc8a8c2e71fb98750349e47e2f1cc4d85e54a5dc37c21fb8dcf00edcb215bf7adbb24f549fe9c15a7f2f8d72c3d0419 SHA512 b04223fbc6084f2fc7b2c6cde878f3eb3533d84bd966a86f0e236b9b314ee838e03187cd3b22e51d64a98f7fe4f702e03b1e783573fc77e87ac55d0b5ba48487
 DIST open-vmdk-20211104.zip 47295 BLAKE2B 52e656c2ffd4ca88c2cb598225ce0e6f08415e683078ea77ef5cd7045ae766582a47acbb70e7dab8649f812f768b5671d32e1b3bc0f48ce2673607a1035a97ee SHA512 604e722146ca39cd932824c0a2d35c467bc1b931d9ff16022c48d2840b48c3731b49629584497d0d98437d406febb6a2ccc5ee4278c08708782fc13280031ca4
 EBUILD open-vmdk-20141215-r1.ebuild 804 BLAKE2B 3068585eec7aca89fea84ee0ff9923dad881c23485bffcdd08030d016ec5bc13445b4f511d1b5bce397efe8cc46b44a5bba5cf2ff2e180b5fc3a32b574461201 SHA512 86daae6f5297f8a8ee8cedbbe4ba777d6995555c033cc9f5062afa6122e9967551b28d6b76dfcfef96459c2300f7d0b155b57bed6d4b0b51d8beb148d94bfeb4
-EBUILD open-vmdk-20211104.ebuild 782 BLAKE2B 8fb24b9f273ae0dabaac594720de2a7b7215286177c4c70f318f913b1d7a3c2a5c0bf955cce7da986f01cb0303ee20f58dc4804f7860b1432f7af1085b628ccf SHA512 f6b3a4b526c347254f77a19fffe289abdf414d84795f8f6f6f32e62f7602279684f067faecfe188b6667052588a45d95650199a4013df37925e56721c6f94caa
+EBUILD open-vmdk-20211104.ebuild 833 BLAKE2B f210852f8e05b14dfbf6d1d5fd1f9f55d3391ed28e678c1fd90cc24fb76d7deddcdf12ab88e2b5aab2c56bc25cb512add399b13f474bdaa798b34bc67c6e025a SHA512 9a8f63cb3fb7dc0c11185076f66bc4535a611bc4eeee0e26012452357f58cb445b362d5f6417c733becdcbf2cffceb6d2b790627b615e589593b59cd0116c110
diff --git a/app-emulation/open-vmdk/files/diskinfo-20211104.patch b/app-emulation/open-vmdk/files/diskinfo-20211104.patch
new file mode 100644
index 0000000..195b66b
--- /dev/null
+++ b/app-emulation/open-vmdk/files/diskinfo-20211104.patch
@@ -0,0 +1,26 @@
+diff --git a/vmdk/diskinfo.h b/vmdk/diskinfo.h
+index 2b58f43..f4f9441 100644
+--- a/vmdk/diskinfo.h
++++ b/vmdk/diskinfo.h
+@@ -35,7 +35,7 @@ struct DiskInfo {
+ 	const DiskInfoVMT *vmt;
+ };
+ 
+-char *toolsVersion; /* toolsVersion in metadata */
++extern char *toolsVersion; /* toolsVersion in metadata */
+ 
+ DiskInfo *Flat_Open(const char *fileName);
+ DiskInfo *Flat_Create(const char *fileName, off_t capacity);
+diff --git a/vmdk/mkdisk.c b/vmdk/mkdisk.c
+index b6c0cc9..b66b7d5 100644
+--- a/vmdk/mkdisk.c
++++ b/vmdk/mkdisk.c
+@@ -24,6 +24,8 @@
+ #include <string.h>
+ #include <getopt.h>
+ 
++char *toolsVersion; /* toolsVersion in metadata */
++
+ static int
+ copyData(DiskInfo *dst,
+          off_t dstOffset,
diff --git a/app-emulation/open-vmdk/open-vmdk-20211104.ebuild b/app-emulation/open-vmdk/open-vmdk-20211104.ebuild
index 3019142..e1d3e93 100644
--- a/app-emulation/open-vmdk/open-vmdk-20211104.ebuild
+++ b/app-emulation/open-vmdk/open-vmdk-20211104.ebuild
@@ -23,6 +23,9 @@ DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${PN}-${COMMIT}
 
+PATCHES=(
+    "${FILESDIR}/diskinfo-${PV}.patch"
+)
 
 src_install() {
         emake DESTDIR="${D}" install || die "install failed"