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

[PR PATCH] brltty: 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 brltty
https://github.com/void-linux/void-packages/pull/26917

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


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

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

From 9aca4358ee4684ef55f0e8ad7319d74d90087e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 3 Dec 2020 14:15:24 +0100
Subject: [PATCH] brltty: fix build w/ musl-1.2.1 (time64)

---
 srcpkgs/brltty/patches/time64.patch | 16 ++++++++++++++++
 srcpkgs/brltty/template             |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/brltty/patches/time64.patch

diff --git a/srcpkgs/brltty/patches/time64.patch b/srcpkgs/brltty/patches/time64.patch
new file mode 100644
index 00000000000..7efc1c7e54a
--- /dev/null
+++ b/srcpkgs/brltty/patches/time64.patch
@@ -0,0 +1,16 @@
+--- Programs/system_linux.c	2020-04-05 12:35:34.000000000 +0200
++++ Programs/system_linux.c	2020-12-03 14:12:42.292642038 +0100
+@@ -957,9 +957,12 @@
+ writeInputEvent (UinputObject *uinput, uint16_t type, uint16_t code, int32_t value) {
+ #ifdef HAVE_LINUX_UINPUT_H
+   struct input_event event;
++  struct timeval tv;
+ 
+   memset(&event, 0, sizeof(event));
+-  gettimeofday(&event.time, NULL);
++  gettimeofday(&tv, NULL);
++  event.input_event_sec = tv.tv_sec;
++  event.input_event_usec = tv.tv_usec;
+   event.type = type;
+   event.code = code;
+   event.value = value;
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff0..76d56520dac 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"

Re: brltty: fix build w/ musl-1.2.1 (time64)

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26917#issuecomment-738301568

Comment:
Looks very similar to what upstream has: https://github.com/brltty/brltty/blob/0f312feaece1956faa3f2ddba4096bd2c47b6626/Programs/system_linux.c#L1190

We can remove the patch once it gets a new release :)

Re: brltty: fix build w/ musl-1.2.1 (time64)

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26917#issuecomment-738302056

Comment:
I'm rather unsure if this needs a revbump... The current behavior shouldn't change, right?

Re: brltty: fix build w/ musl-1.2.1 (time64)

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/26917#issuecomment-738304695

Comment:
@ericonr behaviour should not change. Would the PR have been built w/o the revbump? I can undo it anyway.

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

[pullmoll]

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

There is an updated pull request by pullmoll against master on the void-packages repository

https://github.com/pullmoll/void-packages brltty
https://github.com/void-linux/void-packages/pull/26917

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


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

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

From 750bba55dec525b8c21ade236292f94e90792810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 3 Dec 2020 14:15:24 +0100
Subject: [PATCH] brltty: fix build w/ musl-1.2.1 (time64)

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

diff --git a/srcpkgs/brltty/patches/time64.patch b/srcpkgs/brltty/patches/time64.patch
new file mode 100644
index 00000000000..7efc1c7e54a
--- /dev/null
+++ b/srcpkgs/brltty/patches/time64.patch
@@ -0,0 +1,16 @@
+--- Programs/system_linux.c	2020-04-05 12:35:34.000000000 +0200
++++ Programs/system_linux.c	2020-12-03 14:12:42.292642038 +0100
+@@ -957,9 +957,12 @@
+ writeInputEvent (UinputObject *uinput, uint16_t type, uint16_t code, int32_t value) {
+ #ifdef HAVE_LINUX_UINPUT_H
+   struct input_event event;
++  struct timeval tv;
+ 
+   memset(&event, 0, sizeof(event));
+-  gettimeofday(&event.time, NULL);
++  gettimeofday(&tv, NULL);
++  event.input_event_sec = tv.tv_sec;
++  event.input_event_usec = tv.tv_usec;
+   event.type = type;
+   event.code = code;
+   event.value = value;

Re: brltty: fix build w/ musl-1.2.1 (time64)

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26917#issuecomment-738334046

Comment:
> Would the PR have been built w/o the revbump?

It seems not, but it would have been nice if it did. Will try to fix this!

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

[ericonr]

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

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

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

Description: