From nobody Tue Feb 25 01:37:26 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z20bB6tMtz5p6yd; Tue, 25 Feb 2025 01:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z20bB603cz4LW4; Tue, 25 Feb 2025 01:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740447446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qqG45lNTLt3LBA06xQUEAadSlkTgDufUx1/Nh61NWM=; b=Co4xl6j5CkDIzVMlU391aMS1Q2o+JJS0oaX8RqXl4UDMO6uYC+b/z4uiTjV2i1Z22sTWXS Puw4ZXSxjbVogCDLc5dElszcLArRrjbunY8scLu2BYvPVqVEKZQgFaqbCaXXAf5kpBv84s Q7OLuTQhutzPehOa2r1s49DlMTa0ivQYbNxBSLPZHBv0aESiS0BpQIYXpo3yxSyVTCXqWw YUeQpbhaqvrc/b4oTcZyrG18QEeIoZ8/iceXxv5ybmEsX/1cuRixHyXAw3mv7ld/I6qVo4 C+2qbxVEDkBcvtatEwuidtIae5adbjDUwYbyZSA+woqSZHqE6uyUNILgdcI0jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740447446; a=rsa-sha256; cv=none; b=t+GyTBetnGpQ7zaKLcUcRQncModIoZSqywIozZIaKUW24Pm19ELqsd+SeMXNE7O+f3XAdO Q49XSNtuQ0Rf0soCoBf2e2zly+Bxge7rYoDI1UXQNXJboaLaVJxwe6hVGy2+8tUFNmuXsl J9B9FSZu2ubmeM6PQvnSmUu7zcE0ttgytK0GGhwfP5RcBns+0cMhsdSVL2R36ZZ1Hkyzfz Wpi+Z/X4uBBB2f5ENAxC6KpDOnLHMKT39SHgi6dZ+DIytpryR6OOyXihTm4C2WUOL7Wyhm BiTGpo8x9BFu3XAmp+vn8BnZ5NDgTsMIG+EQjRtQWpVGQkSYxPxLtS/m1XvoEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740447446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qqG45lNTLt3LBA06xQUEAadSlkTgDufUx1/Nh61NWM=; b=URFFhYSTCcJ0PlQjPu4cOzdCXsRBNBZnzkSh2f8hy0KOhla4NL23Pf/r/Hjq/Ghm/tthMs ISbU494L7zzLgs6zWp6SwpJYvbuNhGmgv7GtGKJRuKqih0eTrNwsCX5cHND0Gd4r/NXj3a Pd0Jro53pjJYAFugj1tL6wYWlNpljIIVqJqvQYQXaYYro+8jy4pC8GdIn2jh3qfzhkSkG5 Bfz4//CMTQbx9cTTLDZTeF5l2QmGw6v6zTHPrSQqkAO1lykyuu1BjkBTG7ScUfW4PxLu2z ATm/y+gED8zfDkkWMfS3MR68oZV0SVDrEv5OES97H+ZvpJP6i2G5/nt4TSxPcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z20bB5ZJMz14cT; Tue, 25 Feb 2025 01:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51P1bQoM008536; Tue, 25 Feb 2025 01:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51P1bQiP008533; Tue, 25 Feb 2025 01:37:26 GMT (envelope-from git) Date: Tue, 25 Feb 2025 01:37:26 GMT Message-Id: <202502250137.51P1bQiP008533@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: a613e66a54d5 - main - emulators/bochs: Fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a613e66a54d54251878412b74c1e99defdac4192 Auto-Submitted: auto-generated The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=a613e66a54d54251878412b74c1e99defdac4192 commit a613e66a54d54251878412b74c1e99defdac4192 Author: Neel Chauhan AuthorDate: 2025-02-25 01:36:44 +0000 Commit: Neel Chauhan 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