git: e291bf88f706 - main - emulators/open-vm-tools: Update to 12.5.0

The branch main has been updated by garga:

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

commit e291bf88f70671902bc5d79ac89f74bba0222069
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2024-11-05 17:58:08 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2024-11-05 18:00:49 +0000

    emulators/open-vm-tools: Update to 12.5.0
    
    While here, fix build with llvm 19 [1]
    
    PR:             282277, 282476 [1]
    Submitted by:   dim [1]
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 emulators/open-vm-tools/Makefile                              |  2 +-
 emulators/open-vm-tools/distinfo                              |  6 +++---
 emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c   |  4 ++--
 .../open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c      |  4 ++--
 .../files/patch-services_plugins_dndcp_stringxx_string.hh     | 11 +++++++++++
 .../open-vm-tools/files/patch-services_vmtoolsd_Makefile.am   |  4 ++--
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 5e36bfa86c0a..202faed130a9 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	open-vm-tools
-PORTVERSION=	12.4.5
+PORTVERSION=	12.5.0
 DISTVERSIONPREFIX=	stable-
 PORTEPOCH=	2
 CATEGORIES=	emulators
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index ec6737991729..6c88a1a8f846 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1728389715
-SHA256 (vmware-open-vm-tools-stable-12.4.5_GH0.tar.gz) = 1e36b41ddb7a2672158842297a08115ff8369bb8f6b80c9df144a22cb5f28550
-SIZE (vmware-open-vm-tools-stable-12.4.5_GH0.tar.gz) = 2992872
+TIMESTAMP = 1730460386
+SHA256 (vmware-open-vm-tools-stable-12.5.0_GH0.tar.gz) = a52182c7e6b5df41bb317625e9d8592ecdb9db814d1c2c9b7cdb91a77f8c0640
+SIZE (vmware-open-vm-tools-stable-12.5.0_GH0.tar.gz) = 3001944
diff --git a/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c b/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c
index 99e8c5c09ba3..8dded6d07581 100644
--- a/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c
+++ b/emulators/open-vm-tools/files/patch-lib_guestApp_guestApp.c
@@ -1,6 +1,6 @@
---- lib/guestApp/guestApp.c.orig	2018-07-13 18:54:23 UTC
+--- lib/guestApp/guestApp.c.orig	2024-10-10 15:05:07 UTC
 +++ lib/guestApp/guestApp.c
-@@ -63,7 +63,7 @@
+@@ -65,7 +65,7 @@
  #elif defined __APPLE__
  #   define GUESTAPP_TOOLS_INSTALL_PATH "/Library/Application Support/VMware Tools"
  #else
diff --git a/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c b/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c
index a4088489e16a..01ebbce2842a 100644
--- a/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c
+++ b/emulators/open-vm-tools/files/patch-lib_procMgr_procMgrPosix.c
@@ -1,6 +1,6 @@
---- lib/procMgr/procMgrPosix.c.orig	2023-07-18 17:10:48 UTC
+--- lib/procMgr/procMgrPosix.c.orig	2024-10-10 15:05:07 UTC
 +++ lib/procMgr/procMgrPosix.c
-@@ -58,6 +58,8 @@
+@@ -59,6 +59,8 @@
  #include <limits.h>
  #include <paths.h>
  #include <sys/sysctl.h>
diff --git a/emulators/open-vm-tools/files/patch-services_plugins_dndcp_stringxx_string.hh b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_stringxx_string.hh
new file mode 100644
index 000000000000..093f63ca86be
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_stringxx_string.hh
@@ -0,0 +1,11 @@
+--- services/plugins/dndcp/stringxx/string.hh.orig	2024-11-05 17:51:28 UTC
++++ services/plugins/dndcp/stringxx/string.hh
+@@ -87,7 +87,7 @@ typedef std::string utf8string;
+  * to replace the std::string in our codebase.
+  */
+ typedef std::string utf8string;
+-typedef std::basic_string<utf16_t> utf16string;
++typedef std::u16string utf16string;
+ 
+ class VMSTRING_EXPORT string
+ {
diff --git a/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am b/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am
index 7ea9613f8517..3678de640c63 100644
--- a/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am
+++ b/emulators/open-vm-tools/files/patch-services_vmtoolsd_Makefile.am
@@ -1,6 +1,6 @@
---- services/vmtoolsd/Makefile.am.orig	2023-03-07 22:57:07 UTC
+--- services/vmtoolsd/Makefile.am.orig	2024-10-10 15:05:07 UTC
 +++ services/vmtoolsd/Makefile.am
-@@ -79,7 +79,7 @@ install-exec-hook:
+@@ -81,7 +81,7 @@ install-exec-hook:
  	@INSTVMSG@ vmtoolsd $(srcdir)/l10n $(DESTDIR)$(datadir)
  
  install-exec-hook: