* [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktouch/files/
@ 2022-08-22 21:56 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-08-22 21:56 UTC (permalink / raw
To: gentoo-commits
commit: e171d4284ce6393c3be91e5b14dbbee780bcba55
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 21:55:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 21:55:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e171d428
kde-apps/ktouch: add missing patch from ::kde
Closes: https://bugs.gentoo.org/866075
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ktouch/files/ktouch-22.07.90-without_x11.patch | 97 ++++++++++++++++++++++
1 file changed, 97 insertions(+)
diff --git a/kde-apps/ktouch/files/ktouch-22.07.90-without_x11.patch b/kde-apps/ktouch/files/ktouch-22.07.90-without_x11.patch
new file mode 100644
index 000000000000..dbfc2d94987b
--- /dev/null
+++ b/kde-apps/ktouch/files/ktouch-22.07.90-without_x11.patch
@@ -0,0 +1,97 @@
+From d290b2a51d5aa4694ec746ce5cc9456977efde71 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 31 Jul 2022 16:17:30 +0200
+Subject: [PATCH] Add CMake option to build WITHOUT_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+KTOUCH_BUILD_WITH_X11 already exists and is set automagically so far,
+but using -DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any
+dependencies list X11 as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+- Move the checks to root CMakeLists.txt
+- Move finding Qt5X11Extras behind "NOT WITHOUT_X11" too
+- x11_helper is conditional on KTOUCH_BUILD_WITH_X11
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 18 +++++++++++++++---
+ src/CMakeLists.txt | 13 +------------
+ 2 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ec74a5..a05231b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,9 +39,6 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS
+ Xml
+ XmlPatterns
+ )
+-if (QT_MAJOR_VERSION STREQUAL "5")
+-find_package(Qt5X11Extras)
+-endif()
+ find_package(Qt${QT_MAJOR_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+@@ -62,6 +59,21 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+
+
+ option(COMPILE_QML "Precompile QML code" OFF)
++option(WITHOUT_X11 "Build without X11 Keyboard Layout Detection (skips finding X11)" OFF)
++
++if (NOT WITHOUT_X11)
++ find_package(X11)
++ find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
++ if (QT_MAJOR_VERSION STREQUAL "5")
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG)
++ endif()
++
++ if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND)
++ set(KTOUCH_BUILD_WITH_X11 TRUE)
++ endif()
++
++ add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb")
++endif()
+
+ # enable QML debugging for debug builds
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index cb6f3f5..9dd2a5f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,15 +4,6 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION}
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KTouchConfigVersion.cmake"
+ )
+
+-find_package(X11)
+-find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
+-
+-if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND)
+- set(KTOUCH_BUILD_WITH_X11 TRUE)
+-endif()
+-
+-add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb")
+-
+ ecm_optional_add_subdirectory(schemata)
+
+ # set include directories
+@@ -137,9 +128,7 @@ set(ktouch_SRCS
+ undocommands/coursecommands.cpp
+ undocommands/coursecommands.h
+ undocommands/keyboardlayoutcommands.cpp
+- undocommands/keyboardlayoutcommands.h
+- x11_helper.cpp
+- x11_helper.h)
++ undocommands/keyboardlayoutcommands.h)
+
+ qt_add_resources(ktouch_imgs_SRCS images/images.qrc)
+
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktouch/files/
@ 2022-12-03 10:51 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-12-03 10:51 UTC (permalink / raw
To: gentoo-commits
commit: e183324d5318fc0b35084ede201d02cf8abbf5bd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 10:49:49 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 10:50:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e183324d
kde-apps/ktouch: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../ktouch/files/ktouch-22.04.3-without_x11.patch | 95 ----------------------
1 file changed, 95 deletions(-)
diff --git a/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch b/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch
deleted file mode 100644
index 2278011d6e20..000000000000
--- a/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From f94d8b2bcdb738354f73efabbbe4fcf5bb623bf7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 31 Jul 2022 16:17:30 +0200
-Subject: [PATCH] Add CMake option to build WITHOUT_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-KTOUCH_BUILD_WITH_X11 already exists and is set automagically so far,
-but using -DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any
-dependencies list X11 as required in their cmake config.
-
-Introducing this option means there is no behavior change by default,
-cmake will just skip finding X11 or adding unwanted features if the
-option is enabled.
-
-- Move the checks to root CMakeLists.txt
-- Move finding Qt5X11Extras behind "NOT WITHOUT_X11" too
-- x11_helper is conditional on KTOUCH_BUILD_WITH_X11
-
-* backported to release/22.04
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 14 +++++++++++++-
- src/CMakeLists.txt | 13 +------------
- 2 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae5dfb8..55753cd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,7 +40,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
- XmlPatterns
- )
-
--find_package(Qt5X11Extras)
- find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
-
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-@@ -61,6 +60,19 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-
-
- option(COMPILE_QML "Precompile QML code" OFF)
-+option(WITHOUT_X11 "Build without X11 Keyboard Layout Detection (skips finding X11)" OFF)
-+
-+if (NOT WITHOUT_X11)
-+ find_package(X11)
-+ find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
-+ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG)
-+
-+ if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND)
-+ set(KTOUCH_BUILD_WITH_X11 TRUE)
-+ endif()
-+
-+ add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb")
-+endif()
-
- # enable QML debugging for debug builds
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e158d7c..b352184 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,15 +4,6 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION}
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KTouchConfigVersion.cmake"
- )
-
--find_package(X11)
--find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
--
--if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND)
-- set(KTOUCH_BUILD_WITH_X11 TRUE)
--endif()
--
--add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb")
--
- ecm_optional_add_subdirectory(schemata)
-
- # set include directories
-@@ -142,9 +133,7 @@ set(ktouch_SRCS
- undocommands/coursecommands.cpp
- undocommands/coursecommands.h
- undocommands/keyboardlayoutcommands.cpp
-- undocommands/keyboardlayoutcommands.h
-- x11_helper.cpp
-- x11_helper.h)
-+ undocommands/keyboardlayoutcommands.h)
-
- qt_add_resources(ktouch_imgs_SRCS images/images.qrc)
-
---
-2.35.1
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-03 10:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-22 21:56 [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktouch/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-03 10:51 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox