public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/files/, app-emulation/ski/
@ 2017-01-19 14:14 Mike Frysinger
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2017-01-19 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     b55ca97697d55f208cf0bfd76790833daf247cac
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 13:26:46 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 14:13:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b55ca976

app-emulation/ski: add Fedora patch to fix building w/newer glibc #592226

 app-emulation/ski/files/ski-1.3.2-uselib.patch | 18 ++++++++++++++++++
 app-emulation/ski/ski-1.3.2-r1.ebuild          |  1 +
 2 files changed, 19 insertions(+)

diff --git a/app-emulation/ski/files/ski-1.3.2-uselib.patch b/app-emulation/ski/files/ski-1.3.2-uselib.patch
new file mode 100644
index 00000000..d600cb2
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-uselib.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/592226
+
+patch taken from Fedora
+
+glibc-2.23+ no longer exports the uselib function.  make the syscall directly.
+
+--- ski-1.3.2/src/linux/syscall-linux.c
++++ ski-1.3.2/src/linux/syscall-linux.c
+@@ -554,7 +554,8 @@
+ extern void munmapSyms (ADDR, ADDR);
+ extern void dynBlock (ADDR, ADDR);
+ extern void memFree (ADDR);
+-extern int uselib (const char *libname);	/* Linux specific */
++#include <sys/syscall.h>
++#define uselib(libname) syscall(__NR_uselib, libname)
+ 
+ extern int setresuid (uid_t, uid_t, uid_t);
+ extern int getresuid (uid_t *, uid_t *, uid_t *);

diff --git a/app-emulation/ski/ski-1.3.2-r1.ebuild b/app-emulation/ski/ski-1.3.2-r1.ebuild
index d736233..44caa27 100644
--- a/app-emulation/ski/ski-1.3.2-r1.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
 	"${FILESDIR}"/${P}-configure-withval.patch
 	"${FILESDIR}"/${P}-binutils.patch
+	"${FILESDIR}"/${P}-uselib.patch #592226
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/files/, app-emulation/ski/
@ 2017-01-19 14:14 Mike Frysinger
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2017-01-19 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     4237139655a285835302c9d1282ae765ff511488
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 14:07:49 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=42371396

app-emulation/ski: fix building w/ncurses[tinfo]

 .../ski/files/ski-1.3.2-ncurses-config.patch       | 25 ++++++++++++++++++++++
 app-emulation/ski/ski-1.3.2-r1.ebuild              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
new file mode 100644
index 00000000..4317df4
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
@@ -0,0 +1,25 @@
+use pkg-config to look up ncurses deps to support things like split tinfo
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,6 +93,7 @@
+ AC_PROG_SED
+ AC_PROG_YACC
+ AM_PROG_LEX
++PKG_PROG_PKG_CONFIG
+ 
+ AC_C_INLINE
+ AC_C_CONST
+@@ -304,9 +305,9 @@
+ fi    
+ 
+ if test "x$check_curses" != xno; then
+-AC_CHECK_LIB(curses, tgetent, [],
+-    [AC_CHECK_LIB(ncurses, tgetent, ,
+-            [AC_MSG_ERROR(Required curses library not found.)])])
++    PKG_CHECK_MODULES([NCURSES], [ncurses])
++    CFLAGS="$CFLAGS $NCURSES_CFLAGS"
++    LIBS="$LIBS $NCURSES_LIBS"
+ fi
+ 
+ AC_CHECK_LIB(elf, elf_begin, [],

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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/files/, app-emulation/ski/
@ 2020-01-29 20:16 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-01-29 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8c07d209f2974a24906f4ac9bdddd48e0dc3b063
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 20:15:59 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 20:16:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c07d209

app-emulation/ski: tweak for gcc-10

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/707144
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-emulation/ski/files/ski-1.3.2-gcc-10.patch | 22 ++++++++++++++++++++++
 app-emulation/ski/ski-1.3.2-r3.ebuild          |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
new file mode 100644
index 00000000000..bfe5de33acb
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
@@ -0,0 +1,22 @@
+--- a/src/linux/syscall-linux.c
++++ b/src/linux/syscall-linux.c
+@@ -538,7 +538,7 @@ pid_t cons_pid = -1;
+ static int cfd = -1;
+ BOOL trace_syscalls;
+ char *consLog = NULL;
+-extern BOOL noConsole;
++BOOL noConsole;
+ extern BOOL userint;
+ static struct termios sane_ttyIos;
+ 
+--- a/src/platform.c
++++ b/src/platform.c
+@@ -29,7 +29,7 @@
+ #include "platform.h"
+ #include "state.h"
+ 
+-BOOL autoAlloc, noConsole;
++extern BOOL autoAlloc, noConsole;
+ extern char *consLog;
+ extern unsigned va_len, pa_len, rid_len, key_len;
+ extern unsigned mips;

diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild
index 1063017aad0..e64df45c125 100644
--- a/app-emulation/ski/ski-1.3.2-r3.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-ncurses-config.patch
 	"${FILESDIR}"/${P}-prototypes.patch
 	"${FILESDIR}"/${P}-glibc-2.28.patch
+	"${FILESDIR}"/${P}-gcc-10.patch #707144
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/files/, app-emulation/ski/
@ 2020-09-27  8:55 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-09-27  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a887bd2d76e02b7842fc72ecd69f8fbf32f98a36
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 08:55:14 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 08:55:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a887bd2d

app-emulation/ski: fix lexter/parser generation race

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/744676
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-emulation/ski/files/ski-1.3.2-lex-deps.patch | 17 +++++++++++++++++
 app-emulation/ski/ski-1.3.2-r4.ebuild            |  1 +
 2 files changed, 18 insertions(+)

diff --git a/app-emulation/ski/files/ski-1.3.2-lex-deps.patch b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
new file mode 100644
index 00000000000..1dc8470864e
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
@@ -0,0 +1,17 @@
+escan.l depends on generated eparse.h.
+If eparse.h is not present yet escan.o
+could be built before ${YACC) is ran.
+
+https://bugs.gentoo.org/744676
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -113,7 +113,8 @@ BUILT_SOURCES= \
+ 	$(DAS_INSTR_DERIVED) \
+ 	$(ASM_HASH_DERIVED) \
+ 	$(ICNT_DERIVED) \
+-	instr.c
++	instr.c \
++	eparse.h
+ 
+ ski_SOURCES= \
+ 	main.c

diff --git a/app-emulation/ski/ski-1.3.2-r4.ebuild b/app-emulation/ski/ski-1.3.2-r4.ebuild
index 3d904abf6d4..ed996625c01 100644
--- a/app-emulation/ski/ski-1.3.2-r4.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r4.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-prototypes.patch
 	"${FILESDIR}"/${P}-glibc-2.28.patch
 	"${FILESDIR}"/${P}-gcc-10.patch #707144
+	"${FILESDIR}"/${P}-lex-deps.patch #744676
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/files/, app-emulation/ski/
@ 2024-09-02 21:18 Petr Vaněk
  0 siblings, 0 replies; 5+ messages in thread
From: Petr Vaněk @ 2024-09-02 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     1833e3c9179a6a89c03e8b63faa173f09ca77674
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 20:55:33 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 21:17:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1833e3c9

app-emulation/ski: drop 1.3.2-r4

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 app-emulation/ski/Manifest                         |  1 -
 .../ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch       | 75 ----------------------
 .../ski/files/ski-1.3.2-binutils-2.34.patch        | 22 -------
 app-emulation/ski/files/ski-1.3.2-binutils.patch   | 31 ---------
 .../ski/files/ski-1.3.2-configure-withval.patch    | 22 -------
 app-emulation/ski/files/ski-1.3.2-gcc-10.patch     | 22 -------
 app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch |  8 ---
 app-emulation/ski/files/ski-1.3.2-lex-deps.patch   | 17 -----
 .../ski/files/ski-1.3.2-ncurses-config.patch       | 25 --------
 .../ski/files/ski-1.3.2-no-local-ltdl.patch        | 22 -------
 app-emulation/ski/files/ski-1.3.2-prototypes.patch | 31 ---------
 .../ski/files/ski-1.3.2-remove-hayes.patch         | 14 ----
 .../files/ski-1.3.2-syscall-linux-includes.patch   | 18 ------
 app-emulation/ski/files/ski-1.3.2-uselib.patch     | 18 ------
 app-emulation/ski/ski-1.3.2-r4.ebuild              | 63 ------------------
 15 files changed, 389 deletions(-)

diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index dbb5bd287253..685a61415153 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -1,2 +1 @@
-DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
 DIST ski-1.4.0.tar.xz 2373876 BLAKE2B c9c20582274dd6db6e216c709a1793b55ac2c1aaf26c5e235bffdd190e9e7dca4c7ef37f96309c61ba9b5f03229966710a65405e2a345d65a08b9163f545c85b SHA512 855bc73c2cd93d890cd532db524eecc122d5f3eddf189efdbf34069d1c9bd7b7f98d5e593387fdc31b38fc8630f00b6b126f5c1a1f22dab57447e024b9015cf5

diff --git a/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch b/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch
deleted file mode 100644
index 34a7d8183702..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-use standard AC_C_BIGENDIAN macro rather than trying to define it manually
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -155,52 +155,24 @@ AC_SUBST(GSKI_CFLAGS)
- AC_SUBST(GSKI_LIBS)
- AM_CONDITIONAL(WITH_GTK_INTERFACE, test "x$with_gtk" = "xyes")
- 
--dnl Target endianness
--AC_ARG_ENABLE(bigendian,
--AC_HELP_STRING([--enable-bigendian],
--    [the target is big endian default=no]),
--ski_cv_c_target_bigendian=${enableval}, ski_cv_c_target_bigendian=no)
--
- dnl Check for host endianness
- AC_CACHE_CHECK([whether host byte ordering is defined in sys/param.h],
- ski_cv_c_bigendian_compile,
- [AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/param.h>
- ],[
- #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- #error bogus endian macros
- #endif
- ],
- ski_cv_c_bigendian_compile=yes, ski_cv_c_bigendian_compile=no)])
- 
- if test "x$ski_cv_c_bigendian_compile" = xyes; then
- AC_DEFINE(ENDIANESS_IN_SYS_PARAM_H, 1,
-     [define if sys/param.h defines the endiness])
--else
--AC_CACHE_CHECK([whether host byte ordering is big endian],
--ski_cv_c_bigendian,
--[AC_TRY_RUN([int main () {
--    union {
--        long l;
--        char c[sizeof (long)];
--    } u;
--    u.l = 1;
--    return (u.c[sizeof (long) - 1] == 1);
--}],
--ski_cv_c_bigendian=no, ski_cv_c_bigendian=yes,
--AC_MSG_ERROR([cannot detect host endianness]))])
--
--AC_DEFINE(BIG_ENDIAN,    4321, [define to 4321 if missing from sys/param.h])
--AC_DEFINE(LITTLE_ENDIAN, 1234, [define to 4321 if missing from sys/param.h])
--if test "x$ski_cv_c_bigendian" = xyes; then
--    AC_DEFINE(BYTE_ORDER, 4321,
--        [define to 4321 if host is big endian, 1234 if little endian])
--else
--    AC_DEFINE(BYTE_ORDER, 1234,
--        [define to 4321 if host is big endian, 1234 if little endian])
--fi
- fi
-+AC_C_BIGENDIAN
- 
- dnl Check for variables & functions
- 
---- a/src/std.h
-+++ b/src/std.h
-@@ -62,6 +62,14 @@ extern unsigned long long __strtoull(const char *, char **, int);
- #   define BIG_ENDIAN 4321
- #   define LITTLE_ENDIAN 1234
- #   define BYTE_ORDER BIG_ENDIAN
-+# else
-+#  define BIG_ENDIAN 4321
-+#  define LITTLE_ENDIAN 1234
-+#  ifdef WORDS_BIGENDIAN
-+#   define BYTE_ORDER BIG_ENDIAN
-+#  else
-+#   define BYTE_ORDER LITTLE_ENDIAN
-+#  endif
- # endif /* !defined HAVE_CONFIG_H */
- #endif /* !defined ENDIANESS_IN_SYS_PARAM_H */
- 

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
deleted file mode 100644
index dcb3f6793fba..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-binutils-2.34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/ski-1.3.2-binutils.patch b/app-emulation/ski/files/ski-1.3.2-binutils.patch
deleted file mode 100644
index 71094f3bf4b6..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-binutils.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 30d3253c6b413ba22ca0ca30dcd4c4c24daec2e1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 19 Aug 2014 09:42:43 +0300
-Subject: [PATCH] Fix build failure against binutils-2.16.1 and upper.
-
-Follow binutils' upstream change from 2004:
-
-    https://sourceware.org/git/?p=binutils.git;a=commitdiff;h=7e2dd9e4c3e0b69dcb7d471b891879b5fd28687e
-    > section.c (struct sec): Rename "_cooked_size" to "size".
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/linux/dwarf-linux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
-index 1941a1f..73be0e6 100644
---- a/src/linux/dwarf-linux.c
-+++ b/src/linux/dwarf-linux.c
-@@ -155,7 +155,7 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
- 	      first.function = function;
- 	      first.line = line;
- 	      first.num_lines = 1;
--	      first.limit = sect->_cooked_size;
-+	      first.limit = sect->size;
- 	      last_line = line;
- 	    }
- 	  if (line > last_line
--- 
-2.0.4
-

diff --git a/app-emulation/ski/files/ski-1.3.2-configure-withval.patch b/app-emulation/ski/files/ski-1.3.2-configure-withval.patch
deleted file mode 100644
index 7bb3ce9fc85c..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-configure-withval.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix handling of 3rd/4th args to AC_ARG_WITH()
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -130,7 +130,7 @@ dnl See if we build X11
- AC_ARG_WITH(x11,
- AC_HELP_STRING([--with-x11],
-     [Enable the Motif based X11 interface default=no]),
--    [with_x11=yes],[with_x11=no])
-+    [with_x11=$withval])
-   
- if test "x$with_x11" = "xyes"; then
-   dnl Check for motif, error out if not found
-@@ -144,7 +144,7 @@ dnl See if we build GTK
- AC_ARG_WITH(gtk,
- AC_HELP_STRING([--with-gtk],
-     [Enable building the GTK Ski interface default=no]),
--    [with_gtk=yes],[with_gtk=no]
-+    [with_gtk=$withval]
- )
- 
- if test "x$with_gtk" = "xyes"; then

diff --git a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch b/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
deleted file mode 100644
index bfe5de33acbf..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-gcc-10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/linux/syscall-linux.c
-+++ b/src/linux/syscall-linux.c
-@@ -538,7 +538,7 @@ pid_t cons_pid = -1;
- static int cfd = -1;
- BOOL trace_syscalls;
- char *consLog = NULL;
--extern BOOL noConsole;
-+BOOL noConsole;
- extern BOOL userint;
- static struct termios sane_ttyIos;
- 
---- a/src/platform.c
-+++ b/src/platform.c
-@@ -29,7 +29,7 @@
- #include "platform.h"
- #include "state.h"
- 
--BOOL autoAlloc, noConsole;
-+extern BOOL autoAlloc, noConsole;
- extern char *consLog;
- extern unsigned va_len, pa_len, rid_len, key_len;
- extern unsigned mips;

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
deleted file mode 100644
index f09c5b410563..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-glibc-2.28.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/files/ski-1.3.2-lex-deps.patch b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
deleted file mode 100644
index 1dc8470864e2..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-escan.l depends on generated eparse.h.
-If eparse.h is not present yet escan.o
-could be built before ${YACC) is ran.
-
-https://bugs.gentoo.org/744676
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -113,7 +113,8 @@ BUILT_SOURCES= \
- 	$(DAS_INSTR_DERIVED) \
- 	$(ASM_HASH_DERIVED) \
- 	$(ICNT_DERIVED) \
--	instr.c
-+	instr.c \
-+	eparse.h
- 
- ski_SOURCES= \
- 	main.c

