From c283c8463a15b6d7ecd25c1332775ebc944461f2 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 20 Nov 2024 10:32:02 +0000
Subject: [PATCH] open-vm-tools: update to 12.5.2

release notes:
- https://github.com/vmware/open-vm-tools/releases/tag/12.5.2

patches:
- open-vm-tools: gcc-15 upstream fix
  - included in open-vm-tools-13.0
  - https://github.com/vmware/open-vm-tools/commit/19fec7a1301abf9c2275c8ef8a06252e7dc346ef
  - https://github.com/vmware/open-vm-tools/commit/2bff25dd35d8b3cb90809d2798468188e0b3df5d
---
 packages/sysutils/open-vm-tools/package.mk    | 10 +++-----
 ...n-vm-tools-751-fix-build-with-gcc-15.patch | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 packages/sysutils/open-vm-tools/patches/open-vm-tools-751-fix-build-with-gcc-15.patch

diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk
index 1880a84e0e..1d0e61adee 100644
--- a/packages/sysutils/open-vm-tools/package.mk
+++ b/packages/sysutils/open-vm-tools/package.mk
@@ -4,12 +4,12 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="open-vm-tools"
-PKG_VERSION="12.5.0"
-PKG_SHA256="a52182c7e6b5df41bb317625e9d8592ecdb9db814d1c2c9b7cdb91a77f8c0640"
+PKG_VERSION="12.5.2"
+PKG_SHA256="45fe43982e618f52a6b12c7578d9c6b63e36de62d23034a3852267b1aa5bb9ab"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/vmware/open-vm-tools"
-PKG_URL="https://github.com/vmware/open-vm-tools/archive/stable-${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/vmware/open-vm-tools/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-24697584.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse3 glib libdnet libtirpc"
 PKG_LONGDESC="open-vm-tools: open source implementation of VMware Tools"
 PKG_TOOLCHAIN="autotools"
@@ -29,10 +29,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \
                            --with-udev-rules-dir=/usr/lib/udev/rules.d/ \
                            --with-sysroot=${SYSROOT_PREFIX}"
 
-configure_package() {
-  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/open-vm-tools/configure"
-}
-
 post_unpack() {
   # Hack to allow package to be bumped without linking against old libraries
   rm -f ${SYSROOT_PREFIX}/usr/lib/libvmtools*
diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-751-fix-build-with-gcc-15.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-751-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..e72dd16504
--- /dev/null
+++ b/packages/sysutils/open-vm-tools/patches/open-vm-tools-751-fix-build-with-gcc-15.patch
@@ -0,0 +1,23 @@
+From 129d87bd5fd5f2436a467d4b7d43e0d102a867da Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Wed, 20 Nov 2024 10:40:03 +1100
+Subject: [PATCH] Fix build when compiling with -std=c23
+
+Fixes the build when using gcc 15
+---
+ lib/lock/ul.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/lock/ul.c b/lib/lock/ul.c
+index d376a98af..fc9fdb714 100644
+--- a/lib/lock/ul.c
++++ b/lib/lock/ul.c
+@@ -29,7 +29,7 @@
+ static Bool mxInPanic = FALSE;  // track when involved in a panic
+ static Bool mxUserCollectLockingTree = FALSE;
+ 
+-Bool (*MXUserTryAcquireForceFail)() = NULL;
++Bool (*MXUserTryAcquireForceFail)(const char *) = NULL;
+ 
+ static MX_Rank (*MXUserMxCheckRank)(void) = NULL;
+ static void (*MXUserMxLockLister)(void) = NULL;