summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2020-06-23 21:44:09 +0200
committerBernard Cafarelli <voyageur@gentoo.org>2020-06-23 21:45:06 +0200
commitd5c646aeadd922c759ca7b02ea7d1d2f8e65bef1 (patch)
tree66f4ae0ed9eb0fc05c11954aa64f3402884feea7 /app-emulation
parentx11-misc/xkeyboard-config: Switch to Meson (diff)
downloadgentoo-d5c646aeadd922c759ca7b02ea7d1d2f8e65bef1.tar.gz
gentoo-d5c646aeadd922c759ca7b02ea7d1d2f8e65bef1.tar.bz2
gentoo-d5c646aeadd922c759ca7b02ea7d1d2f8e65bef1.zip
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 <voyageur@gentoo.org>
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/x48/files/x48-0.6.4-static.patch12
-rw-r--r--app-emulation/x48/files/x48-0.6.4-void_return.patch24
-rw-r--r--app-emulation/x48/x48-0.6.4-r2.ebuild12
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 00000000000..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.000000000 +0100
++++ x48-0.6.4/src/emulate.c 2020-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 00000000000..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.000000000 +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.000000000 +0100
++++ x48-0.6.4/src/x48_x11.c 2020-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
}