diff --git a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
deleted file mode 100644
index 4317df415efa..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-use pkg-config to look up ncurses deps to support things like split tinfo
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,6 +93,7 @@
- AC_PROG_SED
- AC_PROG_YACC
- AM_PROG_LEX
-+PKG_PROG_PKG_CONFIG
- 
- AC_C_INLINE
- AC_C_CONST
-@@ -304,9 +305,9 @@
- fi    
- 
- if test "x$check_curses" != xno; then
--AC_CHECK_LIB(curses, tgetent, [],
--    [AC_CHECK_LIB(ncurses, tgetent, ,
--            [AC_MSG_ERROR(Required curses library not found.)])])
-+    PKG_CHECK_MODULES([NCURSES], [ncurses])
-+    CFLAGS="$CFLAGS $NCURSES_CFLAGS"
-+    LIBS="$LIBS $NCURSES_LIBS"
- fi
- 
- AC_CHECK_LIB(elf, elf_begin, [],

diff --git a/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch b/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch
deleted file mode 100644
index aa75146668b5..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-build against the system ltdl rather than the local copy
-
---- ski-1.3.2/src/Makefile.am
-+++ ski-1.3.2/src/Makefile.am
-@@ -181,8 +181,7 @@
- 	eparse.h \
- 	libdas.h \
- 	netdev.h \
--	osload.h \
--	ltdl.h
-+	osload.h 
- 
- EXTRA_linux_FILES = \
- 	linux/dwarf-linux.c \
-@@ -279,7 +278,6 @@
- 	eparse.y \
- 	escan.l \
- 	load.c \
--	ltdl.c \
- 	platform.c \
- 	libdas.c \
- 	libsrs.c

diff --git a/app-emulation/ski/files/ski-1.3.2-prototypes.patch b/app-emulation/ski/files/ski-1.3.2-prototypes.patch
deleted file mode 100644
index b66614368708..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-prototypes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/files/ski-1.3.2-remove-hayes.patch b/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch
deleted file mode 100644
index 3e9de483fd17..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-## Description: Remove references to HAYES
-## Origin/Author: Andreas Moog <amoog@ubuntu.com>
-## Bug-Ubuntu: https://bugs.launchpad.net/bugs/756157
---- ski//src/linux/syscall-linux.c
-+++ ski.new//src/linux/syscall-linux.c
-@@ -2250,8 +2250,6 @@
- 	case TIOCSERSETMULTI:	/* Set multiport config */
- 	case TIOCMIWAIT:	/* wait for a change on serial input line(s) */
- 	case TIOCGICOUNT:	/* read serial port inline interrupt counts */
--	case TIOCGHAYESESP:	/* Get Hayes ESP configuration */
--	case TIOCSHAYESESP:	/* Set Hayes ESP configuration */
- 	case SIOCRTMSG:	/* call to routing system	*/
- 	case SIOCSIFLINK:	/* set iface channel		*/
- 	case SIOCGIFMEM:	/* get memory address (BSD)	*/

diff --git a/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch b/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch
deleted file mode 100644
index e3c1083687ac..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ski-1.3.2/src/linux/syscall-linux.c
-+++ ski-1.3.2/src/linux/syscall-linux.c
-@@ -45,7 +45,6 @@
- #include <linux/posix_types.h>
- #include <linux/personality.h>
- #include <linux/sockios.h>
--#include <sys/io.h>
- 
- #include <sys/file.h>
- #include <sys/fsuid.h>
-@@ -72,7 +71,6 @@
- #include <sys/uio.h>
- 
- #include <linux/serial.h>
--#include <asm/page.h>
- #include <asm/unistd.h>
- 
- #include "std.h"

diff --git a/app-emulation/ski/files/ski-1.3.2-uselib.patch b/app-emulation/ski/files/ski-1.3.2-uselib.patch
deleted file mode 100644
index d600cb2ce3fa..000000000000
--- a/app-emulation/ski/files/ski-1.3.2-uselib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/592226
-
-patch taken from Fedora
-
-glibc-2.23+ no longer exports the uselib function.  make the syscall directly.
-
---- ski-1.3.2/src/linux/syscall-linux.c
-+++ ski-1.3.2/src/linux/syscall-linux.c
-@@ -554,7 +554,8 @@
- extern void munmapSyms (ADDR, ADDR);
- extern void dynBlock (ADDR, ADDR);
- extern void memFree (ADDR);
--extern int uselib (const char *libname);	/* Linux specific */
-+#include <sys/syscall.h>
-+#define uselib(libname) syscall(__NR_uselib, libname)
- 
- extern int setresuid (uid_t, uid_t, uid_t);
- extern int getresuid (uid_t *, uid_t *, uid_t *);

diff --git a/app-emulation/ski/ski-1.3.2-r4.ebuild b/app-emulation/ski/ski-1.3.2-r4.ebuild
deleted file mode 100644
index ae695b1a8056..000000000000
--- a/app-emulation/ski/ski-1.3.2-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="ia64 instruction set simulator"
-HOMEPAGE="http://ski.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug motif"
-
-RDEPEND="dev-libs/libltdl:0=
-	sys-libs/ncurses:0=
-	virtual/libelf
-	debug? ( sys-libs/binutils-libs:0= )
-	motif? ( x11-libs/motif:0= )"
-DEPEND="${RDEPEND}
-	app-alternatives/yacc
-	app-alternatives/lex
-	dev-util/gperf"
-
-# games-sports/ski and app-emulation/ski both install 'ski' binary, bug #653110
-RDEPEND="${RDEPEND} !!games-sports/ski"
-
-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
-	"${FILESDIR}"/${P}-gcc-10.patch #707144
-	"${FILESDIR}"/${P}-lex-deps.patch #744676
-)
-
-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
-}
-
-src_configure() {
-	econf \
-		--without-included-ltdl \
-		--without-gtk \
-		$(use_with motif x11) \
-		$(use_with debug bfd)
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-02 21:18 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-19 14:14 [gentoo-commits] repo/gentoo:master commit in: app-emulation/ski/files/, app-emulation/ski/ Mike Frysinger
  -- strict thread matches above, loose matches on Subject: below --
2017-01-19 14:14 Mike Frysinger
2020-01-29 20:16 Sergei Trofimovich
2020-09-27  8:55 Sergei Trofimovich
2024-09-02 21:18 Petr Vaněk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox