[gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/, app-emulation/ski/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/, app-emulation/ski/files/

[Mike Frysinger]

commit:     68d016ae9d06dd74729c9899776cd283dcd82285
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 14:08:20 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 14:13:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d016ae

app-emulation/ski: fix missing prototype warnings

 app-emulation/ski/files/ski-1.3.2-prototypes.patch | 31 ++++++++++++++++++++++
 app-emulation/ski/ski-1.3.2-r1.ebuild              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/app-emulation/ski/files/ski-1.3.2-prototypes.patch b/app-emulation/ski/files/ski-1.3.2-prototypes.patch
new file mode 100644
index 00000000..b666143
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-prototypes.patch
@@ -0,0 +1,31 @@
+fix up prototypes to avoid -Wimplicit-function-declaration warnings
+
+--- a/src/coreui.h
++++ b/src/coreui.h
+@@ -177,6 +177,7 @@
+ void stepIt_setupGtk(CTR cnt);
+ 
+ void runIt_setupX(void);
++void runIt_setupGtk(void);
+ 
+ 
+ /*--------------------------------------------------------------------------
+--- a/src/ssGtk.c
++++ b/src/ssGtk.c
+@@ -82,6 +82,7 @@
+ 
+ /* externals */
+ extern dataStart;
++ADDR iAinstAddr(ADDR baseAddr, BYTE iAmode, int delta);
+ 
+ static GtkLabel* instcount_label;
+ /* sits in a background loop */
+@@ -100,7 +101,7 @@
+ }
+ 
+ 
+-void runIt_setupGtk(void *data)
++void runIt_setupGtk(void)
+ {
+ 	g_idle_add(runItGtk, NULL);
+ 	stopPressed = NO;

diff --git a/app-emulation/ski/ski-1.3.2-r1.ebuild b/app-emulation/ski/ski-1.3.2-r1.ebuild
index 23d9c25..3ca2624 100644
--- a/app-emulation/ski/ski-1.3.2-r1.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r1.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-binutils.patch
 	"${FILESDIR}"/${P}-uselib.patch #592226
 	"${FILESDIR}"/${P}-ncurses-config.patch
+	"${FILESDIR}"/${P}-prototypes.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/, app-emulation/ski/files/

[Sergei Trofimovich]

commit:     789f7c6ed955d89c15aea30a5b7a234ab9be7757
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 06:56:16 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 07:00:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789f7c6e

app-emulation/ski: fix built failure against glibc-2.28

<ustat.h> was removed in glibc-2.28.
While at it added missing dependency on binutils-libs.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch |  8 ++++
 app-emulation/ski/ski-1.3.2-r3.ebuild              | 53 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch b/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
new file mode 100644
index 00000000000..f09c5b41056
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
@@ -0,0 +1,8 @@
+--- a/src/dos.c
++++ b/src/dos.c
+@@ -51,5 +51,2 @@ extern int localtime_r(const __time_t *, __struct_tm *);
+ #include <unistd.h>	/* Also #includes <utime.h> */
+-#if !defined(__FreeBSD__)
+-#include <ustat.h>
+-#endif
+ #include <sys/utsname.h>

diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild
new file mode 100644
index 00000000000..a6551f5c0b8
--- /dev/null
+++ b/app-emulation/ski/ski-1.3.2-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="ia64 instruction set simulator"
+HOMEPAGE="http://ski.sourceforge.net/ http://www.gelato.unsw.edu.au/IA64wiki/SkiSimulator"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="motif"
+
+RDEPEND="dev-libs/libltdl:0=
+	sys-libs/binutils-libs:0=
+	sys-libs/ncurses:0=
+	virtual/libelf
+	motif? ( x11-libs/motif:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	dev-util/gperf"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syscall-linux-includes.patch
+	"${FILESDIR}"/${P}-remove-hayes.patch
+	"${FILESDIR}"/${P}-no-local-ltdl.patch
+	"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
+	"${FILESDIR}"/${P}-configure-withval.patch
+	"${FILESDIR}"/${P}-binutils.patch
+	"${FILESDIR}"/${P}-uselib.patch #592226
+	"${FILESDIR}"/${P}-ncurses-config.patch
+	"${FILESDIR}"/${P}-prototypes.patch
+	"${FILESDIR}"/${P}-glibc-2.28.patch
+)
+
+src_prepare() {
+	default
+
+	rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
+
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-included-ltdl \
+		--without-gtk \
+		$(use_with motif x11)
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/, app-emulation/ski/files/

[Sergei Trofimovich]

commit:     adaca90bc8e6bcf0df7e14452d8292487ab6aa1e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 22:52:11 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 22:52:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adaca90b

app-emulation/ski: tweak for binutils-2.34

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../ski/files/ski-1.3.2-binutils-2.34.patch        | 22 ++++++++++++++++++++++
 app-emulation/ski/ski-1.3.2-r3.ebuild              |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
new file mode 100644
index 00000000000..dcb3f6793fb
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
@@ -0,0 +1,22 @@
+diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
+index 73be0e6..c4051a3 100644
+--- a/src/linux/dwarf-linux.c
++++ b/src/linux/dwarf-linux.c
+@@ -116,14 +116,14 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
+   /*
+    * we're looking at loadable code only
+    */
+-  if ((bfd_get_section_flags (bfd, sect) & (SEC_CODE | SEC_ALLOC)) == 0)
++  if ((bfd_section_flags (sect) & (SEC_CODE | SEC_ALLOC)) == 0)
+     return;
+ 
+   /*
+    * check if address belongs to this section
+    */
+-  vma = bfd_get_section_vma (bfd, sect);
+-  size = bfd_section_size (bfd, sect);
++  vma = bfd_section_vma (sect);
++  size = bfd_section_size (sect);
+ 
+   offset = info->address - vma;
+   if (offset >= size)

diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild
index e64df45c125..7fa7d9227e0 100644
--- a/app-emulation/ski/ski-1.3.2-r3.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r3.ebuild
@@ -44,6 +44,10 @@ PATCHES=(
 src_prepare() {
 	default
 
+	if has_version ">=sys-libs/binutils-libs-2.34"; then
+		eapply "${FILESDIR}"/${PN}-1.3.2-binutils-2.34.patch
+	fi
+
 	rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
 
 	AT_M4DIR="macros" eautoreconf

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/, app-emulation/ski/files/

[Sam James]

commit:     7509eb9a2f072b029ce31220cbe6de9e4aba3613
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Aug 14 22:00:59 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 22:32:17 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7509eb9a

app-emulation/ski: fix glibc-2.42 - termio

remove occurences of termio.h and "struct termio"

Closes: https://bugs.gentoo.org/961423
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43451
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/ski/files/ski-1.5.0-fix_termio.patch | 49 ++++++++++++++++++++++
 app-emulation/ski/ski-1.5.0.ebuild                 |  5 +++
 2 files changed, 54 insertions(+)

diff --git a/app-emulation/ski/files/ski-1.5.0-fix_termio.patch b/app-emulation/ski/files/ski-1.5.0-fix_termio.patch
new file mode 100644
index 000000000000..d1a5b5850ef6
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.5.0-fix_termio.patch
@@ -0,0 +1,49 @@
+PRs merged
+https://github.com/trofi/ski/pull/17.patch
+https://github.com/trofi/ski/pull/18.patch
+Remove occurrences of termio.h and struct termio. Bug #961423
+--- a/src/dos.c
++++ b/src/dos.c
+@@ -35,13 +35,10 @@
+ #include <sys/stat.h>
+ #include <signal.h>
+ #include <string.h>
+-#if defined(__FreeBSD__)
+ #include <termios.h>
+-#define termio  termios
++#if defined(__FreeBSD__)
+ #define TCGETA  TIOCGETA
+ #define TCSETA  TIOCSETA
+-#else
+-#include <termio.h>
+ #endif
+ #include <time.h>
+ #if defined __linux__
+@@ -140,7 +137,7 @@ Status dosInt21(BYTE func, BYTE subFunc)
+ 	break;
+     case 0x08:				/* read keyboard without echo */
+ 	if (isatty(fhmap[0])) {
+-	    struct termio origTermio, newTermio;
++	    struct termios origTermio, newTermio;
+ 
+ 	    (void)ioctl(fhmap[0], TCGETA, &origTermio);
+ 	    newTermio = origTermio;
+--- a/src/linux/syscall-linux.c
++++ b/src/linux/syscall-linux.c
+@@ -2147,14 +2147,14 @@ doSyscall (HWORD num, REG arg0, REG arg1, REG arg2, REG arg3, REG arg4,
+ 
+ 	case TCGETA:
+ 	  /* assumes host OS matches Linux/ia64 */
+-	  bytes_out = sizeof (struct termio);
++	  bytes_out = sizeof (struct termios);
+ 	  break;
+ 
+ 	case TCSETA:
+ 	case TCSETAW:
+ 	case TCSETAF:
+ 	  /* assumes host OS matches Linux/ia64 */
+-	  bytes_in = sizeof (struct termio);
++	  bytes_in = sizeof (struct termios);
+ 	  break;
+ 
+ 	case TIOCGPGRP:

diff --git a/app-emulation/ski/ski-1.5.0.ebuild b/app-emulation/ski/ski-1.5.0.ebuild
index 64cb3ed2767e..1e16ff19a53c 100644
--- a/app-emulation/ski/ski-1.5.0.ebuild
+++ b/app-emulation/ski/ski-1.5.0.ebuild
@@ -24,6 +24,11 @@ DEPEND="
 	dev-util/gperf
 "
 
+PATCHES=(
+	# merged, to be removed for the next version
+	"${FILESDIR}"/${P}-fix_termio.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_with debug bfd)