git: 3d58b32aa5c8 - main - emulators/dosbox-x: Update to 2024.12.04

The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3d58b32aa5c8f09eefac0e3b97b53ef686e8fbdb

commit 3d58b32aa5c8f09eefac0e3b97b53ef686e8fbdb
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-12-05 20:25:18 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-12-06 08:25:19 +0000

    emulators/dosbox-x: Update to 2024.12.04
    
    ChangeLog:
    https://github.com/joncampbell123/dosbox-x/releases/tag/dosbox-x-v2024.12.04
---
 emulators/dosbox-x/Makefile                        |  2 +-
 emulators/dosbox-x/distinfo                        |  6 ++--
 .../dosbox-x/files/patch-src_dos_dos__programs.cpp | 24 ---------------
 .../dosbox-x/files/patch-src_dos_drive__iso.cpp    | 34 ----------------------
 4 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile
index 0a184128401b..d8e682dd472f 100644
--- a/emulators/dosbox-x/Makefile
+++ b/emulators/dosbox-x/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dosbox-x
 DISTVERSIONPREFIX=	${PORTNAME}-v
-DISTVERSION=	2024.10.01
+DISTVERSION=	2024.12.04
 CATEGORIES=	emulators
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo
index 31ced073fe30..7ac2289f2033 100644
--- a/emulators/dosbox-x/distinfo
+++ b/emulators/dosbox-x/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727854016
-SHA256 (joncampbell123-dosbox-x-dosbox-x-v2024.10.01_GH0.tar.gz) = 9940662759b9910e3c4549216be8db0278ceaaa80ace5b19f87b04d0b6ff8a3a
-SIZE (joncampbell123-dosbox-x-dosbox-x-v2024.10.01_GH0.tar.gz) = 121316697
+TIMESTAMP = 1733389595
+SHA256 (joncampbell123-dosbox-x-dosbox-x-v2024.12.04_GH0.tar.gz) = f2bca4c2c8da69085c0eabfb60886b67e3ad55b21974d4e1c3c79a2d3756add3
+SIZE (joncampbell123-dosbox-x-dosbox-x-v2024.12.04_GH0.tar.gz) = 121318659
diff --git a/emulators/dosbox-x/files/patch-src_dos_dos__programs.cpp b/emulators/dosbox-x/files/patch-src_dos_dos__programs.cpp
deleted file mode 100644
index 07b492f03787..000000000000
--- a/emulators/dosbox-x/files/patch-src_dos_dos__programs.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix build with clang 19
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282386
-
---- src/dos/dos_programs.cpp.orig	2024-10-02 06:16:36 UTC
-+++ src/dos/dos_programs.cpp
-@@ -81,7 +81,7 @@ host_cnv_char_t *CodePageGuestToHost(const char *s);
- #endif
- #ifdef C_ICONV
- #include "iconvpp.hpp"
--typedef uint16_t test_char_t;
-+typedef char16_t test_char_t;
- typedef std::basic_string<test_char_t> test_string;
- typedef std::basic_string<char> test_char;
- #endif
-@@ -102,6 +102,9 @@ bool CodePageHostToGuestUTF8(char *d/*CROSS_LEN*/,cons
- bool qmount = false;
- bool nowarn = false;
- bool CodePageHostToGuestUTF8(char *d/*CROSS_LEN*/,const char *s/*CROSS_LEN*/), CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const uint16_t *s/*CROSS_LEN*/);
-+inline bool CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const char16_t *s/*CROSS_LEN*/) {
-+    return CodePageHostToGuestUTF16(d, reinterpret_cast<const uint16_t *>(s));
-+}
- extern bool systemmessagebox(char const * aTitle, char const * aMessage, char const * aDialogType, char const * aIconType, int aDefaultButton);
- extern bool addovl, addipx, addne2k, prepared, inshell, usecon, uao, loadlang, morelen, mountfro[26], mountiro[26], resetcolor, staycolors, printfont, notrycp, internal_program;
- extern bool clear_screen(), OpenGL_using(void), DOS_SetAnsiAttr(uint8_t attr), isDBCSCP();
diff --git a/emulators/dosbox-x/files/patch-src_dos_drive__iso.cpp b/emulators/dosbox-x/files/patch-src_dos_drive__iso.cpp
deleted file mode 100644
index 80cb9fb5a9f3..000000000000
--- a/emulators/dosbox-x/files/patch-src_dos_drive__iso.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix build with clang 19
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282386
-
---- src/dos/drive_iso.cpp.orig	2024-10-02 06:16:36 UTC
-+++ src/dos/drive_iso.cpp
-@@ -40,6 +40,10 @@ extern bool CodePageHostToGuestUTF16(char *d/*CROSS_LE
- extern bool gbk, isDBCSCP(), isKanji1_gbk(uint8_t chr), shiftjis_lead_byte(int c);
- extern bool filename_not_8x3(const char *n), filename_not_strict_8x3(const char *n);
- extern bool CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const uint16_t *s/*CROSS_LEN*/);
-+inline bool CodePageHostToGuestUTF16(uint8_t *d/*CROSS_LEN*/,const uint8_t *s/*CROSS_LEN*/) {
-+    std::u16string u16s(reinterpret_cast<const char16_t *>(s));
-+    return CodePageHostToGuestUTF16(reinterpret_cast<char *>(d), reinterpret_cast<const uint16_t *>(u16s.c_str()));
-+}
- 
- using namespace std;
- 
-@@ -1762,7 +1766,7 @@ int isoDrive::readDirEntry(isoDirEntry* de, const uint
- 				// The string is big Endian UCS-16, convert to host Endian UCS-16
- 				for (size_t i=0;((const uint16_t*)de->ident)[i] != 0;i++) ((uint16_t*)de->ident)[i] = be16toh(((uint16_t*)de->ident)[i]);
- 				// finally, convert from UCS-16 to local code page, using C++ string construction to make a copy first
--				CodePageHostToGuestUTF16((char*)de->ident,std::basic_string<uint16_t>((const uint16_t*)de->ident).c_str());
-+				CodePageHostToGuestUTF16(de->ident, de->ident);
- 			}
- 		}
- 	} else {
-@@ -1784,7 +1788,7 @@ int isoDrive::readDirEntry(isoDirEntry* de, const uint
- 			// The string is big Endian UCS-16, convert to host Endian UCS-16
- 			for (size_t i=0;((const uint16_t*)de->ident)[i] != 0;i++) ((uint16_t*)de->ident)[i] = be16toh(((uint16_t*)de->ident)[i]);
- 			// finally, convert from UCS-16 to local code page, using C++ string construction to make a copy first
--			CodePageHostToGuestUTF16((char*)de->ident,std::basic_string<uint16_t>((const uint16_t*)de->ident).c_str());
-+			CodePageHostToGuestUTF16(de->ident, de->ident);
- 		}
- 		else {
- 			// remove any file version identifiers as there are some cdroms that don't have them