control: reopen -1 control: notfixed -1 0.3.1-1.1 Control: tags 1066547 + patch Control: tags 1066547 + pending
Dear maintainer,
I've prepared an NMU for xf86-input-mtrack (versioned as 0.3.1-1.2) and
uploaded it.
diff -Nru xf86-input-mtrack-0.3.1/debian/changelog
xf86-input-mtrack-0.3.1/debian/changelog
--- xf86-input-mtrack-0.3.1/debian/changelog 2024-04-16 23:32:48.000000000
+0200
+++ xf86-input-mtrack-0.3.1/debian/changelog 2024-04-17 08:18:29.000000000
+0200
@@ -1,3 +1,12 @@
+xf86-input-mtrack (0.3.1-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Cherry-pick another patch from Benjamin Drung and
+ xf86-input-multitouch 1.0~rc3-2.1 to fix another FTBFS due to time64_t
+ (Closes: #1066547)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Wed, 17 Apr 2024
08:18:29 +0200
+
xf86-input-mtrack (0.3.1-1.1) unstable; urgency=medium
* Non-maintainer upload
diff -Nru
xf86-input-mtrack-0.3.1/debian/patches/missing-includes-implicit-function-declaration-fix.patch
xf86-input-mtrack-0.3.1/debian/patches/missing-includes-implicit-function-declaration-fix.patch
---
xf86-input-mtrack-0.3.1/debian/patches/missing-includes-implicit-function-declaration-fix.patch
2024-04-16 23:32:48.000000000 +0200
+++
xf86-input-mtrack-0.3.1/debian/patches/missing-includes-implicit-function-declaration-fix.patch
2024-04-17 08:18:29.000000000 +0200
@@ -1,17 +1,21 @@
Description: Add patch to fix missing includes
Author: Gianfranco Costamagna <locutusofb...@debian.org>
-Last-Update: 2024-04-16
+Last-Update: 2024-04-17
---- xf86-input-mtrack-0.3.1.orig/include/common.h
-+++ xf86-input-mtrack-0.3.1/include/common.h
-@@ -33,6 +33,7 @@
- #include <xf86Xinput.h>
- #include <errno.h>
- #include <mtdev-mapping.h>
+Index: xf86-input-mtrack-0.3.1/src/gestures.c
+===================================================================
+--- xf86-input-mtrack-0.3.1.orig/src/gestures.c
++++ xf86-input-mtrack-0.3.1/src/gestures.c
+@@ -28,6 +28,7 @@
+ #include "gestures.h"
+ #include "mtouch.h"
+ #include "trig.h"
+#include <mtdev-plumbing.h>
- #include <stdint.h>
- #include <sys/time.h>
-
+
+ #define IS_VALID_BUTTON(x) (x >= 0 && x <= 31)
+
+Index: xf86-input-mtrack-0.3.1/tools/mtrack-test.c
+===================================================================
--- xf86-input-mtrack-0.3.1.orig/tools/mtrack-test.c
+++ xf86-input-mtrack-0.3.1/tools/mtrack-test.c
@@ -23,6 +23,7 @@
@@ -19,6 +23,6 @@
#include <fcntl.h>
#include <stdarg.h>
+#include <unistd.h>
-
+
void xf86Msg(int type, const char *format, ...)
{
diff -Nru
xf86-input-mtrack-0.3.1/debian/patches/Port-usage-of-struct-input_event-to-input_event_.patch
xf86-input-mtrack-0.3.1/debian/patches/Port-usage-of-struct-input_event-to-input_event_.patch
---
xf86-input-mtrack-0.3.1/debian/patches/Port-usage-of-struct-input_event-to-input_event_.patch
1970-01-01 01:00:00.000000000 +0100
+++
xf86-input-mtrack-0.3.1/debian/patches/Port-usage-of-struct-input_event-to-input_event_.patch
2024-04-17 08:18:29.000000000 +0200
@@ -0,0 +1,41 @@
+From: Benjamin Drung <benjamin.dr...@canonical.com>
+Date: Mon, 15 Apr 2024 19:56:58 +0200
+Subject: Port usage of struct input_event to input_event_*
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+It fails to build on armhf:
+
+```
+src/hwstate.c: In function ‘finish_packet’:
+src/hwstate.c:43:24: error: ‘const struct input_event’ has no member named
+‘time’
+ 43 | s->evtime = syn->time.tv_usec / ms + syn->time.tv_sec * ms;
+ | ^~
+src/hwstate.c:43:49: error: ‘const struct input_event’ has no member named
+‘time’
+ 43 | s->evtime = syn->time.tv_usec / ms + syn->time.tv_sec * ms;
+ | ^~
+```
+
+Closes: #1067596
+LP: #2061591
+---
+ src/hwstate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xf86-input-mtrack-0.3.1/src/hwstate.c
+===================================================================
+--- xf86-input-mtrack-0.3.1.orig/src/hwstate.c
++++ xf86-input-mtrack-0.3.1/src/hwstate.c
+@@ -42,7 +42,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;
+ }
+
+ static int read_event(struct HWState *s, const struct Capabilities *caps,
diff -Nru xf86-input-mtrack-0.3.1/debian/patches/series
xf86-input-mtrack-0.3.1/debian/patches/series
--- xf86-input-mtrack-0.3.1/debian/patches/series 2024-04-16
23:32:48.000000000 +0200
+++ xf86-input-mtrack-0.3.1/debian/patches/series 2024-04-17
08:12:31.000000000 +0200
@@ -2,3 +2,4 @@
#aa
upsteam-commit
missing-includes-implicit-function-declaration-fix.patch
+Port-usage-of-struct-input_event-to-input_event_.patch
thanks
Gianfranco
On Tue, 16 Apr 2024 21:50:39 +0000 Debian FTP Masters
<ftpmas...@ftp-master.debian.org> wrote:
Source: xf86-input-mtrack
Source-Version: 0.3.1-1.1
Done: Gianfranco Costamagna <locutusofb...@debian.org>
We believe that the bug you reported is fixed in the latest version of
xf86-input-mtrack, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1066...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Gianfranco Costamagna <locutusofb...@debian.org> (supplier of updated
xf86-input-mtrack package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 16 Apr 2024 23:32:48 +0200
Source: xf86-input-mtrack
Built-For-Profiles: noudeb
Architecture: source
Version: 0.3.1-1.1
Distribution: unstable
Urgency: medium
Maintainer: Nobuhiro Iwamatsu <iwama...@debian.org>
Changed-By: Gianfranco Costamagna <locutusofb...@debian.org>
Closes: 1066547
Changes:
xf86-input-mtrack (0.3.1-1.1) unstable; urgency=medium
.
* Non-maintainer upload
* Add patch to fix implicit-function-declaration build failures
(Closes: #1066547)
Checksums-Sha1:
b373b79bfe038da6044f369a96edc8917ed039b7 1941 xf86-input-mtrack_0.3.1-1.1.dsc
379f735c5c00e426a053a84a01bffa3156a85c50 12868
xf86-input-mtrack_0.3.1-1.1.debian.tar.xz
f4894e6e383b00e914f7265427ff66d7ee1495c8 10369
xf86-input-mtrack_0.3.1-1.1_source.buildinfo
Checksums-Sha256:
d085b85310ff19da8bfdd4f0be28d6a6a98ab460ab7a985ed6fd966fb21bfbb5 1941
xf86-input-mtrack_0.3.1-1.1.dsc
4868a2626adc36e946f97fd76ff26bb8790c01f6d160eb5aff99c6d536a4522f 12868
xf86-input-mtrack_0.3.1-1.1.debian.tar.xz
d142b310adc6235759b67e8f386e51e27f89a19d670850150a091e32beef2f65 10369
xf86-input-mtrack_0.3.1-1.1_source.buildinfo
Files:
14246b236b01c8a04f0f430d3edf8b06 1941 x11 optional
xf86-input-mtrack_0.3.1-1.1.dsc
adca0cd03655dfbf65314e4afa86f1b1 12868 x11 optional
xf86-input-mtrack_0.3.1-1.1.debian.tar.xz
df5539513c1c70902b5f7306993e85eb 10369 x11 optional
xf86-input-mtrack_0.3.1-1.1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEkpeKbhleSSGCX3/w808JdE6fXdkFAmYe7+0ACgkQ808JdE6f
Xdk0VA/+JZH6qTALofhPM4btUPYG3jvfe/pfakUgXH5hP0jLDbJk08ubutJhvi91
OpenPGP_signature.asc
Description: OpenPGP digital signature
