[PR PATCH] x11vnc: fix build w/ musl-1.2.1 (time64)

[PR PATCH] x11vnc: fix build w/ musl-1.2.1 (time64)

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

There is a new pull request by pullmoll against master on the void-packages repository

https://github.com/pullmoll/void-packages x11vnc
https://github.com/void-linux/void-packages/pull/26991

x11vnc: fix build w/ musl-1.2.1 (time64)


A patch file from https://github.com/void-linux/void-packages/pull/26991.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x11vnc-26991.patch --]
[-- Type: text/x-diff, Size: 2976 bytes --]

From 0f72a6e48b83ab43aacaf79be2d7501cae3a4881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 6 Dec 2020 17:36:46 +0100
Subject: [PATCH] x11vnc: fix build w/ musl-1.2.1 (time64)

---
 srcpkgs/x11vnc/patches/time64.patch | 79 +++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 srcpkgs/x11vnc/patches/time64.patch

diff --git a/srcpkgs/x11vnc/patches/time64.patch b/srcpkgs/x11vnc/patches/time64.patch
new file mode 100644
index 00000000000..4b5b5dd4a68
--- /dev/null
+++ b/srcpkgs/x11vnc/patches/time64.patch
@@ -0,0 +1,79 @@
+--- src/uinput.c.old	2019-01-05 13:22:11.000000000 +0000
++++ src/uinput.c	2020-01-24 04:49:39.479206612 +0000
+@@ -710,6 +710,7 @@
+ static void ptr_move(int dx, int dy) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tv;
+ 	int d = direct_rel_fd < 0 ? fd : direct_rel_fd;
+ 
+ 	if (injectable && strchr(injectable, 'M') == NULL) {
+@@ -720,7 +721,9 @@
+ 
+ 	if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d);
+ 
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tv, NULL);
++	ev.input_event_sec = tv.tv_sec;
++	ev.input_event_usec = tv.tv_usec;
+ 	ev.type = EV_REL;
+ 	ev.code = REL_Y;
+ 	ev.value = dy;
+@@ -755,6 +758,7 @@
+ static void ptr_abs(int x, int y, int p) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tv;
+ 	int x0, y0;
+ 	int d = direct_abs_fd < 0 ? fd : direct_abs_fd;
+ 
+@@ -773,7 +777,9 @@
+ 
+ 	if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d);
+ 
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tv, NULL);
++	ev.input_event_sec = tv.tv_sec;
++	ev.input_event_usec = tv.tv_usec;
+ 	ev.type = EV_ABS;
+ 	ev.code = ABS_Y;
+ 	ev.value = y;
+@@ -950,6 +956,7 @@
+ static void button_click(int down, int btn) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tv;
+ 	int d = direct_btn_fd < 0 ? fd : direct_btn_fd;
+ 
+ 	if (injectable && strchr(injectable, 'B') == NULL) {
+@@ -959,7 +966,9 @@
+ 	if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d);
+ 
+ 	memset(&ev, 0, sizeof(ev));
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tv, NULL);
++	ev.input_event_sec = tv.tv_sec;
++	ev.input_event_usec = tv.tv_usec;
+ 	ev.type = EV_KEY;
+ 	ev.value = down;
+ 
+@@ -1230,6 +1239,7 @@
+ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ #ifdef UINPUT_OK
+ 	struct input_event ev;
++	struct timeval tv;
+ 	int scancode;
+ 	allowed_input_t input;
+ 	int d = direct_key_fd < 0 ? fd : direct_key_fd;
+@@ -1253,7 +1263,9 @@
+ 	if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d);
+ 
+ 	memset(&ev, 0, sizeof(ev));
+-	gettimeofday(&ev.time, NULL);
++	gettimeofday(&tv, NULL);
++	ev.input_event_sec = tv.tv_sec;
++	ev.input_event_usec = tv.tv_usec;
+ 	ev.type = EV_KEY;
+ 	ev.code = (unsigned char) scancode;
+ 	ev.value = down;
+

Re: [PR PATCH] [Merged]: x11vnc: fix build w/ musl-1.2.1 (time64)

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

There's a merged pull request on the void-packages repository

x11vnc: fix build w/ musl-1.2.1 (time64)
https://github.com/void-linux/void-packages/pull/26991

Description: