[PR PATCH] xf86-input-mtrack: fix build w/ musl-1.2.1 (time64)

[PR PATCH] xf86-input-mtrack: fix build w/ musl-1.2.1 (time64)

[pullmoll]

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

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

https://github.com/pullmoll/void-packages xf86-input-mtrack
https://github.com/void-linux/void-packages/pull/26889

xf86-input-mtrack: fix build w/ musl-1.2.1 (time64)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xf86-input-mtrack-26889.patch --]
[-- Type: text/x-diff, Size: 2094 bytes --]

From 15bc6b66c354bd7d57bf15ebaf035e511bf93358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 2 Dec 2020 23:05:25 +0100
Subject: [PATCH] xf86-input-mtrack: fix build w/ musl-1.2.1 (time64)

---
 srcpkgs/xf86-input-mtrack/patches/fix-time64.patch | 12 ++++++++++++
 srcpkgs/xf86-input-mtrack/template                 |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/xf86-input-mtrack/patches/fix-time64.patch

diff --git a/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch b/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch
new file mode 100644
index 00000000000..9f14c89d469
--- /dev/null
+++ b/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch
@@ -0,0 +1,12 @@
+--- src/hwstate.c	2018-01-28 20:46:17.000000000 +0100
++++ src/hwstate.c	2020-12-02 22:58:45.149335108 +0100
+@@ -41,7 +41,8 @@
+ 		if (!caps->has_abs[MTDEV_WIDTH_MINOR])
+ 			s->data[i].width_minor = s->data[i].width_major;
+ 	}
+-	timercp(&s->evtime, &syn->time);
++	s->evtime.tv_sec = syn->input_event_sec;
++	s->evtime.tv_usec = syn->input_event_usec;
+ }
+ 
+ /*
diff --git a/srcpkgs/xf86-input-mtrack/template b/srcpkgs/xf86-input-mtrack/template
index 001e5704088..e04040307f4 100644
--- a/srcpkgs/xf86-input-mtrack/template
+++ b/srcpkgs/xf86-input-mtrack/template
@@ -1,18 +1,18 @@
-# Template build file for 'xf86-input-mtrack'.
+# Template file for 'xf86-input-mtrack'
 pkgname=xf86-input-mtrack
 version=0.5.0
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
 makedepends="xorg-server-devel mtdev-devel"
 depends="virtual?xserver-abi-input-24_1"
 short_desc="Xorg Multitouch Trackpad Driver"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://xorg.freedesktop.org/"
 license="MIT"
+homepage="http://xorg.freedesktop.org/"
 distfiles="https://github.com/p2rkw/${pkgname}/archive/v${version}.tar.gz"
 checksum=a976723720028832afd45bfcaab479f60833ff6f1c780be727d1791675dc14c4
+lib32disabled=yes
 
 post_install() {
 	vlicense COPYING

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

[pullmoll]

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

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

https://github.com/pullmoll/void-packages xf86-input-mtrack
https://github.com/void-linux/void-packages/pull/26889

xf86-input-mtrack: fix build w/ musl-1.2.1 (time64)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xf86-input-mtrack-26889.patch --]
[-- Type: text/x-diff, Size: 2080 bytes --]

From 22e0511607a181d05f2800f27ef6e09d7c39307c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 2 Dec 2020 23:05:25 +0100
Subject: [PATCH] xf86-input-mtrack: fix build w/ musl-1.2.1 (time64)

---
 srcpkgs/xf86-input-mtrack/patches/fix-time64.patch | 12 ++++++++++++
 srcpkgs/xf86-input-mtrack/template                 |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/xf86-input-mtrack/patches/fix-time64.patch

diff --git a/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch b/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch
new file mode 100644
index 00000000000..9f14c89d469
--- /dev/null
+++ b/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch
@@ -0,0 +1,12 @@
+--- src/hwstate.c	2018-01-28 20:46:17.000000000 +0100
++++ src/hwstate.c	2020-12-02 22:58:45.149335108 +0100
+@@ -41,7 +41,8 @@
+ 		if (!caps->has_abs[MTDEV_WIDTH_MINOR])
+ 			s->data[i].width_minor = s->data[i].width_major;
+ 	}
+-	timercp(&s->evtime, &syn->time);
++	s->evtime.tv_sec = syn->input_event_sec;
++	s->evtime.tv_usec = syn->input_event_usec;
+ }
+ 
+ /*
diff --git a/srcpkgs/xf86-input-mtrack/template b/srcpkgs/xf86-input-mtrack/template
index 001e5704088..0f78142030d 100644
--- a/srcpkgs/xf86-input-mtrack/template
+++ b/srcpkgs/xf86-input-mtrack/template
@@ -1,18 +1,18 @@
-# Template build file for 'xf86-input-mtrack'.
+# Template file for 'xf86-input-mtrack'
 pkgname=xf86-input-mtrack
 version=0.5.0
 revision=1
-lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
 makedepends="xorg-server-devel mtdev-devel"
 depends="virtual?xserver-abi-input-24_1"
 short_desc="Xorg Multitouch Trackpad Driver"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://xorg.freedesktop.org/"
 license="MIT"
+homepage="http://xorg.freedesktop.org/"
 distfiles="https://github.com/p2rkw/${pkgname}/archive/v${version}.tar.gz"
 checksum=a976723720028832afd45bfcaab479f60833ff6f1c780be727d1791675dc14c4
+lib32disabled=yes
 
 post_install() {
 	vlicense COPYING

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

[pullmoll]

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

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

xf86-input-mtrack: fix build w/ musl-1.2.1 (time64)
https://github.com/void-linux/void-packages/pull/26889

Description: