user/open-vm-tools: add time64 patch. fixes #1210.

2 files changed, 61 insertions, 1 deletions

diff --git a/user/open-vm-tools/APKBUILD b/user/open-vm-tools/APKBUILD
index 883b7d306..ea9af14c4 100644
--- a/user/open-vm-tools/APKBUILD
+++ b/user/open-vm-tools/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=open-vm-tools
 pkgver=12.4.0
 _buildver=23259341
-pkgrel=0
+pkgrel=1
 pkgdesc="Guest additions for VMware hypervisors"
 url=" "
 arch="x86 pmmx i528 x86_64 aarch64"
@@ -19,6 +19,7 @@ subpackages="$pkgname-dev $pkgname-desktop $pkgname-openrc"
 source="https://github.com/vmware/open-vm-tools/releases/download/stable-$pkgver/open-vm-tools-$pkgver-$_buildver.tar.gz
 	disable-werror.patch
 	dndcp-portability.patch
+	time64.patch
 	hgfs-portability.patch
 	loff_t.patch
 	poll-header.patch
@@ -95,6 +96,7 @@ desktop() {
 sha512sums="11ea43c64ec534922145f83e2b7ef9254437f80656ad03b596340a78c3698adcc7d84adade9c5d8e1c83b5ebc3bd086601b1d104e0f070274dc2b6bc1f64fb17  open-vm-tools-12.4.0-23259341.tar.gz
 1966f6f31ed531829a40cd3e5c8352ea25cac0535a24f62aecf37e2018adbeb33cd214a43d4acc57766c8795d1849e1241c8777bbf96ad447f0c7baa41a555ed  disable-werror.patch
 987a65c77a462520430d157212fbd23381af301a0e5b02410750f4ac844bad903a92c62f743ea2880b9bca939696edd6c8f92b3f4fc01daafd46b5455f7b9666  dndcp-portability.patch
+6167f412598bd70c7a66831a3fb870514da17461494210c2466af35748e3452702573203ca503906f30864a51436a3e296ee5fc25a7283f51ba06a542ed7f177  time64.patch
 656585c7b087dd1b7539bcd362bb80faa48b7354819636061c2c92569bcd537804daf15b76f6bad0b7229af9d24462de4e630256ac7059941bf8cd115ae9a39c  hgfs-portability.patch
 6edb41bb9658271c6a214230c88526c4fccc4c6b3299bb67691f6f917e1e695a20dd09692c9a64d36d46a35cbecb975dcaf7062c0d7fccd2d9011cc17130072d  loff_t.patch
 2b623a9901851ba9b1652c117ee2a2ebb8e4cea7a01e2ffe6553cf6d929a86921f4e206278fd19fbab4effc0cc9051848e5254ca35ecfb3a006783e915cd5c5e  poll-header.patch
diff --git a/user/open-vm-tools/time64.patch b/user/open-vm-tools/time64.patch
new file mode 100644
index 000000000..bc6bbb091
--- /dev/null
+++ b/user/open-vm-tools/time64.patch
@@ -0,0 +1,58 @@
+diff --git a/open-vm-tools/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp b/open-vm-tools/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp
+index 0311a4e7..4a231a4d 100644
+--- a/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp
++++ b/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp
+@@ -249,11 +249,14 @@ FakeMouse_Move(int x,    // IN
+ 
+    bool retValue = true;
+    struct input_event event;
++   struct timeval tv;
+ 
+    event.type = EV_ABS;
+    event.code = ABS_X;
+    event.value = x;
+-   gettimeofday(&event.time, NULL);
++   gettimeofday(&tv, NULL);
++   event.input_event_sec = tv.tv_sec;
++   event.input_event_usec = tv.tv_usec;
+    if (write(uinput_fd, &event, sizeof(event)) < 0) {
+       g_debug("Line:%d. Function:%s. Failed to write\n", __LINE__, __FUNCTION__);
+       retValue = false;
+@@ -262,7 +265,9 @@ FakeMouse_Move(int x,    // IN
+    event.type = EV_ABS;
+    event.code = ABS_Y;
+    event.value = y;
+-   gettimeofday(&event.time, NULL);
++   gettimeofday(&tv, NULL);
++   event.input_event_sec = tv.tv_sec;
++   event.input_event_usec = tv.tv_usec;
+    if (write(uinput_fd, &event, sizeof(event)) < 0) {
+       g_debug("Line:%d. Function:%s. Failed to write\n", __LINE__, __FUNCTION__);
+       retValue = false;
+@@ -271,7 +276,9 @@ FakeMouse_Move(int x,    // IN
+    event.type = EV_SYN;
+    event.code = SYN_REPORT;
+    event.value = 0;
+-   gettimeofday(&event.time, NULL);
++   gettimeofday(&tv, NULL);
++   event.input_event_sec = tv.tv_sec;
++   event.input_event_usec = tv.tv_usec;
+    if (write(uinput_fd, &event, sizeof(event)) < 0) {
+       g_debug("Line:%d. Function:%s. Failed to write\n", __LINE__, __FUNCTION__);
+       retValue = false;
+@@ -306,11 +313,14 @@ FakeMouse_Click(bool down)  // IN
+ 
+    bool retValue = true;
+    struct input_event event;
++   struct timeval tv;
+ 
+    event.type = EV_KEY;
+    event.code = BTN_LEFT;
+    event.value = down;
+-   gettimeofday(&event.time, NULL);
++   gettimeofday(&tv, NULL);
++   event.input_event_sec = tv.tv_sec;
++   event.input_event_usec = tv.tv_usec;
+    if (write(uinput_fd, &event, sizeof(event)) < 0) {
+       g_debug("Line:%d. Function:%s. Failed to write\n", __LINE__, __FUNCTION__);
+       retValue = false;