git: a613e66a54d5 - main - emulators/bochs: Fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Feb 2025 01:37:26 UTC
The branch main has been updated by nc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a613e66a54d54251878412b74c1e99defdac4192
commit a613e66a54d54251878412b74c1e99defdac4192
Author: Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2025-02-25 01:36:44 +0000
Commit: Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2025-02-25 01:36:44 +0000
emulators/bochs: Fix build
---
emulators/bochs/files/patch-gui_keymap.cc | 11 +++++++++++
emulators/bochs/files/patch-iodev_network_eth__slirp.cc | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/emulators/bochs/files/patch-gui_keymap.cc b/emulators/bochs/files/patch-gui_keymap.cc
new file mode 100644
index 000000000000..be0481dec95a
--- /dev/null
+++ b/emulators/bochs/files/patch-gui_keymap.cc
@@ -0,0 +1,11 @@
+--- gui/keymap.cc.orig 2025-02-25 01:36:13 UTC
++++ gui/keymap.cc
+@@ -96,7 +96,7 @@ bx_keymap_c::~bx_keymap_c(void)
+ keymapCount = 0;
+ }
+
+-#if defined(WIN32) || defined(__ANDROID__)
++#if defined(WIN32) || defined(__ANDROID__) || defined(__FreeBSD__)
+ char* basename(char *path)
+ {
+ char *ptr;
diff --git a/emulators/bochs/files/patch-iodev_network_eth__slirp.cc b/emulators/bochs/files/patch-iodev_network_eth__slirp.cc
index 523d83921719..cbeac4b8556a 100644
--- a/emulators/bochs/files/patch-iodev_network_eth__slirp.cc
+++ b/emulators/bochs/files/patch-iodev_network_eth__slirp.cc
@@ -1,5 +1,5 @@
---- ./iodev/network/eth_slirp.cc.orig 2025-02-16 04:15:29.000000000 -0500
-+++ ./iodev/network/eth_slirp.cc 2025-02-18 21:26:22.200515000 -0500
+--- iodev/network/eth_slirp.cc.orig 2025-02-16 09:15:29 UTC
++++ iodev/network/eth_slirp.cc
@@ -20,6 +20,11 @@
// eth_slirp.cc - Bochs port of Qemu's slirp implementation (updated from libslirp 4.8.0)
// Portion of this software comes with the following license: BSD-3-Clause