[gentoo-commits] repo/gentoo:master commit in: games-util/ucon64/
commit: 2a8ae252e9693bea40a8f9e6e523ab079e2d043c
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Jul 10 13:45:39 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Jul 12 18:35:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8ae252
games-util/ucon64: use HTTPS
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
games-util/ucon64/ucon64-2.2.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-util/ucon64/ucon64-2.2.2.ebuild
b/games-util/ucon64/ucon64-2.2.2.ebuild
index 617f85487c0d..718d5de12bce 100644
--- a/games-util/ucon64/ucon64-2.2.2.ebuild
+++ b/games-util/ucon64/ucon64-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
inherit toolchain-funcs
DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
-HOMEPAGE="http://ucon64.sourceforge.net/";
+HOMEPAGE="https://ucon64.sourceforge.net/";
SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
S="${WORKDIR}/${P}-src/src"
[gentoo-commits] repo/gentoo:master commit in: games-util/ucon64/files/, games-util/ucon64/
commit: f1791b7e2e3f5d1c4698096a28c119b8f09da09c
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Dec 2 04:53:04 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Dec 2 05:10:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1791b7e
games-util/ucon64: drop 2.2.1
Signed-off-by: Ionen Wolkens gentoo.org>
games-util/ucon64/Manifest | 1 -
.../files/ucon64-2.2.1-change-mem2-64bit.patch | 23
.../ucon64/files/ucon64-2.2.1-respect-flags.patch | 35
games-util/ucon64/files/ucon64-2.2.1-zlib.patch| 26 -
games-util/ucon64/ucon64-2.2.1.ebuild | 65 --
5 files changed, 150 deletions(-)
diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
index 1128342e97df..d31bb6ad971d 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -1,2 +1 @@
-DIST ucon64-2.2.1-src.tar.gz 1476080 BLAKE2B
8f7010bde2c7306f6a76dec4ce5e31975c286801e6504bf8bc99287bd7adc4ab10331a8cab308fed83ece9e13bdb01327f6d3439eba776038dbb19eb2b72cf70
SHA512
34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
DIST ucon64-2.2.2-src.tar.gz 1481087 BLAKE2B
3ae3d09f4ea186d4e64d712bf0e3036ca79b7e87ba9a9b165fdcee2f0e24ac1dd00a5da9653a404850e8bc1f85cd6b26e0d03615e60090709d9b792c3db07e8e
SHA512
21e403e6de64c0a76de32032fbafea75f53a96b88b343220cdc8d62ef3bdec252764cacb9bbf98a910477ba451bc05aee8c9f91024b9e5d3149f7ead20d426b5
diff --git a/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
b/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
deleted file mode 100644
index d07a18fdd8f0..
--- a/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix crash on 64bit platforms in change_mem2()
-https://bugs.gentoo.org/753950
-
-From upstream:
-https://sourceforge.net/p/ucon64/svn/2821/
a/libdiscmage/misc.c
-+++ b/libdiscmage/misc.c
-@@ -1875,5 +1875,5 @@
- if (strpos == pos_1st_esc)
- setindex = 0; // reset argument pointer
-- if (pos_1st_esc == (unsigned int) -1)
-+ if (pos_1st_esc == (size_t) -1)
- pos_1st_esc = strpos;
-
a/misc/misc.c
-+++ b/misc/misc.c
-@@ -502,5 +502,5 @@
- if (strpos == pos_1st_esc)
- setindex = 0; // reset argument pointer
-- if (pos_1st_esc == (unsigned int) -1)
-+ if (pos_1st_esc == (size_t) -1)
- pos_1st_esc = strpos;
-
diff --git a/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
b/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
deleted file mode 100644
index c1c9ed6f78da..
--- a/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Respect *FLAGS and toolchain variables in Makefiles where missing.
a/Makefile
-+++ b/Makefile
-@@ -12,3 +12,3 @@
- CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -Wno-format-truncation \
---Wno-stringop-overflow -O3 -fsigned-char
-+-Wno-stringop-overflow -fsigned-char
- # Enable -Wstringop-overflow[=type] when it is no longer a broken, partial
-@@ -19,3 +19,2 @@
- # ld: warning: option -s is obsolete and being ignored
--LDFLAGS+=-s
- endif
a/backup/libcd64/Makefile
-+++ b/backup/libcd64/Makefile
-@@ -1,2 +1 @@
--CC=gcc
-
-@@ -7,3 +6,2 @@
- else
--CFLAGS+=-O6 -funroll-loops -fexpensive-optimizations
- endif
-@@ -181,4 +179,4 @@
- else
-- ld -r $^ $(LIBS) -o $*.o
-- ar crs $@ $*.o
-+ $(LD) -r $^ $(LIBS) -o $*.o
-+ $(AR) crs $@ $*.o
- endif
a/libdiscmage/Makefile.in
-+++ b/libdiscmage/Makefile.in
-@@ -33,3 +33,2 @@
- # /usr/bin/libtool: -static not specified, -s invalid
--LDFLAGS+=-s
- endif
-
diff --git a/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
b/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
deleted file mode 100644
index a618c3bce75a..
--- a/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix undefined macro issue when compiling with zlib.
-https://bugs.gentoo.org/753950
-
-From upstream:
-https://sourceforge.net/p/ucon64/svn/2817/
-https://sourceforge.net/p/ucon64/svn/2819/
a/libdiscmage/ioapi.h
-+++ b/libdiscmage/ioapi.h
-@@ -35,4 +35,7 @@
- extern "C" {
- #endif
-+#ifndef OF
-+#define OF(x) x
-+#endif
-
- typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char*
filename, int mode));
a/misc/ioapi.h
-+++ b/misc/ioapi.h
-@@ -35,4 +35,7 @@
- extern "C" {
- #endif
-+#ifndef OF
-+#define OF(x) x
-+#endif
-
- typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char*
filename, int mode));
diff --git a/games-util/ucon64/ucon64-2.2.1.ebuild
b/games-util/ucon64/ucon64-2.2.1.ebuild
deleted file mode 100644
index 13ebde02c0b5..
--- a/games-util/ucon64/ucon64-2.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyri
[gentoo-commits] repo/gentoo:master commit in: games-util/ucon64/, games-util/ucon64/files/
commit: 4fe59e92e50c3ca9486471d87b63acd6b9650eb7
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Nov 25 17:37:41 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Nov 25 17:39:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe59e92
games-util/ucon64: add 2.2.2
Signed-off-by: Ionen Wolkens gentoo.org>
games-util/ucon64/Manifest | 1 +
.../ucon64/files/ucon64-2.2.2-respect-flags.patch | 29 ++
games-util/ucon64/ucon64-2.2.2.ebuild | 63 ++
3 files changed, 93 insertions(+)
diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
index 190c02eda09a..1128342e97df 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -1 +1,2 @@
DIST ucon64-2.2.1-src.tar.gz 1476080 BLAKE2B
8f7010bde2c7306f6a76dec4ce5e31975c286801e6504bf8bc99287bd7adc4ab10331a8cab308fed83ece9e13bdb01327f6d3439eba776038dbb19eb2b72cf70
SHA512
34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
+DIST ucon64-2.2.2-src.tar.gz 1481087 BLAKE2B
3ae3d09f4ea186d4e64d712bf0e3036ca79b7e87ba9a9b165fdcee2f0e24ac1dd00a5da9653a404850e8bc1f85cd6b26e0d03615e60090709d9b792c3db07e8e
SHA512
21e403e6de64c0a76de32032fbafea75f53a96b88b343220cdc8d62ef3bdec252764cacb9bbf98a910477ba451bc05aee8c9f91024b9e5d3149f7ead20d426b5
diff --git a/games-util/ucon64/files/ucon64-2.2.2-respect-flags.patch
b/games-util/ucon64/files/ucon64-2.2.2-respect-flags.patch
new file mode 100644
index ..9e772fe6c76a
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.2-respect-flags.patch
@@ -0,0 +1,29 @@
+--- a/Makefile
b/Makefile
+@@ -13,3 +13,3 @@
+
+-CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -O3 -fsigned-char
++CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -fsigned-char
+ ifneq ($(findstring clang,$(CC)),clang)
+@@ -21,3 +21,2 @@
+ # ld: warning: option -s is obsolete and being ignored
+-LDFLAGS+=-s
+ endif
+--- a/backup/libcd64/Makefile
b/backup/libcd64/Makefile
+@@ -1,3 +1,2 @@
+ ifeq ($(CC),cc)
+-CC=gcc
+ endif
+@@ -12,5 +11,3 @@
+ else
+-CFLAGS+=-O3 -funroll-loops
+ ifneq ($(findstring clang,$(CC)),clang)
+-CFLAGS+=-fexpensive-optimizations
+ endif
+--- a/libdiscmage/Makefile.in
b/libdiscmage/Makefile.in
+@@ -37,3 +37,2 @@
+ # /usr/bin/libtool: -static not specified, -s invalid
+-LDFLAGS+=-s
+ endif
diff --git a/games-util/ucon64/ucon64-2.2.2.ebuild
b/games-util/ucon64/ucon64-2.2.2.ebuild
new file mode 100644
index ..617f85487c0d
--- /dev/null
+++ b/games-util/ucon64/ucon64-2.2.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
+HOMEPAGE="http://ucon64.sourceforge.net/";
+SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src/src"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug usb zlib"
+
+RDEPEND="
+ usb? ( virtual/libusb:0 )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_prepare() {
+ default
+
+ sed "/discmage.so/s|.* \"|\"${EPREFIX}/usr/$(get_libdir)/${PN}/|" \
+ -i ucon64_misc.c || die
+}
+
+src_configure() {
+ local econfargs=(
+ $(use_enable debug)
+ $(use_with usb libusb)
+ $(use_with zlib)
+ --enable-ppdev
+ --with-libcd64
+ --with-libdiscmage
+ )
+ econf "${econfargs[@]}"
+
+ tc-export AR CC LD
+}
+
+src_install() {
+ dobin ucon64
+
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe libdiscmage/discmage.so
+
+ docinto html
+ dodoc -r ../images ../{changes,developers,faq,hardware,readme}.html
+}
+
+pkg_postinst() {
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "Be sure to check ~/.ucon64rc for some options after"
+ elog "you've run uCON64 for the first time."
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: games-util/ucon64/files/, games-util/ucon64/
commit: b385e934f1bb7beab4e1a1754adbd7caf699b547
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Jun 22 23:40:34 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jun 23 02:22:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b385e934
games-util/ucon64: drop 2.0.0
Signed-off-by: Ionen Wolkens gentoo.org>
games-util/ucon64/Manifest | 1 -
games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch | 20 ---
games-util/ucon64/files/ucon64-2.0.0-zlib.patch| 45 ---
games-util/ucon64/ucon64-2.0.0.ebuild | 65 --
4 files changed, 131 deletions(-)
diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
index 2ead28e44b3..190c02eda09 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -1,2 +1 @@
-DIST ucon64-2.0.0-src.tar.gz 1188488 BLAKE2B
846ea6142eb50abc8165c9abb3cc05245f891b78d786798758e393032cc59c1f30fe0e70e256e308f709870bc1cc2754df30a8fababea30eda84fd1b2b64
SHA512
d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
DIST ucon64-2.2.1-src.tar.gz 1476080 BLAKE2B
8f7010bde2c7306f6a76dec4ce5e31975c286801e6504bf8bc99287bd7adc4ab10331a8cab308fed83ece9e13bdb01327f6d3439eba776038dbb19eb2b72cf70
SHA512
34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
diff --git a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
deleted file mode 100644
index 22bb9a9795f..000
--- a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
a/backup/lynxit.c
-+++ b/backup/lynxit.c
-@@ -561,7 +561,7 @@
- return FALSE;
- }
-
-- if (strcmp (header.magic, "LYNX") != 0)
-+ if (memcmp (header.magic, "LYNX", sizeof(header.magic)) != 0)
- {
- MESSAGE (("ERROR: %s is not a lynx image\n", filename));
- fclose (fp);
-@@ -682,7 +682,7 @@
- #endif
-
- memset (&header, 0, sizeof (st_lnx_header_t));
-- strcpy (header.magic, MAGIC_STRING);
-+ memcpy (header.magic, MAGIC_STRING, sizeof(header.magic));
- strcpy (header.cartname, cartname);
- strcpy (header.manufname, manufname);
- header.page_size_bank0 = cart_analyse (BANK0);
diff --git a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
deleted file mode 100644
index d7d3b21c833..000
--- a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
a/misc/unzip.h
-+++ b/misc/unzip.h
-@@ -49,6 +49,10 @@
- #include "zlib.h"
- #endif
-
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
- from (void*) without cast */
a/libdiscmage/unzip.h
-+++ b/libdiscmage/unzip.h
-@@ -48,6 +48,9 @@
- #ifndef _ZLIB_H
- #include "zlib.h"
- #endif
-+#ifndef OF
-+#define OF(x) x
-+#endif
-
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
a/libdiscmage/misc_z.c
-+++ b/libdiscmage/misc_z.c
-@@ -27,6 +27,7 @@
- #include
- #include
- #include
-+#define Z_SOLO
- #include
- #include "misc_z.h"
- #include "misc.h"
a/misc/archive.c
-+++ b/misc/archive.c
-@@ -27,6 +27,7 @@
- #include
- #include
- #include
-+#define Z_SOLO
- #include
- #ifdef HAVE_BYTESWAP_H
- #include
diff --git a/games-util/ucon64/ucon64-2.0.0.ebuild
b/games-util/ucon64/ucon64-2.0.0.ebuild
deleted file mode 100644
index 64f8177f6f3..000
--- a/games-util/ucon64/ucon64-2.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
-HOMEPAGE="http://ucon64.sourceforge.net/";
-SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
-S="${WORKDIR}"/${P}-src/src
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ovflfix.patch
- "${FILESDIR}"/${P}-zlib.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e "/^CFLAGS/s/-O3/${CFLAGS}/" \
- -e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \
- {,libdiscmage/}Makefile.in || die
-}
-
-src_configure() {
- local myconf
-
- if [[ ! -e "${ESYSROOT}"/usr/include/sys/io.h ]] ; then
- ewarn "Disabling support for parallel port"
- myconf="${myconf} --disable-parallel"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- dobin ucon64
- dolib.so libdiscmage/discmage.so
-
- cd .. || die
-
- docinto html
- dodoc *.html
- docinto html/images
- dodoc images/*
-}
-
-pkg_postinst() {
- echo
- elog
[gentoo-commits] repo/gentoo:master commit in: games-util/ucon64/files/, games-util/ucon64/
commit: 449d7802c1c41097291ff82f28518ae7afffec3e
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jun 14 22:07:00 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jun 14 22:55:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449d7802
games-util/ucon64: add 2.2.1
- add IUSE debug, usb, zlib
- set default discmage.so path not to need user intervention
- shorter elog given ucon64's output already mentions .ucon64/dat
- use fixes suggested by upstream in bug #753950
Closes: https://bugs.gentoo.org/753950
Signed-off-by: Ionen Wolkens gentoo.org>
games-util/ucon64/Manifest | 1 +
.../files/ucon64-2.2.1-change-mem2-64bit.patch | 23
.../ucon64/files/ucon64-2.2.1-respect-flags.patch | 35
games-util/ucon64/files/ucon64-2.2.1-zlib.patch| 26 +
games-util/ucon64/ucon64-2.2.1.ebuild | 65 ++
5 files changed, 150 insertions(+)
diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
index f98924b25a0..2ead28e44b3 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -1 +1,2 @@
DIST ucon64-2.0.0-src.tar.gz 1188488 BLAKE2B
846ea6142eb50abc8165c9abb3cc05245f891b78d786798758e393032cc59c1f30fe0e70e256e308f709870bc1cc2754df30a8fababea30eda84fd1b2b64
SHA512
d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
+DIST ucon64-2.2.1-src.tar.gz 1476080 BLAKE2B
8f7010bde2c7306f6a76dec4ce5e31975c286801e6504bf8bc99287bd7adc4ab10331a8cab308fed83ece9e13bdb01327f6d3439eba776038dbb19eb2b72cf70
SHA512
34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
diff --git a/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
b/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
new file mode 100644
index 000..d07a18fdd8f
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
@@ -0,0 +1,23 @@
+Fix crash on 64bit platforms in change_mem2()
+https://bugs.gentoo.org/753950
+
+From upstream:
+https://sourceforge.net/p/ucon64/svn/2821/
+--- a/libdiscmage/misc.c
b/libdiscmage/misc.c
+@@ -1875,5 +1875,5 @@
+ if (strpos == pos_1st_esc)
+ setindex = 0; // reset argument pointer
+- if (pos_1st_esc == (unsigned int) -1)
++ if (pos_1st_esc == (size_t) -1)
+ pos_1st_esc = strpos;
+
+--- a/misc/misc.c
b/misc/misc.c
+@@ -502,5 +502,5 @@
+ if (strpos == pos_1st_esc)
+ setindex = 0; // reset argument pointer
+- if (pos_1st_esc == (unsigned int) -1)
++ if (pos_1st_esc == (size_t) -1)
+ pos_1st_esc = strpos;
+
diff --git a/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
b/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
new file mode 100644
index 000..c1c9ed6f78d
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
@@ -0,0 +1,35 @@
+Respect *FLAGS and toolchain variables in Makefiles where missing.
+--- a/Makefile
b/Makefile
+@@ -12,3 +12,3 @@
+ CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -Wno-format-truncation \
+--Wno-stringop-overflow -O3 -fsigned-char
++-Wno-stringop-overflow -fsigned-char
+ # Enable -Wstringop-overflow[=type] when it is no longer a broken, partial
+@@ -19,3 +19,2 @@
+ # ld: warning: option -s is obsolete and being ignored
+-LDFLAGS+=-s
+ endif
+--- a/backup/libcd64/Makefile
b/backup/libcd64/Makefile
+@@ -1,2 +1 @@
+-CC=gcc
+
+@@ -7,3 +6,2 @@
+ else
+-CFLAGS+=-O6 -funroll-loops -fexpensive-optimizations
+ endif
+@@ -181,4 +179,4 @@
+ else
+- ld -r $^ $(LIBS) -o $*.o
+- ar crs $@ $*.o
++ $(LD) -r $^ $(LIBS) -o $*.o
++ $(AR) crs $@ $*.o
+ endif
+--- a/libdiscmage/Makefile.in
b/libdiscmage/Makefile.in
+@@ -33,3 +33,2 @@
+ # /usr/bin/libtool: -static not specified, -s invalid
+-LDFLAGS+=-s
+ endif
+
diff --git a/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
b/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
new file mode 100644
index 000..a618c3bce75
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
@@ -0,0 +1,26 @@
+Fix undefined macro issue when compiling with zlib.
+https://bugs.gentoo.org/753950
+
+From upstream:
+https://sourceforge.net/p/ucon64/svn/2817/
+https://sourceforge.net/p/ucon64/svn/2819/
+--- a/libdiscmage/ioapi.h
b/libdiscmage/ioapi.h
+@@ -35,4 +35,7 @@
+ extern "C" {
+ #endif
++#ifndef OF
++#define OF(x) x
++#endif
+
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char*
filename, int mode));
+--- a/misc/ioapi.h
b/misc/ioapi.h
+@@ -35,4 +35,7 @@
+ extern "C" {
+ #endif
++#ifndef OF
++#define OF(x) x
++#endif
+
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char*
filename, int mode));
diff --git
[gentoo-commits] repo/gentoo:master commit in: games-util/ucon64/, games-util/ucon64/files/
commit: d31cfe534c6d3cd6cf82b3d3433f7f50c2c33c18
Author: Sam James gentoo org>
AuthorDate: Sun Apr 4 09:51:18 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 4 09:51:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31cfe53
games-util/ucon64: port to EAPI 7, eutils--
Signed-off-by: Sam James gentoo.org>
games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch | 4 +--
games-util/ucon64/files/ucon64-2.0.0-zlib.patch| 16 ++--
games-util/ucon64/ucon64-2.0.0.ebuild | 30 --
3 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
index 0a1668f2d09..22bb9a9795f 100644
--- a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
+++ b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
@@ -1,5 +1,5 @@
backup/lynxit.c.old2010-11-04 09:07:18.0 +0100
-+++ backup/lynxit.c2010-11-04 09:08:17.0 +0100
+--- a/backup/lynxit.c
b/backup/lynxit.c
@@ -561,7 +561,7 @@
return FALSE;
}
diff --git a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
index 7a122713d23..d7d3b21c833 100644
--- a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
+++ b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
@@ -1,5 +1,5 @@
misc/unzip.h.old 2011-09-23 19:53:09.708884325 +0200
-+++ misc/unzip.h 2011-09-23 19:54:00.012878355 +0200
+--- a/misc/unzip.h
b/misc/unzip.h
@@ -49,6 +49,10 @@
#include "zlib.h"
#endif
@@ -11,8 +11,8 @@
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
from (void*) without cast */
libdiscmage/unzip.h.old2011-09-23 19:59:47.319837133 +0200
-+++ libdiscmage/unzip.h2011-09-23 20:00:07.230834769 +0200
+--- a/libdiscmage/unzip.h
b/libdiscmage/unzip.h
@@ -48,6 +48,9 @@
#ifndef _ZLIB_H
#include "zlib.h"
@@ -23,8 +23,8 @@
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
libdiscmage/misc_z.c.old 2012-03-19 08:39:41.975022496 +0100
-+++ libdiscmage/misc_z.c 2012-03-19 08:40:13.109803301 +0100
+--- a/libdiscmage/misc_z.c
b/libdiscmage/misc_z.c
@@ -27,6 +27,7 @@
#include
#include
@@ -33,8 +33,8 @@
#include
#include "misc_z.h"
#include "misc.h"
misc/archive.c.old 2012-03-19 08:41:06.478999810 +0100
-+++ misc/archive.c 2012-03-19 08:41:24.134741668 +0100
+--- a/misc/archive.c
b/misc/archive.c
@@ -27,6 +27,7 @@
#include
#include
diff --git a/games-util/ucon64/ucon64-2.0.0.ebuild
b/games-util/ucon64/ucon64-2.0.0.ebuild
index 694c0f57261..64f8177f6f3 100644
--- a/games-util/ucon64/ucon64-2.0.0.ebuild
+++ b/games-util/ucon64/ucon64-2.0.0.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils
+EAPI=7
DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
HOMEPAGE="http://ucon64.sourceforge.net/";
SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
+S="${WORKDIR}"/${P}-src/src
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/${P}-src/src
+PATCHES=(
+ "${FILESDIR}"/${P}-ovflfix.patch
+ "${FILESDIR}"/${P}-zlib.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${P}-ovflfix.patch \
- "${FILESDIR}"/${P}-zlib.patch
+ default
+
sed -i \
-e "/^CFLAGS/s/-O3/${CFLAGS}/" \
-e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \
@@ -30,7 +29,7 @@ src_prepare() {
src_configure() {
local myconf
- if [[ ! -e /usr/include/sys/io.h ]] ; then
+ if [[ ! -e "${ESYSROOT}"/usr/include/sys/io.h ]] ; then
ewarn "Disabling support for parallel port"
myconf="${myconf} --disable-parallel"
fi
@@ -41,8 +40,13 @@ src_configure() {
src_install() {
dobin ucon64
dolib.so libdiscmage/discmage.so
- cd ..
- dohtml -x src -r -A png,jpg *
+
+ cd .. || die
+
+ docinto html
+ dodoc *.html
+ docinto html/images
+ dodoc images/*
}
pkg_postinst() {
