bochs: build with -DANDROID (#468)

x11-packages/bochs/bochs.h.patch

@@ -1,20 +0,0 @@
---- a/bochs.h
-+++ b/bochs.h
-@@ -530,7 +530,7 @@
-     *((Bit16u*)(hostPtr)) = (nativeVar16)
- #define WriteHostDWordToLittleEndian(hostPtr, nativeVar32) \
-     *((Bit32u*)(hostPtr)) = (nativeVar32)
--#ifdef ANDROID
-+#if defined ANDROID || (defined __ANDROID__ && defined __arm__)
- // Resolve problems with unaligned access
- #define WriteHostQWordToLittleEndian(hostPtr, nativeVar64) { \
-     ((Bit8u *)(hostPtr))[0] = (Bit8u) (nativeVar64); \
-@@ -550,7 +550,7 @@
-     (nativeVar16) = *((Bit16u*)(hostPtr))
- #define ReadHostDWordFromLittleEndian(hostPtr, nativeVar32) \
-     (nativeVar32) = *((Bit32u*)(hostPtr))
--#ifdef ANDROID
-+#if defined ANDROID || (defined __ANDROID__ && defined __arm__)
- // Resolve problems with unaligned access
- #define ReadHostQWordFromLittleEndian(hostPtr, nativeVar64) { \
-     (nativeVar64) = ((Bit64u) ((Bit8u *)(hostPtr))[0]) | \

x11-packages/bochs/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://bochs.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Bochs is a highly portable open source IA-32 (x86) PC emulator and debugger written in C++."
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=2.6.9
-TERMUX_PKG_REVISION=18
+TERMUX_PKG_REVISION=19
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/bochs/bochs-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c
 TERMUX_PKG_DEPENDS="atk, fontconfig, freetype, gdk-pixbuf, glib, gtk2, libc++, libcairo, libgraphite, libx11, libxpm, libxrandr, ncurses, pango, readline"
@@ -26,3 +26,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-clgd54xx
 --enable-voodoo
 "
+
+termux_step_pre_configure() {
+	CFLAGS+=" -DANDROID"
+	CXXFLAGS+=" -DANDROID"
+}

x11-packages/bochs/iodev-network-slirp-misc.cc.patch

@@ -1,12 +0,0 @@
-diff -uNr bochs-2.6.9/iodev/network/slirp/misc.cc bochs-2.6.9.mod/iodev/network/slirp/misc.cc
---- bochs-2.6.9/iodev/network/slirp/misc.cc     2016-12-14 04:22:28.000000000 +0800
-+++ bochs-2.6.9.mod/iodev/network/slirp/misc.cc 2019-08-26 20:05:37.060533000 +0800
-@@ -16,7 +16,7 @@
- #include "libslirp.h"
-
- #if BX_NETWORKING && BX_NETMOD_SLIRP
--
-+#define ANDROID
- #ifdef DEBUG
- int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
- #endif