Followup-For: Bug #1069526
Control: tag -1 patch pending
Hi,
I've uploaded the attached patch as a NMU to DELAYED/2, it fixes the
issue at hand and does some more minor cleanup. Please let me know if I
should delay it longer.
Andreas
diff --git a/debian/changelog b/debian/changelog
index ca93f3d..370cb3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libevdevplus (0.1.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Work around struct input_event.time kernel api change. (Closes: #1069526)
+ * Switch B-D from pkg-config to pkgconf.
+ * PIE is enabled by default.
+ * Declare Rules-Requires-Root: no.
+
+ -- Andreas Beckmann <a...@debian.org> Sat, 27 Apr 2024 02:39:58 +0200
+
libevdevplus (0.1.1-2) unstable; urgency=medium
* d/rules: set -DCMAKE_POSITION_INDEPENDENT_CODE=ON.
diff --git a/debian/control b/debian/control
index 1450393..de2a994 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
Maintainer: Alexandre Viau <av...@debian.org>
Build-Depends: debhelper (>=12),
cmake,
- pkg-config
+ pkgconf,
+Rules-Requires-Root: no
Standards-Version: 4.5.0
Homepage: https://github.com/YukiWorkshop/libevdevPlus
Vcs-Git: https://salsa.debian.org/debian/libevdevplus.git
diff --git a/debian/patches/input_event.time.patch
b/debian/patches/input_event.time.patch
new file mode 100644
index 0000000..2717dbe
--- /dev/null
+++ b/debian/patches/input_event.time.patch
@@ -0,0 +1,28 @@
+Author: Andreas Beckmann <a...@debian.org>
+Description: work around struct input_event.time kernel api change
+
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+--- a/InputEvent.hpp
++++ b/InputEvent.hpp
+@@ -20,7 +20,9 @@ namespace evdevPlus {
+ public:
+ input_event event{};
+
++#if 0
+ timeval &Time = event.time;
++#endif
+ uint16_t &Type = event.type;
+ uint16_t &Code = event.code;
+ int32_t &Value = event.value;
+@@ -37,7 +39,10 @@ namespace evdevPlus {
+ Value = value;
+
+ if (time)
+- memcpy(&event.time, time, sizeof(timeval));
++ {
++ event.input_event_sec = time->tv_sec;
++ event.input_event_usec = time->tv_usec;
++ }
+ }
+
+ friend void swap(InputEvent &first, InputEvent &second) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3f6b5f5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+input_event.time.patch
diff --git a/debian/rules b/debian/rules
index 739caf5..f0139be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
-CONFIGURE_FLAGS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-
%:
dh $@
