* [PR PATCH] touchegg: update to 2.0.13
@ 2022-03-06 10:57 Animeshz
2022-03-06 13:14 ` [PR REVIEW] " paper42
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Animeshz @ 2022-03-06 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
There is a new pull request by Animeshz against master on the void-packages repository
https://github.com/Animeshz/void-packages touchegg-upd
https://github.com/void-linux/void-packages/pull/36005
touchegg: update to 2.0.13
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/36005.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-touchegg-upd-36005.patch --]
[-- Type: text/x-diff, Size: 4027 bytes --]
From bf5a78b601dd6cc17de54ce9f3cfcdb8f1817691 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Sun, 6 Mar 2022 16:24:32 +0530
Subject: [PATCH] touchegg: update to 2.0.13
---
srcpkgs/touchegg/patches/musl.patch | 24 -------------------
srcpkgs/touchegg/patches/no-systemd.patch | 28 -----------------------
srcpkgs/touchegg/template | 5 ++--
3 files changed, 3 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/touchegg/patches/musl.patch
delete mode 100644 srcpkgs/touchegg/patches/no-systemd.patch
diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch
deleted file mode 100644
index 8504cfa2f8c0..000000000000
--- a/srcpkgs/touchegg/patches/musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
---- a/src/utils/client-lock.cpp
-+++ b/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
deleted file mode 100644
index efd2ca83347d..000000000000
--- a/srcpkgs/touchegg/patches/no-systemd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
---- a/CMakeLists.txt
-+++ b/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/template b/srcpkgs/touchegg/template
index 538277a2c683..5a02b7acccc3 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,8 +1,9 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.9
+version=2.0.13
revision=1
build_style=cmake
+configure_args="-DUSE_SYSTEMD=false"
hostmakedepends="pkg-config"
makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
@@ -11,7 +12,7 @@ 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=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e
+checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
system_accounts="_touchegg"
post_install() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR REVIEW] touchegg: update to 2.0.13
2022-03-06 10:57 [PR PATCH] touchegg: update to 2.0.13 Animeshz
@ 2022-03-06 13:14 ` paper42
2022-03-06 13:32 ` [PR PATCH] [Updated] " Animeshz
2022-03-13 22:50 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2022-03-06 13:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36005#discussion_r820232901
Comment:
```suggestion
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
```
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] touchegg: update to 2.0.13
2022-03-06 10:57 [PR PATCH] touchegg: update to 2.0.13 Animeshz
2022-03-06 13:14 ` [PR REVIEW] " paper42
@ 2022-03-06 13:32 ` Animeshz
2022-03-13 22:50 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: Animeshz @ 2022-03-06 13:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 397 bytes --]
There is an updated pull request by Animeshz against master on the void-packages repository
https://github.com/Animeshz/void-packages touchegg-upd
https://github.com/void-linux/void-packages/pull/36005
touchegg: update to 2.0.13
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/36005.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-touchegg-upd-36005.patch --]
[-- Type: text/x-diff, Size: 4161 bytes --]
From 75a6fb3a576c688673548ca5e0dbe3d1fcbcbbe9 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Sun, 6 Mar 2022 16:24:32 +0530
Subject: [PATCH] touchegg: update to 2.0.13
---
srcpkgs/touchegg/patches/musl.patch | 24 -------------------
srcpkgs/touchegg/patches/no-systemd.patch | 28 -----------------------
srcpkgs/touchegg/template | 6 +++--
3 files changed, 4 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/touchegg/patches/musl.patch
delete mode 100644 srcpkgs/touchegg/patches/no-systemd.patch
diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch
deleted file mode 100644
index 8504cfa2f8c0..000000000000
--- a/srcpkgs/touchegg/patches/musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
---- a/src/utils/client-lock.cpp
-+++ b/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
deleted file mode 100644
index efd2ca83347d..000000000000
--- a/srcpkgs/touchegg/patches/no-systemd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
---- a/CMakeLists.txt
-+++ b/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/template b/srcpkgs/touchegg/template
index 538277a2c683..a8526763517f 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,8 +1,9 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.9
+version=2.0.13
revision=1
build_style=cmake
+configure_args="-DUSE_SYSTEMD=false"
hostmakedepends="pkg-config"
makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
@@ -10,8 +11,9 @@ short_desc="Multitouch gesture recognizer"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
+changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e
+checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
system_accounts="_touchegg"
post_install() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: touchegg: update to 2.0.13
2022-03-06 10:57 [PR PATCH] touchegg: update to 2.0.13 Animeshz
2022-03-06 13:14 ` [PR REVIEW] " paper42
2022-03-06 13:32 ` [PR PATCH] [Updated] " Animeshz
@ 2022-03-13 22:50 ` paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2022-03-13 22:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
There's a merged pull request on the void-packages repository
touchegg: update to 2.0.13
https://github.com/void-linux/void-packages/pull/36005
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-13 22:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-06 10:57 [PR PATCH] touchegg: update to 2.0.13 Animeshz
2022-03-06 13:14 ` [PR REVIEW] " paper42
2022-03-06 13:32 ` [PR PATCH] [Updated] " Animeshz
2022-03-13 22:50 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).