* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2015-01-21 20:48 Johannes Huber
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2015-01-21 20:48 UTC (permalink / raw
To: gentoo-commits
commit: daec723c7d01afb5fcd058e69904cc1dc02ba175
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jan 21 01:10:18 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 20:47:43 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=daec723c
[kde-plasma/plasma-desktop] Make tests optional
---
.../files/plasma-desktop-9999-tests-optional.patch | 35 ++++++++++++++++++++++
.../plasma-desktop/plasma-desktop-9999.ebuild | 3 ++
2 files changed, 38 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-9999-tests-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-9999-tests-optional.patch
new file mode 100644
index 0000000..f417286
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-9999-tests-optional.patch
@@ -0,0 +1,35 @@
+--- a/CMakeLists.txt 2015-01-21 01:59:46.589187275 +0100
++++ b/CMakeLists.txt 2015-01-21 02:00:47.260569833 +0100
+@@ -25,7 +25,6 @@
+ Widgets
+ X11Extras
+ Svg
+- Test
+ Concurrent
+ )
+
+--- a/kcms/lookandfeel/CMakeLists.txt 2015-01-21 01:59:46.643187615 +0100
++++ b/kcms/lookandfeel/CMakeLists.txt 2015-01-21 02:05:09.909255405 +0100
+@@ -44,6 +44,9 @@
+ install(FILES kcm_lookandfeel.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ install(TARGETS kcm_lookandfeel DESTINATION ${PLUGIN_INSTALL_DIR})
+
+-add_subdirectory(autotests)
++if(BUILD_TESTING)
++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++ add_subdirectory(autotests)
++endif()
+
+ plasma_install_package(package kcm_lookandfeel kcms kcm_lookandfeel)
+--- a/kcms/keyboard/CMakeLists.txt 2015-01-21 01:59:46.629187527 +0100
++++ b/kcms/keyboard/CMakeLists.txt 2015-01-21 02:08:24.103523804 +0100
+@@ -183,5 +183,7 @@
+
+
+ # Unit tests
+-
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++ add_subdirectory( tests )
++endif()
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 7beb6c2..8a7f22f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -5,6 +5,7 @@
EAPI=5
KDE_HANDBOOK="true"
+KDE_TEST="true"
inherit kde5
DESCRIPTION="KDE Plasma desktop"
@@ -104,6 +105,8 @@ DEPEND="${COMMON_DEPEND}
fontconfig? ( x11-libs/libXrender )
"
+PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package fontconfig Fontconfig)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2015-07-07 21:01 Johannes Huber
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2015-07-07 21:01 UTC (permalink / raw
To: gentoo-commits
commit: e868bd37946fff241b773324bcf0fc3c2b27662e
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 21:02:39 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 21:02:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e868bd37
[kde-plasma/plasma-desktop] Remove patch, applied upstream
Upstream commit 543652303260945ba0ca0190184d3a72aa4097b7
Package-Manager: portage-2.2.20
.../files/plasma-desktop-5.4.0-cmake-xkb.patch | 78 ----------------------
.../plasma-desktop/plasma-desktop-9999.ebuild | 2 -
2 files changed, 80 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.4.0-cmake-xkb.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.4.0-cmake-xkb.patch
deleted file mode 100644
index 76b21e0..0000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.4.0-cmake-xkb.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/kcms/keyboard/xkb_rules.cpp b/kcms/keyboard/xkb_rules.cpp
-index 9fd0324..094f94f 100644
---- a/kcms/keyboard/xkb_rules.cpp
-+++ b/kcms/keyboard/xkb_rules.cpp
-@@ -160,29 +160,7 @@ QString Rules::getRulesName()
-
- QString Rules::findXkbDir()
- {
-- QString xkbParentDir;
--
-- QString base(XLIBDIR);
-- if( base.count('/') >= 3 ) {
-- // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb
-- QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11";
-- QDir baseDir(base + delta);
-- if( baseDir.exists() ) {
-- xkbParentDir = baseDir.absolutePath();
-- }
-- else {
-- QDir baseDir(base + "/X11"); // .../usr/X11/lib/X11/xkb (old XFree)
-- if( baseDir.exists() ) {
-- xkbParentDir = baseDir.absolutePath();
-- }
-- }
-- }
--
-- if( xkbParentDir.isEmpty() ) {
-- xkbParentDir = "/usr/share/X11";
-- }
--
-- return xkbParentDir + "/xkb";
-+ return QStringLiteral(XKBDIR);
- }
-
- static QString findXkbRulesFile()
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 4fc4bce..e35ae11 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -1,16 +1,9 @@
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
-
--find_program(some_x_program NAMES iceauth xrdb xterm)
--if (NOT some_x_program)
-- set(some_x_program /usr/bin/xrdb)
-- message(WARNING "Warning: Could not determine X binary directory. Assuming /usr/bin.")
--endif ()
--get_filename_component(proto_xbindir "${some_x_program}" PATH)
--get_filename_component(XBINDIR "${proto_xbindir}" ABSOLUTE)
--get_filename_component(xrootdir "${XBINDIR}" PATH)
--set(XLIBDIR "${xrootdir}/lib/X11")
--if (NOT EXISTS "${XLIBDIR}")
-- message(FATAL_ERROR "Couldn't find X11 prefix XLIBDIR: ${XLIBDIR}")
-+find_file(XKBDIR "share/X11/xkb/")
-+set(XLIBDIR "${xrootdir}/share/X11")
-+if (NOT EXISTS "${XKBDIR}")
-+ message(FATAL_ERROR "Couldn't find XKB location: ${XKBDIR}")
- endif()
- set(KWIN_BIN "kwin_x11" CACHE STRING "Name of the KWin binary")
-
-diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake
-index eda8996..d0b48b9 100644
---- a/config-workspace.h.cmake
-+++ b/config-workspace.h.cmake
-@@ -140,11 +140,8 @@
- /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
- #cmakedefine TIME_WITH_SYS_TIME 1
-
--/* X binaries directory */
--#cmakedefine XBINDIR "${XBINDIR}"
--
--/* X libraries directory */
--#cmakedefine XLIBDIR "${XLIBDIR}"
-+/* xkb resources directory */
-+#cmakedefine XKBDIR "${XKBDIR}"
-
- /* PackageKit-Qt has been found */
- #cmakedefine PackageKitQt5_FOUND 1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 2c6a02b..df144d2 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -122,8 +122,6 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-PATCHES=( "${FILESDIR}/${PN}-5.4.0-cmake-xkb.patch" )
-
pkg_setup() {
if has_version net-im/skype && use legacy-systray && use amd64; then
einfo
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2016-10-08 15:51 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2016-10-08 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 225b0b432ba2951e19fc4088232b980bdada25c0
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Sep 14 22:45:24 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 15:51:49 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=225b0b43
kde-plasma/plasma-desktop: Make kde-frameworks/baloo optional
'baloo is the most dysfunctional part of whole kde frameworks'
Package-Manager: portage-2.3.0
.../plasma-desktop-5.7.90-baloo-optional.patch | 45 ++++++++++++++++++++++
.../plasma-desktop-5.8.49.9999.ebuild | 7 +++-
.../plasma-desktop/plasma-desktop-9999.ebuild | 7 +++-
3 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch
new file mode 100644
index 0000000..86fc43c
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch
@@ -0,0 +1,45 @@
+commit 00cdef0f2b6e8e20661aef98074b8533103bbfdd
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu Sep 15 00:39:43 2016 +0200
+
+ Make KF5Baloo optional
+
+ https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f15021a..613ca20 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,14 +67,10 @@ set_package_properties(PackageKitQt5 PROPERTIES DESCRIPTION "Software Manager in
+ PURPOSE "Provides package management integration to the application launcher."
+ )
+
+-# Baloo is currently part of the KF5 namespace, but it is not
+-# a proper framework. Hence the strange versioning.
+-# This will be fixed with Plasma 5.2, as Baloo should have
+-# become a framework by then
+-find_package(KF5Baloo "5.1.90")
++find_package(KF5Baloo)
+ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+- TYPE REQUIRED
+- PURPOSE "Needed to build to File Search KCM"
++ TYPE OPTIONAL
++ PURPOSE "Needed to build the File Search KCM"
+ )
+
+ find_package(Fontconfig)
+diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
+index 53ca49a..3220bd3 100644
+--- a/kcms/CMakeLists.txt
++++ b/kcms/CMakeLists.txt
+@@ -55,7 +55,9 @@ add_subdirectory(useraccount/pics)
+
+
+ add_subdirectory(workspaceoptions)
+-add_subdirectory(baloo)
++if (KF5Baloo_FOUND)
++ add_subdirectory(baloo)
++endif()
+ add_subdirectory(solid_actions)
+ add_subdirectory(cursortheme)
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
index 849b9fc..2fc5d7b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
@@ -12,11 +12,10 @@ inherit kde5
DESCRIPTION="KDE Plasma desktop"
KEYWORDS=""
IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
-legacy-systray packagekit pulseaudio +qt4 scim"
+legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop"
COMMON_DEPEND="
$(add_frameworks_dep attica)
- $(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kactivities-stats)
$(add_frameworks_dep karchive)
@@ -96,6 +95,7 @@ COMMON_DEPEND="
media-sound/pulseaudio
)
scim? ( app-i18n/scim )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep breeze)
@@ -132,6 +132,8 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+PATCHES=( "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" )
+
pkg_setup() {
if has_version net-im/skype && use legacy-systray && use amd64; then
einfo
@@ -149,6 +151,7 @@ src_configure() {
$(cmake-utils_use_find_package packagekit PackageKitQt5)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
$(cmake-utils_use_find_package scim SCIM)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
)
kde5_src_configure
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 849b9fc..2fc5d7b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -12,11 +12,10 @@ inherit kde5
DESCRIPTION="KDE Plasma desktop"
KEYWORDS=""
IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
-legacy-systray packagekit pulseaudio +qt4 scim"
+legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop"
COMMON_DEPEND="
$(add_frameworks_dep attica)
- $(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kactivities-stats)
$(add_frameworks_dep karchive)
@@ -96,6 +95,7 @@ COMMON_DEPEND="
media-sound/pulseaudio
)
scim? ( app-i18n/scim )
+ semantic-desktop? ( $(add_frameworks_dep baloo) )
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep breeze)
@@ -132,6 +132,8 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+PATCHES=( "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" )
+
pkg_setup() {
if has_version net-im/skype && use legacy-systray && use amd64; then
einfo
@@ -149,6 +151,7 @@ src_configure() {
$(cmake-utils_use_find_package packagekit PackageKitQt5)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
$(cmake-utils_use_find_package scim SCIM)
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
)
kde5_src_configure
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2017-02-22 0:32 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2017-02-22 0:32 UTC (permalink / raw
To: gentoo-commits
commit: cd7635b15a2208ad750c444fe9429506034ff70d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 00:31:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 00:31:34 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd7635b1
kde-plasma/plasma-desktop: Fix baloo-optional patch
Reported-by: M-schmittlauch via #gentoo-kde
Package-Manager: portage-2.3.3
...l.patch => plasma-desktop-5.8.6-baloo-optional.patch} | 16 +++++++++++-----
.../plasma-desktop/plasma-desktop-5.8.49.9999.ebuild | 2 +-
kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch
similarity index 77%
rename from kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch
rename to kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch
index 86fc43c502..016a34b428 100644
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.7.90-baloo-optional.patch
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch
@@ -1,13 +1,20 @@
-commit 00cdef0f2b6e8e20661aef98074b8533103bbfdd
+commit e56ffb0914d5498f4017b0046524009d2b617876
Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Thu Sep 15 00:39:43 2016 +0200
Make KF5Baloo optional
+ Regardless of the current state of Baloo, it is not very deeply tied
+ into Plasma. Usage in plasma-desktop comes down to providing the
+ file search kcm. This makes it possible to prepare systems without a
+ use for indexing.
+
https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
+
+ REVIEW: 128957
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f15021a..613ca20 100644
+index 8c99352..b229dd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,14 +67,10 @@ set_package_properties(PackageKitQt5 PROPERTIES DESCRIPTION "Software Manager in
@@ -18,12 +25,11 @@ index f15021a..613ca20 100644
-# a proper framework. Hence the strange versioning.
-# This will be fixed with Plasma 5.2, as Baloo should have
-# become a framework by then
--find_package(KF5Baloo "5.1.90")
-+find_package(KF5Baloo)
+ find_package(KF5Baloo "5.24")
set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
- TYPE REQUIRED
- PURPOSE "Needed to build to File Search KCM"
-+ TYPE OPTIONAL
++ TYPE RECOMMENDED
+ PURPOSE "Needed to build the File Search KCM"
)
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
index a593508046..9036fb8996 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.49.9999.ebuild
@@ -132,7 +132,7 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-PATCHES=( "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.8.6-baloo-optional.patch" )
pkg_setup() {
if has_version net-im/skype && use legacy-systray && use amd64; then
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild
index 750446c1e6..9dc3f49db2 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild
@@ -132,7 +132,7 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-PATCHES=( "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" )
+PATCHES=( "${FILESDIR}/${P}-baloo-optional.patch" )
pkg_setup() {
if has_version net-im/skype && use legacy-systray && use amd64; then
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2021-05-04 21:12 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 21:12 UTC (permalink / raw
To: gentoo-commits
commit: efa9b0716a63951bbbaf8c4b64cbbc54cc044983
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 19:47:43 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 20:16:53 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=efa9b071
kde-plasma/plasma-desktop: Backport 5.22 adaptive opacity feature
This raises the minimum required KDE Frameworks version to 5.82.0
which is carrying the necessary backport in kde-frameworks/plasma.
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=434202
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-desktop-5.21.5-transparency.patch | 239 +++++++++++++++++++++
.../plasma-desktop/plasma-desktop-5.21.5.ebuild | 1 +
2 files changed, 240 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch
new file mode 100644
index 0000000000..3066d3a274
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch
@@ -0,0 +1,239 @@
+From 6fb37dc0260c298bc35ec5e39399aa1f31693e79 Mon Sep 17 00:00:00 2001
+From: Carson Black <uhhadd@gmail.com>
+Date: Thu, 6 Aug 2020 11:58:23 +0200
+Subject: [PATCH] Implement adaptive opacity for panels
+
+---
+ .../contents/applet/CompactApplet.qml | 1 +
+ .../panelconfiguration/MoreSettingsMenu.qml | 35 +++++
+ desktoppackage/contents/views/Panel.qml | 144 +++++++++++++++++-
+ 3 files changed, 174 insertions(+), 6 deletions(-)
+
+diff --git a/desktoppackage/contents/applet/CompactApplet.qml b/desktoppackage/contents/applet/CompactApplet.qml
+index 0d4c85f52..65eb0468e 100644
+--- a/desktoppackage/contents/applet/CompactApplet.qml
++++ b/desktoppackage/contents/applet/CompactApplet.qml
+@@ -153,6 +153,7 @@ PlasmaCore.ToolTipArea {
+ visualParent: compactRepresentation ? compactRepresentation : null
+ location: plasmoid.location
+ hideOnWindowDeactivate: plasmoid.hideOnWindowDeactivate
++ backgroundHints: (plasmoid.containmentDisplayHints & PlasmaCore.Types.DesktopFullyCovered) ? PlasmaCore.Dialog.SolidBackground : PlasmaCore.Dialog.StandardBackground
+
+ property var oldStatus: PlasmaCore.Types.UnknownStatus
+
+diff --git a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
+index 2e577fbcc..d668eb3c2 100644
+--- a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
++++ b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml
+@@ -131,6 +131,41 @@ PlasmaCore.Dialog {
+ flat: false
+ }
+ }
++ PlasmaExtras.Heading {
++ level: 3
++ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opacity")
++ visible: panel.adaptiveOpacityEnabled
++ }
++ PlasmaComponents.ButtonColumn {
++ spacing: 0
++ visible: panel.adaptiveOpacityEnabled
++ Layout.fillWidth: true
++ Layout.minimumWidth: implicitWidth
++ PlasmaComponents.ToolButton {
++ width: Math.max(implicitWidth, parent.width)
++ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Adaptive")
++ checkable: true
++ checked: configDialog.opacityMode === 0
++ onClicked: configDialog.opacityMode = 0
++ flat: false
++ }
++ PlasmaComponents.ToolButton {
++ width: Math.max(implicitWidth, parent.width)
++ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opaque")
++ checkable: true
++ checked: configDialog.opacityMode === 1
++ onClicked: configDialog.opacityMode = 1
++ flat: false
++ }
++ PlasmaComponents.ToolButton {
++ width: Math.max(implicitWidth, parent.width)
++ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Translucent")
++ checkable: true
++ checked: configDialog.opacityMode === 2
++ onClicked: configDialog.opacityMode = 2
++ flat: false
++ }
++ }
+ PlasmaComponents.ToolButton {
+ Layout.fillWidth: true
+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Maximize Panel")
+diff --git a/desktoppackage/contents/views/Panel.qml b/desktoppackage/contents/views/Panel.qml
+index 2fd6ac4d5..cf6c04328 100644
+--- a/desktoppackage/contents/views/Panel.qml
++++ b/desktoppackage/contents/views/Panel.qml
+@@ -21,17 +21,27 @@ import QtQuick.Layouts 1.1
+ import QtQml 2.15
+
+ import org.kde.plasma.core 2.0 as PlasmaCore
++import org.kde.taskmanager 0.1 as TaskManager
+
+-PlasmaCore.FrameSvgItem {
++Item {
+ id: root
+
+- imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background"
+-
+- enabledBorders: panel.enabledBorders
+-
+ property Item containment
+
+- property alias panelMask: root.mask
++ property alias panelMask: privateSwapper.mask
++
++ QtObject {
++ id: privateSwapper
++ property string completedState: ""
++ // Work around the fact that we can't use a ternary if in an alias
++ readonly property var mask: {
++ if (completedState == "opaque") {
++ return opaqueItem.mask
++ } else {
++ return translucentItem.mask
++ }
++ }
++ }
+
+ readonly property bool verticalPanel: containment && containment.formFactor === PlasmaCore.Types.Vertical
+
+@@ -47,6 +57,128 @@ PlasmaCore.FrameSvgItem {
+ readonly property int leftPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.left, spacingAtMinSize));
+ readonly property int rightPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.right, spacingAtMinSize));
+
++ TaskManager.VirtualDesktopInfo {
++ id: virtualDesktopInfo
++ }
++
++ TaskManager.ActivityInfo {
++ id: activityInfo
++ }
++
++ PlasmaCore.SortFilterModel {
++ id: visibleWindowsModel
++ filterRole: 'IsMinimized'
++ filterRegExp: 'false'
++ sourceModel: TaskManager.TasksModel {
++ filterByVirtualDesktop: true
++ filterByActivity: true
++ filterNotMaximized: true
++ filterByScreen: true
++
++ screenGeometry: panel.screenGeometry
++ virtualDesktop: virtualDesktopInfo.currentDesktop
++ activity: activityInfo.currentActivity
++
++ id: tasksModel
++ groupMode: TaskManager.TasksModel.GroupDisabled
++ }
++ }
++
++ PlasmaCore.FrameSvgItem {
++ id: translucentItem
++ enabledBorders: panel.enabledBorders
++ anchors.fill: parent
++
++ imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background"
++ }
++
++ PlasmaCore.FrameSvgItem {
++ id: opaqueItem
++ enabledBorders: panel.enabledBorders
++ anchors.fill: parent
++
++ imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "solid/widgets/panel-background"
++ }
++
++ transitions: [
++ Transition {
++ from: "*"
++ to: "transparent"
++ SequentialAnimation {
++ ScriptAction {
++ script: {
++ translucentItem.visible = true
++ }
++ }
++ NumberAnimation {
++ target: opaqueItem
++ properties: "opacity"
++ from: 1
++ to: 0
++ duration: units.veryLongDuration
++ easing.type: Easing.InOutQuad
++ }
++ ScriptAction {
++ script: {
++ opaqueItem.visible = false
++ privateSwapper.completedState = "transparent"
++ root.panelMaskChanged()
++ }
++ }
++ }
++ },
++ Transition {
++ from: "*"
++ to: "opaque"
++ SequentialAnimation {
++ ScriptAction {
++ script: {
++ opaqueItem.visible = true
++ }
++ }
++ NumberAnimation {
++ target: opaqueItem
++ properties: "opacity"
++ from: 0
++ to: 1
++ duration: units.veryLongDuration
++ easing.type: Easing.InOutQuad
++ }
++ ScriptAction {
++ script: {
++ translucentItem.visible = false
++ privateSwapper.completedState = "opaque"
++ root.panelMaskChanged()
++ }
++ }
++ }
++ }
++ ]
++
++ Component.onCompleted: {
++ state = Qt.binding(function() {
++ let mstate = '';
++ if (panel.opacityMode == 0) {
++ mstate = visibleWindowsModel.count > 0 ? "opaque" : "transparent"
++ } else if (panel.opacityMode == 1) {
++ mstate = "opaque"
++ } else {
++ mstate = "transparent"
++ }
++ if (mstate == 'opaque') {
++ containment.containmentDisplayHints |= PlasmaCore.Types.DesktopFullyCovered;
++ } else {
++ containment.containmentDisplayHints &= ~PlasmaCore.Types.DesktopFullyCovered;
++ }
++ return mstate;
++ })
++ }
++ state: ""
++ states: [
++ State { name: "opaque" },
++ State { name: "transparent" }
++ ]
++
+ function adjustPrefix() {
+ if (!containment) {
+ return "";
+--
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
index 8b159345b5..385b90d132 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
@@ -120,6 +120,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2023-12-19 12:34 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2023-12-19 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 59ec2ffa5430c753c4ea92b3b7b2579ce8863589
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 12:29:24 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 12:34:35 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=59ec2ffa
kde-plasma/plasma-desktop: Fix cmake with USE=X
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-desktop-5.90.0-override-include-dirs.patch | 37 ++++++++++++++++++++--
.../plasma-desktop/plasma-desktop-9999.ebuild | 13 +++++---
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
index 2a99b99ac4..de53c25d01 100644
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
@@ -1,4 +1,4 @@
-From fc3c2a00c5a2543fea4780fcffa709d3b1b76d7c Mon Sep 17 00:00:00 2001
+From 45f2c2ce1fc9d4b2f0d6418a95f04a71337239d4 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 6 Apr 2020 00:41:07 +0200
Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual
@@ -12,8 +12,10 @@ XorgServer - xserver-properties.h
---
CMakeLists.txt | 8 +-------
config-gentoo.cmake | 22 ++++++++++++++++++++++
+ kcms/mouse/CMakeLists.txt | 6 ------
+ kcms/touchpad/CMakeLists.txt | 3 ---
kcms/touchpad/backends/x11.cmake | 2 +-
- 3 files changed, 24 insertions(+), 8 deletions(-)
+ 5 files changed, 24 insertions(+), 17 deletions(-)
create mode 100644 config-gentoo.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,6 +68,37 @@ index 000000000..0d7353c27
+if(BUILD_KCM_MOUSE_X11 OR BUILD_KCM_TOUCHPAD_X11)
+ set(HAVE_XORGLIBINPUT 1)
+endif()
+diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
+index 639981380..2c9009061 100644
+--- a/kcms/mouse/CMakeLists.txt
++++ b/kcms/mouse/CMakeLists.txt
+@@ -32,12 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND)
+ endif()
+
+ if (BUILD_KCM_MOUSE_X11)
+- if (NOT EVDEV_FOUND)
+- list(APPEND MISSING_DEPS "xorg-evdev")
+- endif()
+- if (NOT XORGLIBINPUT_FOUND)
+- list(APPEND MISSING_DEPS "xorg-libinput")
+- endif()
+ if (NOT X11_Xi_FOUND)
+ list(APPEND MISSING_DEPS "X11_Xi")
+ endif()
+diff --git a/kcms/touchpad/CMakeLists.txt b/kcms/touchpad/CMakeLists.txt
+index 309cb247d..33b4f8428 100644
+--- a/kcms/touchpad/CMakeLists.txt
++++ b/kcms/touchpad/CMakeLists.txt
+@@ -17,9 +17,6 @@ if (BUILD_KCM_TOUCHPAD_X11)
+ if (NOT X11_Xi_FOUND)
+ list(APPEND MISSING_DEPS "X11_Xi")
+ endif()
+- if (NOT XORGSERVER_FOUND)
+- list(APPEND MISSING_DEPS "xorg-server")
+- endif()
+ if (MISSING_DEPS)
+ message(FATAL_ERROR "Missing X11 dependencies for kcm_touchpad: ${MISSING_DEPS}. Install dependencies or set CMake option -DBUILD_KCM_TOUCHPAD_X11=OFF.")
+ endif()
diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake
index 88bf0c676..33be94c49 100644
--- a/kcms/touchpad/backends/x11.cmake
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 8fc6f3dc2a..e76da098fc 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -143,18 +143,23 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
- -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
$(cmake_use_find_package ibus GLIB2)
$(cmake_use_find_package kaccounts AccountsQt6)
- $(cmake_use_find_package kaccounts KAccounts)
+ $(cmake_use_find_package kaccounts KAccounts6)
$(cmake_use_find_package sdl SDL2)
$(cmake_use_find_package semantic-desktop KF6Baloo)
-DBUILD_KCM_MOUSE_X11=$(usex X)
-DBUILD_KCM_TOUCHPAD_X11=$(usex X)
)
+ if use X; then
+ mycmakeargs+=(
+ -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ )
+ fi
+
ecm_src_configure
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2024-06-06 20:45 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2024-06-06 20:45 UTC (permalink / raw
To: gentoo-commits
commit: 265cec56e535f6ec4a6f5f93f5d5eebb2dc24a8f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 20:44:11 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 20:44:11 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=265cec56
kde-plasma/plasma-desktop: Rebase override-include-dirs.patch
Closes: https://bugs.gentoo.org/933616
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-desktop-6.1.80-override-include-dirs.patch | 103 +++++++++++++++++++++
.../plasma-desktop/plasma-desktop-9999.ebuild | 2 +-
2 files changed, 104 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.1.80-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.1.80-override-include-dirs.patch
new file mode 100644
index 0000000000..6059eeeee4
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.1.80-override-include-dirs.patch
@@ -0,0 +1,103 @@
+From 803df2e214c199f42a2c88ed7412c4c8db07c882 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 6 Apr 2020 00:41:07 +0200
+Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual
+ targets
+
+All they need is one header each, allow include dir overrides.
+
+XorgLibinput - libinput-properties.h
+XorgServer - xserver-properties.h
+---
+ CMakeLists.txt | 7 +------
+ config-gentoo.cmake | 17 +++++++++++++++++
+ kcms/mouse/CMakeLists.txt | 3 ---
+ kcms/touchpad/CMakeLists.txt | 6 ------
+ 4 files changed, 18 insertions(+), 15 deletions(-)
+ create mode 100644 config-gentoo.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc1d57c12..30a893d5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,16 +226,11 @@ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
+ add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
+ add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
+
+-pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
+-pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
++include(config-gentoo.cmake)
+ pkg_check_modules(XKBREGISTRY xkbregistry REQUIRED IMPORTED_TARGET)
+
+ ecm_find_qmlmodule(org.kde.pipewire 0.1)
+
+-if(XORGLIBINPUT_FOUND)
+- set(HAVE_XORGLIBINPUT 1)
+-endif()
+-
+ include(ConfigureChecks.cmake)
+
+ find_package(PackageKitQt6)
+diff --git a/config-gentoo.cmake b/config-gentoo.cmake
+new file mode 100644
+index 000000000..ac2f0c18d
+--- /dev/null
++++ b/config-gentoo.cmake
+@@ -0,0 +1,17 @@
++if(BUILD_KCM_MOUSE_X11)
++ add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
++ set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
++ INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
++ )
++endif()
++
++if(BUILD_KCM_TOUCHPAD_X11)
++ add_library(PkgConfig::XORGSERVER INTERFACE IMPORTED)
++ set_property(TARGET PkgConfig::XORGSERVER PROPERTY
++ INTERFACE_INCLUDE_DIRECTORIES "${XORGSERVER_INCLUDE_DIRS}"
++ )
++endif()
++
++if(BUILD_KCM_MOUSE_X11 OR BUILD_KCM_TOUCHPAD_X11)
++ set(HAVE_XORGLIBINPUT 1)
++endif()
+diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
+index 17689e78f..364185c91 100644
+--- a/kcms/mouse/CMakeLists.txt
++++ b/kcms/mouse/CMakeLists.txt
+@@ -2,9 +2,6 @@
+ add_definitions(-DTRANSLATION_DOMAIN=\"kcmmouse\")
+
+ if (BUILD_KCM_MOUSE_X11)
+- if (NOT XORGLIBINPUT_FOUND)
+- list(APPEND MISSING_DEPS "xorg-libinput")
+- endif()
+ if (NOT X11_Xi_FOUND)
+ list(APPEND MISSING_DEPS "X11_Xi")
+ endif()
+diff --git a/kcms/touchpad/CMakeLists.txt b/kcms/touchpad/CMakeLists.txt
+index ced353a60..a1920c574 100644
+--- a/kcms/touchpad/CMakeLists.txt
++++ b/kcms/touchpad/CMakeLists.txt
+@@ -2,18 +2,12 @@
+ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_touchpad\")
+
+ if (BUILD_KCM_TOUCHPAD_X11)
+- if (NOT XORGLIBINPUT_FOUND)
+- list(APPEND MISSING_DEPS "xorg-libinput")
+- endif()
+ if (NOT X11_XCB_FOUND)
+ list(APPEND MISSING_DEPS "X11_XCB")
+ endif()
+ if (NOT X11_Xi_FOUND)
+ list(APPEND MISSING_DEPS "X11_Xi")
+ endif()
+- if (NOT XORGSERVER_FOUND)
+- list(APPEND MISSING_DEPS "xorg-server")
+- endif()
+ if (MISSING_DEPS)
+ message(FATAL_ERROR "Missing X11 dependencies for kcm_touchpad: ${MISSING_DEPS}. Install dependencies or set CMake option -DBUILD_KCM_TOUCHPAD_X11=OFF.")
+ endif()
+--
+2.45.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index cf43a935cf..203580bc45 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -126,7 +126,7 @@ BDEPEND="
"
PATCHES=(
- "${WORKDIR}/${XORGHDRS}/${PN}-6.0.80-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${PN}-6.1.80-override-include-dirs.patch" # downstream patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/
@ 2025-01-01 21:26 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2025-01-01 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 9a2a25e39d3fc01bdbfb7e95d538bce32c1dec95
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 21:10:18 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 21:18:55 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9a2a25e3
kde-plasma/plasma-desktop: drop 6.2.49.9999
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-desktop-6.2.3-tablet-kcm-optional.patch | 93 -----------
.../plasma-desktop-6.2.49.9999.ebuild | 182 ---------------------
2 files changed, 275 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch
deleted file mode 100644
index b0d2f512ed..0000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 5296ef03a9b14a6a9324d506d04f78e61e8512f6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 4 Nov 2024 23:15:19 +0100
-Subject: [PATCH] cmake: Add BUILD_KCM_TABLET option to conditionalise Wayland
- deps
-
-Follow-up to 240ca31717ebed55e43ffaf6ac906dea07e9f4c6
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-(cherry picked from commit 8f0e9b4d625024469b4fbd0468e767e45b464872)
----
- CMakeLists.txt | 30 ++++++++++++++++++------------
- kcms/CMakeLists.txt | 5 ++++-
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f764d1ef4..8222cfaed5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,6 +40,7 @@ option(BUILD_KCM_MOUSE_KWIN_WAYLAND "Build the Mouse KCM's KWin+Wayland backend"
- option(BUILD_KCM_MOUSE_X11 "Build the Mouse KCM's X11 backend" ON)
- option(BUILD_KCM_TOUCHPAD_KWIN_WAYLAND "Build the Touchpad KCM's KWin+Wayland backend" ON)
- option(BUILD_KCM_TOUCHPAD_X11 "Build the Touchpad KCM's X11 backend" ON)
-+option(BUILD_KCM_TABLET "Build the Tablet KCM" ON)
-
- find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
- Quick
-@@ -51,7 +52,10 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
- Core5Compat
- Sql # kcms/activities
- )
--find_package(Qt6 ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WaylandClient)
-+
-+if(BUILD_KCM_TABLET)
-+ find_package(Qt6WaylandClient ${QT_MIN_VERSION} CONFIG REQUIRED)
-+endif()
-
- find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
- Auth
-@@ -139,17 +143,19 @@ set_package_properties(KF6QQC2DesktopStyle PROPERTIES
- TYPE RUNTIME
- )
-
--find_package(WaylandProtocols 1.25)
--set_package_properties(WaylandProtocols PROPERTIES
-- TYPE REQUIRED
-- PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol"
-- URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/"
--)
--find_package(Wayland 1.2)
--set_package_properties(Wayland PROPERTIES
-- TYPE REQUIRED
-- PURPOSE "Required for building Tablet input KCM"
--)
-+if(BUILD_KCM_TABLET)
-+ find_package(WaylandProtocols 1.25)
-+ set_package_properties(WaylandProtocols PROPERTIES
-+ TYPE REQUIRED
-+ PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol"
-+ URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/"
-+ )
-+ find_package(Wayland 1.2)
-+ set_package_properties(Wayland PROPERTIES
-+ TYPE REQUIRED
-+ PURPOSE "Required for building Tablet input KCM"
-+ )
-+endif()
-
- find_package(SDL2 2.0.16)
- set_package_properties(SDL2 PROPERTIES
-diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
-index 5b204a7c19..cea880c139 100644
---- a/kcms/CMakeLists.txt
-+++ b/kcms/CMakeLists.txt
-@@ -26,7 +26,6 @@ add_subdirectory(kded)
- add_subdirectory(runners)
- add_subdirectory(spellchecking)
- add_subdirectory(qtquicksettings)
--add_subdirectory(tablet)
- add_subdirectory(touchscreen)
-
- add_subdirectory(workspaceoptions)
-@@ -42,3 +41,7 @@ endif()
- if (BUILD_KCM_TOUCHPAD_KWIN_WAYLAND OR BUILD_KCM_TOUCHPAD_X11)
- add_subdirectory(touchpad)
- endif()
-+
-+if(BUILD_KCM_TABLET)
-+ add_subdirectory(tablet)
-+endif()
---
-2.47.0
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild
deleted file mode 100644
index 36c61b6017..0000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=6.6.0
-QTMIN=6.7.2
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-4"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS=""
-IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine"
-
-RESTRICT="test" # missing selenium-webdriver-at-spi
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-COMMON_DEPEND="
- dev-libs/icu:=
- >=dev-qt/qt5compat-${QTMIN}:6[qml]
- >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
- >=dev-qt/qtdeclarative-${QTMIN}:6
- >=dev-qt/qtsvg-${QTMIN}:6
- >=kde-frameworks/attica-${KFMIN}:6
- >=kde-frameworks/karchive-${KFMIN}:6
- >=kde-frameworks/kauth-${KFMIN}:6
- >=kde-frameworks/kbookmarks-${KFMIN}:6
- >=kde-frameworks/kcmutils-${KFMIN}:6
- >=kde-frameworks/kcodecs-${KFMIN}:6
- >=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kcrash-${KFMIN}:6
- >=kde-frameworks/kdbusaddons-${KFMIN}:6
- >=kde-frameworks/kded-${KFMIN}:6
- >=kde-frameworks/kglobalaccel-${KFMIN}:6
- >=kde-frameworks/kguiaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kitemmodels-${KFMIN}:6
- >=kde-frameworks/kitemviews-${KFMIN}:6
- >=kde-frameworks/kjobwidgets-${KFMIN}:6
- >=kde-frameworks/knewstuff-${KFMIN}:6
- >=kde-frameworks/knotifications-${KFMIN}:6
- >=kde-frameworks/knotifyconfig-${KFMIN}:6
- >=kde-frameworks/kpackage-${KFMIN}:6
- >=kde-frameworks/kparts-${KFMIN}:6
- >=kde-frameworks/krunner-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/ksvg-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:6
- >=kde-frameworks/solid-${KFMIN}:6
- >=kde-frameworks/sonnet-${KFMIN}:6
- >=kde-plasma/kwin-${KDE_CATV}:6
- >=kde-plasma/libksysguard-${KDE_CATV}:6
- >=kde-plasma/libplasma-${KDE_CATV}:6
- >=kde-plasma/plasma-activities-${KDE_CATV}:6
- >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6
- >=kde-plasma/plasma-workspace-${KDE_CATV}:6[screencast?]
- >=kde-plasma/plasma5support-${KDE_CATV}:6
- media-libs/libcanberra
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- ibus? (
- app-i18n/ibus
- dev-libs/glib:2
- x11-libs/xcb-util-keysyms
- )
- input_devices_wacom? (
- dev-libs/wayland
- >=dev-qt/qtwayland-${QTMIN}:6
- )
- scim? ( app-i18n/scim )
- sdl? ( media-libs/libsdl2[joystick] )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
- webengine? (
- kde-apps/kaccounts-integration:6
- >=net-libs/accounts-qt-1.17[qt6(+)]
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- x11-base/xorg-proto
- input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 )
- test? (
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
- >=kde-plasma/kactivitymanagerd-${KDE_CATV}:6
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/kdeplasma-addons-5.25.50
- !<kde-plasma/plasma-workspace-6.0.80
- dev-libs/kirigami-addons:6
- >=dev-qt/qtwayland-${QTMIN}:6
- >=kde-frameworks/kirigami-${KFMIN}:6
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
- >=kde-plasma/oxygen-${KDE_CATV}:6
- kde-plasma/plasma-mimeapps-list
- media-fonts/noto-emoji
- sys-apps/util-linux
- x11-apps/setxkbmap
- x11-misc/xdg-user-dirs
- screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 )
- webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6(+)] )
-"
-BDEPEND="
- dev-util/intltool
- >=kde-frameworks/kcmutils-${KFMIN}:6
- virtual/pkgconfig
- input_devices_wacom? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.1.80-override-include-dirs.patch" # downstream patch
- "${FILESDIR}/${PN}-6.2.3-tablet-kcm-optional.patch" # bug 942817
-)
-
-src_prepare() {
- ecm_src_prepare
-
- if ! use ibus; then
- sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
- -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if ! use scim; then
- sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_KCM_MOUSE_X11=ON
- -DBUILD_KCM_TOUCHPAD_X11=ON
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
- $(cmake_use_find_package ibus GLIB2)
- -DBUILD_KCM_TABLET=$(usex input_devices_wacom)
- $(cmake_use_find_package sdl SDL2)
- $(cmake_use_find_package semantic-desktop KF6Baloo)
- $(cmake_use_find_package webengine AccountsQt6)
- $(cmake_use_find_package webengine KAccounts6)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
- # test_kio_fonts needs D-Bus, bug #634166
- # lookandfeel-kcmTest is unreliable for a long time, bug #607918
- local myctestargs=(
- -j1
- -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
- )
-
- ecm_src_test
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "screen reader support" "app-accessibility/orca"
- fi
- ecm_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-01-01 21:26 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-01 21:26 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-06-06 20:45 Andreas Sturmlechner
2023-12-19 12:34 Andreas Sturmlechner
2021-05-04 21:12 Andreas Sturmlechner
2017-02-22 0:32 Andreas Sturmlechner
2016-10-08 15:51 Michael Palimaka
2015-07-07 21:01 Johannes Huber
2015-01-21 20:48 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox