Re: [PR PATCH] [Updated] touchegg: update to 2.0.9

[crater2150 <crater2150@users.noreply.github.com>]

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

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

https://github.com/crater2150/void-packages touchegg
https://github.com/void-linux/void-packages/pull/31123

touchegg: update to 2.0.9
Touchegg was completely rewritten without Qt for 2.0, so most dependencies changed. It also changed to a client-server architecture for access to input devices, so this package now adds a `_touchegg` user and a service running with `input` group.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me (although I did not use the previous version, as it segfaulted for me)
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl (crossbuild)
  - [x] armv7l (crossbuild)
  - [x] armv6l-musl  (crossbuild)

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

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

From c9e049e403ef1b0b3e48cbd2d2e276d33fec2ea2 Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <void@qwertyuiop.de>
Date: Tue, 25 May 2021 20:14:39 +0000
Subject: [PATCH] touchegg: update to 2.0.9

---
 srcpkgs/touchegg/files/touchegg/run       |  2 ++
 srcpkgs/touchegg/patches/musl.patch       | 24 +++++++++++++++
 srcpkgs/touchegg/patches/no-systemd.patch | 28 +++++++++++++++++
 srcpkgs/touchegg/patches/qt5.patch        | 37 -----------------------
 srcpkgs/touchegg/template                 | 20 +++++++-----
 5 files changed, 67 insertions(+), 44 deletions(-)
 create mode 100755 srcpkgs/touchegg/files/touchegg/run
 create mode 100644 srcpkgs/touchegg/patches/musl.patch
 create mode 100644 srcpkgs/touchegg/patches/no-systemd.patch
 delete mode 100644 srcpkgs/touchegg/patches/qt5.patch

diff --git a/srcpkgs/touchegg/files/touchegg/run b/srcpkgs/touchegg/files/touchegg/run
new file mode 100755
index 000000000000..abe9b2319e3b
--- /dev/null
+++ b/srcpkgs/touchegg/files/touchegg/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -u _touchegg:input touchegg --daemon
diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch
new file mode 100644
index 000000000000..62e9e0fbbbb9
--- /dev/null
+++ b/srcpkgs/touchegg/patches/musl.patch
@@ -0,0 +1,24 @@
+From da9a3a95cfe9965ff6e15e3a0e1a98f8840a34d7 Mon Sep 17 00:00:00 2001
+From: Alexander Gehrke <void@qwertyuiop.de>
+Date: Tue, 25 May 2021 23:47:51 +0000
+Subject: [PATCH] Fix missing header for musl
+
+---
+ src/utils/client-lock.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils/client-lock.cpp b/src/utils/client-lock.cpp
+index fb1e67b..27c6c6a 100644
+--- src/utils/client-lock.cpp
++++ src/utils/client-lock.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <sys/file.h>
+ #include <unistd.h>
++#include <fcntl.h>
+ 
+ #include <exception>
+ #include <stdexcept>
+-- 
+2.31.1
+
diff --git a/srcpkgs/touchegg/patches/no-systemd.patch b/srcpkgs/touchegg/patches/no-systemd.patch
new file mode 100644
index 000000000000..7b194cca886d
--- /dev/null
+++ b/srcpkgs/touchegg/patches/no-systemd.patch
@@ -0,0 +1,28 @@
+From 938167799926ad70849d8088bdef023b5e8a0700 Mon Sep 17 00:00:00 2001
+From: Alexander Gehrke <void@qwertyuiop.de>
+Date: Tue, 25 May 2021 20:11:29 +0000
+Subject: [PATCH] Fix CMake failing because of missing Systemd service dir
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dee220d..13b773f 100755
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -76,11 +76,6 @@ include(GNUInstallDirs)
+ set(SYSTEM_CONFIG_FILE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/touchegg/touchegg.conf")
+ target_compile_definitions(touchegg PUBLIC SYSTEM_CONFIG_FILE_PATH=\"${SYSTEM_CONFIG_FILE_PATH}\")
+ 
+-# configure systemd service unit to use the right path, e.g. @CMAKE_INSTALL_BINDIR@/touchegg
+-configure_file(${PROJECT_SOURCE_DIR}/installation/touchegg.service.in ${PROJECT_SOURCE_DIR}/installation/touchegg.service @ONLY)
+-pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemdsystemunitdir)
+-
+ install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/touchegg) # /usr/share/touchegg/touchegg.conf
+-install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.service DESTINATION ${SYSTEMD_SERVICE_DIR})
+ install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.desktop DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart)
+ install(PROGRAMS ${PROJECT_BINARY_DIR}/touchegg DESTINATION ${CMAKE_INSTALL_BINDIR}) # /usr/bin/touchegg
+-- 
+2.31.1
+
diff --git a/srcpkgs/touchegg/patches/qt5.patch b/srcpkgs/touchegg/patches/qt5.patch
deleted file mode 100644
index cd5a0fff5126..000000000000
--- a/srcpkgs/touchegg/patches/qt5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e60ff96afe5ffb893803e26c598e7bc11d1e0c33 Mon Sep 17 00:00:00 2001
-From: chrmod <krzysztof.modras@gmail.com>
-Date: Sun, 31 Jan 2016 14:20:41 +0100
-Subject: [PATCH] Updating dependencies for QT 5.1 to compile on Ubuntu 15.10
-
----
- src/touchegg/util/Include.h | 3 ++-
- touchegg.pro                | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/touchegg/util/Include.h b/src/touchegg/util/Include.h
-index 4fb27d5..c0de1d5 100644
---- touchegg/src/touchegg/util/Include.h
-+++ touchegg/src/touchegg/util/Include.h
-@@ -23,7 +23,8 @@
-     // Qt
-     #include <QtCore>
-     #include <QtGui>
--    #include <QtGui/QX11Info>
-+    #include <QtWidgets>
-+    #include <QX11Info>
-     #include <QtXml>
- 
-     // Xlib
-diff --git a/touchegg.pro b/touchegg.pro
-index 696ea1a..4565083 100644
---- touchegg/touchegg.pro
-+++ touchegg/touchegg.pro
-@@ -1,6 +1,6 @@
- TEMPLATE     = app
- TARGET       = touchegg
--QT          += gui core xml
-+QT          += gui core xml widgets x11extras
- LIBS        += -lgeis -lX11 -lXtst -lXext
- //DEFINES      = QT_NO_DEBUG_OUTPUT
- 
-
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index e245c3fb1959..d3a83d7807f2 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,14 +1,20 @@
 # Template file for 'touchegg'
 pkgname=touchegg
-version=1.1.1
-revision=5
-build_wrksrc=touchegg
-build_style=qmake
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="libXtst-devel geis-devel qt5-devel qt5-x11extras-devel"
+version=2.0.9
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
+ libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
 short_desc="Multitouch gesture recognizer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JoseExposito/touchegg"
 distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8
+checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e
+system_accounts="_touchegg"
+
+post_install() {
+	rm -rf ${DESTDIR}/etc/xdg
+	vsv touchegg
+}