[gentoo-commits] repo/gentoo:master commit in: app-emulation/x48/, app-emulation/x48/files/
commit: a63ca21efdd5a67c58bbfa9b0ae2013dc471ba1d
Author: NHOrus yahoo com>
AuthorDate: Sun May 12 12:08:10 2024 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Sun May 12 22:34:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63ca21e
app-emulation/x48: Enable feature-macro locked libc extensions
Closes: https://bugs.gentoo.org/871468
Signed-off-by: NHOrus yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36653
Signed-off-by: Bernard Cafarelli gentoo.org>
app-emulation/x48/files/x48-0.6.4-configure.patch | 11
app-emulation/x48/x48-0.6.4-r3.ebuild | 70 +++
2 files changed, 81 insertions(+)
diff --git a/app-emulation/x48/files/x48-0.6.4-configure.patch
b/app-emulation/x48/files/x48-0.6.4-configure.patch
new file mode 100644
index ..ea3a883991a8
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.4-configure.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2024-05-12 12:01:50.591368113 -
b/configure.ac 2024-05-12 12:05:39.116023749 -
+@@ -10,6 +10,8 @@
+ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADER([config.h])
+
++
++AC_USE_SYSTEM_EXTENSIONS
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
diff --git a/app-emulation/x48/x48-0.6.4-r3.ebuild
b/app-emulation/x48/x48-0.6.4-r3.ebuild
new file mode 100644
index ..c584c99e820a
--- /dev/null
+++ b/app-emulation/x48/x48-0.6.4-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="HP48 Calculator Emulator"
+HOMEPAGE="https://sourceforge.net/projects/x48.berlios/;
+SRC_URI="https://downloads.sourceforge.net/x48.berlios/${P}.tar.bz2;
+S=${WORKDIR}
+
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="readline"
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXext
+ readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ x11-libs/libXt"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-static.patch
+ "${FILESDIR}"/${P}-void_return.patch
+ "${FILESDIR}"/${P}-configure.patch
+ )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable readline)
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/"${PN}"/romdump
+ doins -r romdump/{README,ROMDump*}
+}
+
+pkg_postinst() {
+ elog "The X48 emulator requires an HP48 ROM image to run."
+ elog
+ elog "If you own an HP-48 calculator, you can use the ROMDump utility"
+ elog "included with this package to obtain it from your calculator."
+ elog "The instructions of how to do this are included in the package."
+ elog
+ elog "Alternatively, HP has provided the ROM images for non-commercial"
+ elog "use only."
+ elog
+ elog "Due to confusion over the legal status of these ROMs you must"
+ elog "manually download one from
http://www.hpcalc.org/hp48/pc/emulators/;
+ elog
+ elog "If you do not know which one to use, try 'HP 48GX Revision R
ROM.'"
+ elog
+ elog "Once you have a ROM, you will need to install it by running:"
+ elog
+ elog "x48 -rom gxrom-r"
+ elog
+ elog "You will only have to do this the first time you run X48. The"
+ elog "ROM will be stored in ~/.hp48/rom for future runs."
+}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/x48/, app-emulation/x48/files/
commit: d5c646aeadd922c759ca7b02ea7d1d2f8e65bef1
Author: Bernard Cafarelli gentoo org>
AuthorDate: Tue Jun 23 19:44:09 2020 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Tue Jun 23 19:45:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c646ae
app-emulation/x48: fix compilation with clang
Closes: https://bugs.gentoo.org/729242
Package-Manager: Portage-2.3.102, Repoman-2.3.23
Signed-off-by: Bernard Cafarelli gentoo.org>
app-emulation/x48/files/x48-0.6.4-static.patch | 12 +++
.../x48/files/x48-0.6.4-void_return.patch | 24 ++
app-emulation/x48/x48-0.6.4-r2.ebuild | 12 +--
3 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/app-emulation/x48/files/x48-0.6.4-static.patch
b/app-emulation/x48/files/x48-0.6.4-static.patch
new file mode 100644
index 000..f832e877b76
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.4-static.patch
@@ -0,0 +1,12 @@
+diff -Naur x48-0.6.4.orig/src/emulate.c x48-0.6.4/src/emulate.c
+--- x48-0.6.4.orig/src/emulate.c 2011-11-15 04:03:40.0 +0100
x48-0.6.4/src/emulate.c2020-06-23 21:30:30.895538239 +0200
+@@ -695,7 +695,7 @@
+ }
+ }
+
+-inline int
++static inline int
+ #ifdef __FunctionProto__
+ decode_8_thru_f(int op1)
+ #else
diff --git a/app-emulation/x48/files/x48-0.6.4-void_return.patch
b/app-emulation/x48/files/x48-0.6.4-void_return.patch
new file mode 100644
index 000..521ab6cd054
--- /dev/null
+++ b/app-emulation/x48/files/x48-0.6.4-void_return.patch
@@ -0,0 +1,24 @@
+diff -Naur x48-0.6.4.orig/src/debugger.c x48-0.6.4/src/debugger.c
+--- x48-0.6.4.orig/src/debugger.c 2011-11-15 04:03:40.0 +0100
x48-0.6.4/src/debugger.c 2020-06-23 21:33:16.071667987 +0200
+@@ -1528,7 +1528,7 @@
+ struct se *se_next;
+ };
+
+-char *
++void
+ #ifdef __FunctionProto__
+ get_stack (void)
+ #else
+diff -Naur x48-0.6.4.orig/src/x48_x11.c x48-0.6.4/src/x48_x11.c
+--- x48-0.6.4.orig/src/x48_x11.c 2011-11-15 04:03:40.0 +0100
x48-0.6.4/src/x48_x11.c2020-06-23 21:33:32.132680745 +0200
+@@ -3833,7 +3833,7 @@
+
+ int last_button = -1;
+
+-extern char *get_stack(void);
++extern void get_stack(void);
+
+ int
+ #ifdef __FunctionProto__
diff --git a/app-emulation/x48/x48-0.6.4-r2.ebuild
b/app-emulation/x48/x48-0.6.4-r2.ebuild
index 47413f32496..9e603e25e58 100644
--- a/app-emulation/x48/x48-0.6.4-r2.ebuild
+++ b/app-emulation/x48/x48-0.6.4-r2.ebuild
@@ -22,15 +22,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
x11-libs/libXt"
-src_unpack() {
- mkdir -p "${S}"
- cd "${S}"
- unpack ${A}
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-static.patch
+ "${FILESDIR}"/${P}-void_return.patch
+ )
+
+S=${WORKDIR}
src_prepare() {
default
- sed -i '698s/inline/static inline/' src/emulate.c || die
eautoreconf
}
