From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 049DA138334 for ; Sat, 29 Dec 2018 00:45:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F01A0E0863; Sat, 29 Dec 2018 00:45:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2F73E0863 for ; Sat, 29 Dec 2018 00:45:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5486335C78 for ; Sat, 29 Dec 2018 00:45:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78F614ED for ; Sat, 29 Dec 2018 00:45:28 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1546044314.e26ab54896ce6c825eb77fde35d41517e4f2cdb5.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: lxqt-base/lxqt-config/files/ X-VCS-Repository: proj/qt X-VCS-Files: lxqt-base/lxqt-config/files/lxqt-config-0.14.0-make-touchpad-optional.patch X-VCS-Directories: lxqt-base/lxqt-config/files/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: e26ab54896ce6c825eb77fde35d41517e4f2cdb5 X-VCS-Branch: master Date: Sat, 29 Dec 2018 00:45:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cbb776e6-4d1c-4458-98ff-c7f99ce2f3ac X-Archives-Hash: a530849d1a4e04410f2cbc309827d85f commit: e26ab54896ce6c825eb77fde35d41517e4f2cdb5 Author: Jimi Huotari gentoo org> AuthorDate: Sat Dec 29 00:44:30 2018 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Sat Dec 29 00:45:14 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e26ab548 lxqt-base/lxqt-config: slightly adjust optionally touchpadding patch Signed-off-by: Jimi Huotari gentoo.org> Package-Manager: Portage-2.3.52, Repoman-2.3.12 ...lxqt-config-0.14.0-make-touchpad-optional.patch | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.14.0-make-touchpad-optional.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.14.0-make-touchpad-optional.patch index 5d2674f2..1090d6f2 100644 --- a/lxqt-base/lxqt-config/files/lxqt-config-0.14.0-make-touchpad-optional.patch +++ b/lxqt-base/lxqt-config/files/lxqt-config-0.14.0-make-touchpad-optional.patch @@ -1,21 +1,27 @@ -From 8219e93d5733d6c8e98028e6f21468f568d9848d Mon Sep 17 00:00:00 2001 +From 0d4690c116a1775e4e129878d9f5a2f5f77c068f Mon Sep 17 00:00:00 2001 From: Jimi Huotari Date: Sun, 23 Dec 2018 23:30:57 +0200 Subject: [PATCH] lxqt-config-input: make touchpad settings/dependencies optional +Add a configure option for building the touchpad section of the +'Keyboard and Mouse Settings' (enabled by default). This allows +for reducing the dependencies on systems that do not have a use +for them. + +Closes: https://github.com/lxqt/lxqt-config/issues/358 --- - lxqt-config-input/CMakeLists.txt | 73 ++++++++++++++++++++----- + lxqt-config-input/CMakeLists.txt | 71 ++++++++++++++++++++----- lxqt-config-input/lxqt-config-input.cpp | 10 ++++ lxqt-config-input/touchpad-config.h.in | 1 + - 3 files changed, 71 insertions(+), 13 deletions(-) + 3 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 lxqt-config-input/touchpad-config.h.in diff --git a/lxqt-config-input/CMakeLists.txt b/lxqt-config-input/CMakeLists.txt -index a315e71..2d87a17 100644 +index a315e71..8c4c0fb 100644 --- a/lxqt-config-input/CMakeLists.txt +++ b/lxqt-config-input/CMakeLists.txt -@@ -1,24 +1,46 @@ +@@ -1,24 +1,44 @@ project(lxqt-config-input) +option(WITH_TOUCHPAD "Build touchpad settings" ON) @@ -37,7 +43,6 @@ index a315e71..2d87a17 100644 +set(lxqt-config-input_INCS ${X11_INCLUDE_DIR} - ${XORG_LIBINPUT_INCLUDE_DIRS} -+ ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/../liblxqt-config-cursor" ) @@ -52,7 +57,6 @@ index a315e71..2d87a17 100644 + ${lxqt-config-input_INCS} +) + -+# "${CMAKE_CURRENT_SOURCE_DIR}/touchpad-config.h.in" +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/touchpad-config.h.in" + "${CMAKE_CURRENT_SOURCE_DIR}/touchpad-config.h" @@ -69,7 +73,7 @@ index a315e71..2d87a17 100644 ) set(lxqt-config-input_SRCS -@@ -27,8 +49,6 @@ set(lxqt-config-input_SRCS +@@ -27,8 +47,6 @@ set(lxqt-config-input_SRCS mouseconfig.cpp keyboardlayoutconfig.cpp selectkeyboardlayoutdialog.cpp @@ -78,7 +82,7 @@ index a315e71..2d87a17 100644 ) set(lxqt-config-input_UIS -@@ -36,9 +56,26 @@ set(lxqt-config-input_UIS +@@ -36,9 +54,26 @@ set(lxqt-config-input_UIS keyboardconfig.ui keyboardlayoutconfig.ui selectkeyboardlayoutdialog.ui @@ -106,7 +110,7 @@ index a315e71..2d87a17 100644 # Translations ********************************** lxqt_translate_ts(QM_FILES UPDATE_TRANSLATIONS -@@ -67,14 +104,24 @@ add_executable(lxqt-config-input +@@ -67,14 +102,24 @@ add_executable(lxqt-config-input ${QM_LOADER} )