summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2023-09-24 09:57:57 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2023-09-24 09:59:26 -0500
commit275bd4036e56c8f0e00081100814ae88a4d3361c (patch)
tree2e2789338f1fefdf61dcfd26d53386bc88d9890c /app-arch/p7zip
parentdev-python/pynacl: Remove old (diff)
downloadgentoo-275bd4036e56c8f0e00081100814ae88a4d3361c.tar.gz
gentoo-275bd4036e56c8f0e00081100814ae88a4d3361c.tar.bz2
gentoo-275bd4036e56c8f0e00081100814ae88a4d3361c.zip
app-arch/p7zip: fix build issue
Closes: https://bugs.gentoo.org/901467 Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
Diffstat (limited to 'app-arch/p7zip')
-rw-r--r--app-arch/p7zip/files/p7zip-17.05-unit64.patch21
-rw-r--r--app-arch/p7zip/p7zip-17.05-r1.ebuild4
2 files changed, 25 insertions, 0 deletions
diff --git a/app-arch/p7zip/files/p7zip-17.05-unit64.patch b/app-arch/p7zip/files/p7zip-17.05-unit64.patch
new file mode 100644
index 000000000000..0aa19e329ac0
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-17.05-unit64.patch
@@ -0,0 +1,21 @@
+--- p7zip-17.05-orig/C/hashes/hash.h 2023-03-03 23:16:28.000000000 +1100
++++ p7zip-17.05/C/hashes/hash.h 2023-04-15 09:05:20.357955971 +1000
+@@ -42,17 +42,7 @@
+
+ #include "../7zTypes.h"
+
+-#ifndef _UINT32_T_DECLARED
+-typedef UInt32 uint32_t;
+-#define _UINT32_T_DECLARED
+-#endif
+-
+-#ifndef _UINT64_T_DECLARED
+-typedef UInt64 uint64_t;
+-#define _UINT64_T_DECLARED
+-#endif
+-
+-//#include <stdint.h>
++#include <stdint.h>
+
+ #ifndef min
+ #define min(a,b) (((a)>(b))?(b):(a))
diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index a70685f6c3fb..3ae8fa5c09e1 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -22,6 +22,10 @@ BDEPEND="
amd64? ( dev-lang/yasm )
x86? ( dev-lang/nasm )"
+PATCHES=(
+ "${FILESDIR}/p7zip-17.05-unit64.patch"
+)
+
src_prepare() {
default