diff options
Diffstat (limited to 'app-arch/arc')
| -rw-r--r-- | app-arch/arc/arc-5.21p-r1.ebuild (renamed from app-arch/arc/arc-5.21p.ebuild) | 13 | ||||
| -rw-r--r-- | app-arch/arc/files/arc-5.21m-darwin.patch | 4 | ||||
| -rw-r--r-- | app-arch/arc/files/arc-5.21o-interix.patch | 12 | ||||
| -rw-r--r-- | app-arch/arc/files/arc-5.21p-variadic-arcdie.patch | 38 | ||||
| -rw-r--r-- | app-arch/arc/metadata.xml | 2 |
5 files changed, 47 insertions, 22 deletions
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p-r1.ebuild index f62a74e54786..87b6ae8a88b7 100644 --- a/app-arch/arc/arc-5.21p.ebuild +++ b/app-arch/arc/arc-5.21p-r1.ebuild @@ -1,24 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Create & extract files from DOS .ARC files" -HOMEPAGE="http://arc.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://arc.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" PATCHES=( "${FILESDIR}"/${PN}-5.21m-darwin.patch "${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch - "${FILESDIR}"/${PN}-5.21o-interix.patch "${FILESDIR}"/${PN}-5.21p-fno-common.patch + "${FILESDIR}"/${PN}-5.21p-variadic-arcdie.patch ) src_prepare() { diff --git a/app-arch/arc/files/arc-5.21m-darwin.patch b/app-arch/arc/files/arc-5.21m-darwin.patch index fb1eb5ea2598..85a36593dbf2 100644 --- a/app-arch/arc/files/arc-5.21m-darwin.patch +++ b/app-arch/arc/files/arc-5.21m-darwin.patch @@ -1,5 +1,5 @@ ---- arc-5.21m/tmclock.c -+++ arc-5.21m/tmclock.c +--- a/tmclock.c ++++ b/tmclock.c @@ -14,7 +14,7 @@ /* Julian day number of the Unix* clock's origin, 01 Jan 1970. */ #define JD1970 2440587L diff --git a/app-arch/arc/files/arc-5.21o-interix.patch b/app-arch/arc/files/arc-5.21o-interix.patch deleted file mode 100644 index f95aee85e37d..000000000000 --- a/app-arch/arc/files/arc-5.21o-interix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru arc-5.21o.orig/arcdos.c arc-5.21o/arcdos.c ---- arc-5.21o.orig/arcdos.c 2008-03-30 15:44:53 +0200 -+++ arc-5.21o/arcdos.c 2008-03-30 15:45:51 +0200 -@@ -30,7 +30,7 @@ - #if UNIX - #include <sys/types.h> - #include <sys/stat.h> --#if BSD -+#if BSD || defined(__INTERIX) - #include <sys/time.h> - #else - #include <time.h> /* Sys V. Bleah. */ diff --git a/app-arch/arc/files/arc-5.21p-variadic-arcdie.patch b/app-arch/arc/files/arc-5.21p-variadic-arcdie.patch new file mode 100644 index 000000000000..787748f6d3fa --- /dev/null +++ b/app-arch/arc/files/arc-5.21p-variadic-arcdie.patch @@ -0,0 +1,38 @@ +Convert arcdie to variadic function, which solves the issue with +-Werror=implicit-int enabled. + +Bug: https://bugs.gentoo.org/870517 + +diff --git a/arcmisc.c b/arcmisc.c +index ea12b41..3d6272e 100644 +--- a/arcmisc.c ++++ b/arcmisc.c +@@ -3,6 +3,7 @@ + * $Header: /cvsroot/arc/arc/arcmisc.c,v 1.4 2005/10/09 01:38:22 highlandsun Exp $ + */ + ++#include <stdarg.h> + #include <stdio.h> + #include <ctype.h> + #include "arc.h" +@@ -223,11 +224,14 @@ upper(string) + } + /* VARARGS1 */ + VOID +-arcdie(s, arg1, arg2, arg3) +- char *s; ++arcdie(char * s, ...) + { ++ va_list ap; ++ + fprintf(stderr, "ARC: "); +- fprintf(stderr, s, arg1, arg2, arg3); ++ va_start(ap, s); ++ vfprintf(stderr, s, ap); ++ va_end(ap); + fprintf(stderr, "\n"); + #if UNIX + perror("UNIX"); +-- +2.35.1 + diff --git a/app-arch/arc/metadata.xml b/app-arch/arc/metadata.xml index 45f29ce39fbc..70ca0315429e 100644 --- a/app-arch/arc/metadata.xml +++ b/app-arch/arc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> |