[gentoo-commits] repo/gentoo:master commit in: games-util/dzip/files/, games-util/dzip/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     fb2611695e556262a52a3e1f64105844f225a925
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jun 19 18:22:25 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 20:42:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb261169

games-util/dzip: Fix incompatible function pointer types passing int

Closes: https://bugs.gentoo.org/884923
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31545
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-util/dzip/dzip-2.9-r5.ebuild                 | 41 ++++++++++++++++++++++
 games-util/dzip/files/dzip-clang16-build-fix.patch | 14 ++++++++
 2 files changed, 55 insertions(+)

diff --git a/games-util/dzip/dzip-2.9-r5.ebuild b/games-util/dzip/dzip-2.9-r5.ebuild
new file mode 100644
index 000000000000..ee9cb2270e33
--- /dev/null
+++ b/games-util/dzip/dzip-2.9-r5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="compressor/uncompressor for demo recordings from id's Quake"
+HOMEPAGE="http://speeddemosarchive.com/dzip/"
+SRC_URI="http://speeddemosarchive.com/dzip/dz${PV/./}src.zip"
+S="${WORKDIR}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-zlib-r2.patch
+	"${FILESDIR}"/${P}-scrub-names.patch #93079
+	"${FILESDIR}"/dzip-amd64.diff
+	"${FILESDIR}"/${PN}-clang16-build-fix.patch
+)
+
+src_prepare() {
+	default
+
+	mv -f Makefile{.linux,} || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin dzip
+	dodoc Readme
+}

diff --git a/games-util/dzip/files/dzip-clang16-build-fix.patch b/games-util/dzip/files/dzip-clang16-build-fix.patch
new file mode 100644
index 000000000000..d16c6beb182c
--- /dev/null
+++ b/games-util/dzip/files/dzip-clang16-build-fix.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/884923
+--- a/delete.c
++++ b/delete.c
+@@ -1,8 +1,8 @@
+ #include "dzip.h"
+ 
+-int intcmp (const uInt *arg1, const uInt *arg2)
++int intcmp (const void *arg1, const void *arg2)
+ {
+-	if (*arg1 < *arg2) return -1;
++	if (*(uInt *)arg1 < *(uInt *)arg2) return -1;
+ 	return 1;
+ }
+