* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2020-05-07 21:05 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-05-07 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 33d7abaf3de642b84fa915586a8afd8e38ae08d6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 7 19:48:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 7 19:52:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=33d7abaf
kde-plasma/plasma-desktop: Update override-include-dirs.patch
...to cover new FindXorgServer.cmake module.
Upstream commit 82e7a6b68d81ca2be0fdc3fc13cd5ca5f5e03e81
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...sma-desktop-5.18.5-override-include-dirs.patch} | 35 ++++++++++++++++++----
.../plasma-desktop/plasma-desktop-9999.ebuild | 3 +-
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
similarity index 71%
rename from kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
rename to kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
index 3118913e08..ffbf2b6442 100644
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
@@ -1,19 +1,19 @@
-From b11915786a97f55074b7bfe4eec6f3c5cc08ae78 Mon Sep 17 00:00:00 2001
+From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH 1/2] cmake modules: Allow include dir overrides for various
- input drivers
+Subject: [PATCH] cmake modules: Allow include dir overrides for various input
+ drivers
FindEvdev - evdev-properties.h
FindSynaptics - synaptics-properties.h
FindXorgLibinput - libinput-properties.h
-
-Hint: Dependency for touchpad (Synaptics): xserver-properties.h (xorg-server)
+FindXorgServer - xserver-properties.h
---
cmake/modules/FindEvdev.cmake | 4 ++++
cmake/modules/FindSynaptics.cmake | 4 ++++
cmake/modules/FindXorgLibinput.cmake | 4 ++++
- 3 files changed, 12 insertions(+)
+ cmake/modules/FindXorgServer.cmake | 4 ++++
+ 4 files changed, 16 insertions(+)
diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
index 153128a90..c19c31a96 100644
@@ -81,5 +81,28 @@ index 1550751ae..5b7af5e79 100644
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
+diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
+index 5248c6d25..9de16dba0 100644
+--- a/cmake/modules/FindXorgServer.cmake
++++ b/cmake/modules/FindXorgServer.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
++if(NOT XORGSERVER_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_XORGSERVER xorg-server)
+
+@@ -39,6 +41,8 @@ find_path(XORGSERVER_INCLUDE_DIRS
+ HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
+ )
+
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
+
--
2.26.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 37923f2037..a56f7a6f47 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -135,7 +135,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${PN}-5.18.5-override-include-dirs.patch" # downstream patch
)
src_unpack() {
@@ -165,6 +165,7 @@ src_configure() {
$(cmake_use_find_package fontconfig Fontconfig)
-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
-DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2024-11-17 20:05 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2024-11-17 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 6a1f72d0da6ec265e1d37382014356851e35347c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 19:57:42 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 20:04:03 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a1f72d0
kde-plasma/plasma-desktop: Backport IUSE input_devices_wacom to 6.2
Bug: https://bugs.gentoo.org/942817
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plasma-desktop-6.2.3-tablet-kcm-optional.patch | 94 ++++++++++++++++++++++
.../plasma-desktop-6.2.49.9999.ebuild | 14 ++--
2 files changed, 103 insertions(+), 5 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
new file mode 100644
index 0000000000..e7f549a324
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch
@@ -0,0 +1,94 @@
+From 999deeefddc9482e9e360643578442b958a9c2ef 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 | 31 +++++++++++++++++++------------
+ kcms/CMakeLists.txt | 5 ++++-
+ 2 files changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6f764d1ef4..a76dd3ff2f 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,20 @@ 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"
++ )
++ pkg_check_modules(LIBWACOM libwacom REQUIRED IMPORTED_TARGET)
++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
index 32d6bf5c86..57f1f715d5 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
KEYWORDS=""
-IUSE="ibus scim screencast sdl +semantic-desktop webengine"
+IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine"
RESTRICT="test" # missing selenium-webdriver-at-spi
@@ -25,12 +25,10 @@ RESTRICT="test" # missing selenium-webdriver-at-spi
# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
COMMON_DEPEND="
dev-libs/icu:=
- dev-libs/wayland
>=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
- >=dev-qt/qtwayland-${QTMIN}:6
>=kde-frameworks/attica-${KFMIN}:6
>=kde-frameworks/karchive-${KFMIN}:6
>=kde-frameworks/kauth-${KFMIN}:6
@@ -84,6 +82,10 @@ COMMON_DEPEND="
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 )
@@ -93,9 +95,9 @@ COMMON_DEPEND="
)
"
DEPEND="${COMMON_DEPEND}
- >=dev-libs/wayland-protocols-1.25
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-${PVCUT}:6
@@ -119,13 +121,14 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="
dev-util/intltool
- dev-util/wayland-scanner
>=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() {
@@ -150,6 +153,7 @@ src_configure() {
-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)
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2024-05-20 19:21 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2024-05-20 19:21 UTC (permalink / raw
To: gentoo-commits
commit: 336670543dcd9cbcacaff655a482320a88232853
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 18:44:09 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 20 19:18:32 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=33667054
kde-plasma/plasma-desktop: Drop IUSE X, bump override-include-dirs to v4
IUSE X was very weak in the first place since still depending on libX11,
and not even correct in some of the thought-to-be optional deps.
Drop EVDEV, it is gone, backport a couple commits to 6.0 branch for dual
use of the respun tarball.
Closes: https://bugs.gentoo.org/929969
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-desktop-5.90.0-override-include-dirs.patch | 117 ---------------------
.../files/plasma-desktop-6.0.5-unused-dep.patch | 85 +++++++++++++++
.../plasma-desktop-6.0.49.9999.ebuild | 31 +++---
.../plasma-desktop/plasma-desktop-9999.ebuild | 30 ++----
4 files changed, 108 insertions(+), 155 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
deleted file mode 100644
index de53c25d01..0000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-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
- targets
-
-All they need is one header each, allow include dir overrides.
-
-Evdev - evdev-properties.h
-XorgLibinput - libinput-properties.h
-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 +-
- 5 files changed, 24 insertions(+), 17 deletions(-)
- create mode 100644 config-gentoo.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8868a130..ea950b050 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -224,16 +224,10 @@ 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(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
--pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
-+include(config-gentoo.cmake)
-
- 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..0d7353c27
---- /dev/null
-+++ b/config-gentoo.cmake
-@@ -0,0 +1,22 @@
-+if(BUILD_KCM_MOUSE_X11)
-+ add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
-+ set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
-+ INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
-+ )
-+
-+ add_library(PkgConfig::EVDEV INTERFACE IMPORTED)
-+ set_property(TARGET PkgConfig::EVDEV PROPERTY
-+ INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_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 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
-+++ b/kcms/touchpad/backends/x11.cmake
-@@ -10,7 +10,7 @@ SET(backend_SRCS
- backends/x11/xrecordkeyboardmonitor.cpp
- )
-
--if (XORGLIBINPUT_FOUND)
-+if (HAVE_XORGLIBINPUT)
-
- SET(backend_SRCS
- ${backend_SRCS}
---
-2.43.0
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch
new file mode 100644
index 0000000000..e88c78b49b
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch
@@ -0,0 +1,85 @@
+From 96d62f21f52e543dfb1f114988d4912ef321772f Mon Sep 17 00:00:00 2001
+From: Jakob Petsovits <jpetso@petsovits.com>
+Date: Thu, 4 Apr 2024 19:03:49 -0400
+Subject: [PATCH 1/2] kcms/mouse: Remove unused xorg-evdev dependency
+
+It's not necessary to access it directly anymore, now that we only
+expose settings for libinput.
+
+(cherry picked from commit b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770)
+---
+ kcms/mouse/CMakeLists.txt | 3 ---
+ kcms/mouse/backends/x11.cmake | 1 -
+ kcms/mouse/inputbackend.h | 1 -
+ 3 files changed, 5 deletions(-)
+
+diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
+index 639981380..909ed815d 100644
+--- a/kcms/mouse/CMakeLists.txt
++++ b/kcms/mouse/CMakeLists.txt
+@@ -32,9 +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()
+diff --git a/kcms/mouse/backends/x11.cmake b/kcms/mouse/backends/x11.cmake
+index 3b1601285..c402612de 100644
+--- a/kcms/mouse/backends/x11.cmake
++++ b/kcms/mouse/backends/x11.cmake
+@@ -11,7 +11,6 @@ set(backend_SRCS
+ set(backend_LIBS
+ ${backend_LIBS}
+ PkgConfig::XORGLIBINPUT
+- PkgConfig::EVDEV
+ X11::X11
+ X11::Xi
+ X11::Xcursor
+diff --git a/kcms/mouse/inputbackend.h b/kcms/mouse/inputbackend.h
+index 579634d27..0a6e6ac6a 100644
+--- a/kcms/mouse/inputbackend.h
++++ b/kcms/mouse/inputbackend.h
+@@ -20,7 +20,6 @@ enum class InputBackendMode {
+ #endif
+ #if BUILD_KCM_MOUSE_X11
+ XLibinput = 1,
+- XEvdev = 2,
+ #endif
+ };
+
+--
+2.45.1
+
+
+From fcc965d6a90822b2c6600bf2426dfb0c2b46021a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 20 May 2024 18:41:57 +0200
+Subject: [PATCH 2/2] Cleanup remaining pkg_check_modules(EVDEV) call
+
+Amends 181b6c85ea6d46652b136462d5b6e0c9b56fc5c2 and b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 2242b7852f1ab746e4f6929e2fcd51b24b2ec37e)
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b475d3c5b..a515367a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,7 +226,6 @@ 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(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
+ pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
+
+ ecm_find_qmlmodule(org.kde.pipewire 0.1)
+--
+2.45.1
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.0.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.49.9999.ebuild
index 7b353b5d0a..a834758ab5 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.0.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.0.49.9999.ebuild
@@ -11,13 +11,13 @@ QTMIN=6.6.2
inherit ecm plasma.kde.org optfeature
DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-3"
+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 kaccounts scim screencast sdl +semantic-desktop X"
+IUSE="ibus kaccounts scim screencast sdl +semantic-desktop"
RESTRICT="test" # missing selenium-webdriver-at-spi
@@ -74,13 +74,11 @@ COMMON_DEPEND="
>=kde-plasma/plasma5support-${PVCUT}:6
media-libs/libcanberra
x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcursor
x11-libs/libXi
- X? (
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- )
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
ibus? (
app-i18n/ibus
dev-libs/glib:2
@@ -126,7 +124,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${PN}-6.0.5-unused-dep.patch" # backport from 6.1/git master
+ "${WORKDIR}/${XORGHDRS}/${PN}-6.0.5-override-include-dirs.patch" # downstream patch
)
src_prepare() {
@@ -145,24 +144,18 @@ src_prepare() {
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)
$(cmake_use_find_package kaccounts AccountsQt6)
$(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
}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index fcf6719a4d..fbefa5b7a2 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -11,13 +11,13 @@ QTMIN=6.6.2
inherit ecm plasma.kde.org optfeature
DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-3"
+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 kaccounts scim screencast sdl +semantic-desktop X"
+IUSE="ibus kaccounts scim screencast sdl +semantic-desktop"
RESTRICT="test" # missing selenium-webdriver-at-spi
@@ -74,13 +74,11 @@ COMMON_DEPEND="
>=kde-plasma/plasma5support-${PVCUT}:6
media-libs/libcanberra
x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcursor
x11-libs/libXi
- X? (
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- )
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
ibus? (
app-i18n/ibus
dev-libs/glib:2
@@ -126,7 +124,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch
+ "${WORKDIR}/${XORGHDRS}/${PN}-6.0.80-override-include-dirs.patch" # downstream patch
)
src_prepare() {
@@ -145,24 +143,18 @@ src_prepare() {
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)
$(cmake_use_find_package kaccounts AccountsQt6)
$(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] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2023-12-14 21:24 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2023-12-14 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 00681ff89a49ed8c203a2cdf61dbc8ee71d94214
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 22:57:17 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 23:10:17 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=00681ff8
kde-plasma/plasma-desktop: Rebase override-include-dirs.patch, IUSE X
Upstream commits:
af091e2486c97f65da0ea870f3e6bfeb4fe06225
5a77857b9f56478632a52dbb6cd3b25a1e145165
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-desktop-5.90.0-override-include-dirs.patch | 84 ++++++++++++++++++++++
.../plasma-desktop/plasma-desktop-9999.ebuild | 24 +++++--
2 files changed, 102 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
new file mode 100644
index 0000000000..2a99b99ac4
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
@@ -0,0 +1,84 @@
+From fc3c2a00c5a2543fea4780fcffa709d3b1b76d7c 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.
+
+Evdev - evdev-properties.h
+XorgLibinput - libinput-properties.h
+XorgServer - xserver-properties.h
+---
+ CMakeLists.txt | 8 +-------
+ config-gentoo.cmake | 22 ++++++++++++++++++++++
+ kcms/touchpad/backends/x11.cmake | 2 +-
+ 3 files changed, 24 insertions(+), 8 deletions(-)
+ create mode 100644 config-gentoo.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8868a130..ea950b050 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -224,16 +224,10 @@ 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(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
+-pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
++include(config-gentoo.cmake)
+
+ 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..0d7353c27
+--- /dev/null
++++ b/config-gentoo.cmake
+@@ -0,0 +1,22 @@
++if(BUILD_KCM_MOUSE_X11)
++ add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
++ set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
++ INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
++ )
++
++ add_library(PkgConfig::EVDEV INTERFACE IMPORTED)
++ set_property(TARGET PkgConfig::EVDEV PROPERTY
++ INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_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/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake
+index 88bf0c676..33be94c49 100644
+--- a/kcms/touchpad/backends/x11.cmake
++++ b/kcms/touchpad/backends/x11.cmake
+@@ -10,7 +10,7 @@ SET(backend_SRCS
+ backends/x11/xrecordkeyboardmonitor.cpp
+ )
+
+-if (XORGLIBINPUT_FOUND)
++if (HAVE_XORGLIBINPUT)
+
+ SET(backend_SRCS
+ ${backend_SRCS}
+--
+2.43.0
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 938a970cd8..223a9e75e4 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -11,11 +11,13 @@ QTMIN=6.6.0
inherit ecm plasma.kde.org optfeature
DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-3"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
KEYWORDS=""
-IUSE="ibus scim screencast sdl +semantic-desktop" # +kaccounts
+IUSE="ibus scim screencast sdl +semantic-desktop X" # +kaccounts
RESTRICT="test" # missing selenium-webdriver-at-spi
@@ -70,12 +72,13 @@ COMMON_DEPEND="
>=kde-plasma/plasma5support-${PVCUT}:6
media-libs/libcanberra
x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXfixes
x11-libs/libXi
- x11-libs/libxcb
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
+ X? (
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ )
ibus? (
app-i18n/ibus
dev-libs/glib:2
@@ -119,6 +122,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch
+)
+
src_prepare() {
ecm_src_prepare
@@ -136,11 +143,16 @@ 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 sdl SDL2)
$(cmake_use_find_package semantic-desktop KF6Baloo)
+ -DBUILD_KCM_MOUSE_X11=$(usex X)
+ -DBUILD_KCM_TOUCHPAD_X11=$(usex X)
)
ecm_src_configure
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2020-05-16 22:05 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-05-16 22:05 UTC (permalink / raw
To: gentoo-commits
commit: c8103c107b7a6129e25602c0127466014f4670b4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 21:48:40 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 16 21:52:26 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8103c10
kde-plasma/plasma-desktop: Move headers into SRC_URI tarball
Uncluttering ebuild.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...asma-desktop-5.18.5-override-include-dirs.patch | 108 ---------------------
.../plasma-desktop/plasma-desktop-5.18.90.ebuild | 39 ++------
.../plasma-desktop-5.19.49.9999.ebuild | 39 ++------
.../plasma-desktop/plasma-desktop-9999.ebuild | 39 ++------
4 files changed, 21 insertions(+), 204 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
deleted file mode 100644
index ffbf2b6442..0000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] cmake modules: Allow include dir overrides for various input
- drivers
-
-FindEvdev - evdev-properties.h
-FindSynaptics - synaptics-properties.h
-FindXorgLibinput - libinput-properties.h
-FindXorgServer - xserver-properties.h
----
- cmake/modules/FindEvdev.cmake | 4 ++++
- cmake/modules/FindSynaptics.cmake | 4 ++++
- cmake/modules/FindXorgLibinput.cmake | 4 ++++
- cmake/modules/FindXorgServer.cmake | 4 ++++
- 4 files changed, 16 insertions(+)
-
-diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
-index 153128a90..c19c31a96 100644
---- a/cmake/modules/FindEvdev.cmake
-+++ b/cmake/modules/FindEvdev.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT Evdev_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1)
-
-@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS
- HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
-index fb5f9bc3e..eb56965e0 100644
---- a/cmake/modules/FindSynaptics.cmake
-+++ b/cmake/modules/FindSynaptics.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT Synaptics_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
-
-@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
- HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
-index 1550751ae..5b7af5e79 100644
---- a/cmake/modules/FindXorgLibinput.cmake
-+++ b/cmake/modules/FindXorgLibinput.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT XORGLIBINPUT_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_XORGLIBINPUT xorg-libinput)
-
-@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS
- HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
-
-diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
-index 5248c6d25..9de16dba0 100644
---- a/cmake/modules/FindXorgServer.cmake
-+++ b/cmake/modules/FindXorgServer.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
-
-+if(NOT XORGSERVER_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_XORGSERVER xorg-server)
-
-@@ -39,6 +41,8 @@ find_path(XORGSERVER_INCLUDE_DIRS
- HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
- )
-
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
-
---
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.90.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.90.ebuild
index 327f1070b2..ede2d1e463 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.90.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.90.ebuild
@@ -12,20 +12,8 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-
-# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
-# just for 1 header each. touchpad also uses a header from xorg-server.
-SHA_EVDEV="425ed601"
-SHA_LIBINPUT="e52daf20"
-SHA_SYNAPTICS="383355fa"
-SHA_XSERVER="d511a301"
-XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
-SRC_URI+="
- ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
- ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
- ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
- ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
-"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
@@ -135,22 +123,9 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.18.5-override-include-dirs.patch" # downstream patch
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
)
-src_unpack() {
- kde.org_src_unpack
- mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
- cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
- "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
- cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
- "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
- cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
- "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
- cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
- "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
-}
-
src_prepare() {
ecm_src_prepare
@@ -163,10 +138,10 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package fontconfig Fontconfig)
- -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
- -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
+ -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
)
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild
index 953b594be2..518f80a090 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild
@@ -12,20 +12,8 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-
-# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
-# just for 1 header each. touchpad also uses a header from xorg-server.
-SHA_EVDEV="425ed601"
-SHA_LIBINPUT="e52daf20"
-SHA_SYNAPTICS="383355fa"
-SHA_XSERVER="d511a301"
-XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
-SRC_URI+="
- ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
- ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
- ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
- ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
-"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
@@ -135,22 +123,9 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.18.5-override-include-dirs.patch" # downstream patch
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
)
-src_unpack() {
- kde.org_src_unpack
- mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
- cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
- "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
- cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
- "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
- cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
- "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
- cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
- "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
-}
-
src_prepare() {
ecm_src_prepare
@@ -163,10 +138,10 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package fontconfig Fontconfig)
- -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
- -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
+ -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
)
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index a56f7a6f47..9bef640c13 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -12,20 +12,8 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-
-# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
-# just for 1 header each. touchpad also uses a header from xorg-server.
-SHA_EVDEV="425ed601"
-SHA_LIBINPUT="e52daf20"
-SHA_SYNAPTICS="383355fa"
-SHA_XSERVER="d511a301"
-XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
-SRC_URI+="
- ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
- ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
- ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
- ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
-"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
@@ -135,22 +123,9 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.18.5-override-include-dirs.patch" # downstream patch
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
)
-src_unpack() {
- kde.org_src_unpack
- mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
- cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
- "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
- cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
- "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
- cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
- "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
- cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
- "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
-}
-
src_prepare() {
ecm_src_prepare
@@ -163,10 +138,10 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package fontconfig Fontconfig)
- -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
- -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
+ -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
)
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2020-04-26 21:37 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-04-26 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 794dd1b9408892377b6791e0ecf4a5015bedb2a0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 21:36:07 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 21:37:06 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=794dd1b9
kde-plasma/plasma-desktop: Patch upstreamed
Upstream commit 2e8a98a5110732bbddef778d3ba547fd28a1d576
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 26 ----------------------
.../plasma-desktop-5.18.4.1-r3.ebuild | 2 +-
.../plasma-desktop-5.18.49.9999.ebuild | 2 +-
.../plasma-desktop/plasma-desktop-9999.ebuild | 1 -
4 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch
deleted file mode 100644
index 6987d71ef6..0000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 24 Apr 2020 18:55:30 +0200
-Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
- dir from include
-
----
- kcms/touchpad/backends/x11/synapticstouchpad.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/touchpad/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/backends/x11/synapticstouchpad.cpp
-index d2f41d70b..3eb3171ee 100644
---- a/kcms/touchpad/backends/x11/synapticstouchpad.cpp
-+++ b/kcms/touchpad/backends/x11/synapticstouchpad.cpp
-@@ -53,7 +53,7 @@
-
- #include <stddef.h>
- #include <limits.h>
--#include <xorg/synaptics-properties.h>
-+#include <synaptics-properties.h>
-
- #define SYN_MAX_BUTTONS 12
-
---
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
index c6729eedfe..55899f045b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
@@ -136,7 +136,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
- "${FILESDIR}/${P}-synaptics-header.patch" # TODO upstream
+ "${FILESDIR}/${P}-synaptics-header.patch" # in Plasma/5.19
)
src_unpack() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
index aafdf56ec2..2f9db4b85d 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
@@ -136,7 +136,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
- "${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # TODO upstream
+ "${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
)
src_unpack() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 4ef6e14442..37923f2037 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -136,7 +136,6 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
- "${FILESDIR}/${PN}-5.18.80-synaptics-header.patch" # TODO upstream
)
src_unpack() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2020-04-25 12:58 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-04-25 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 142fb5031705e9d3dfe100c424ca5e8a7eaa4995
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 12:57:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 12:57:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=142fb503
kde-plasma/plasma-desktop: Split override-include-dirs.patch
Files moved around after Plasma/5.18 branching.
Closes: https://bugs.gentoo.org/719328
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ma-desktop-5.18.4.1-override-include-dirs.patch | 28 ----------------------
| 26 ++++++++++++++++++++
| 26 ++++++++++++++++++++
.../plasma-desktop-5.18.4.1-r3.ebuild | 3 ++-
.../plasma-desktop-5.18.49.9999.ebuild | 1 +
.../plasma-desktop/plasma-desktop-9999.ebuild | 1 +
6 files changed, 56 insertions(+), 29 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
index a9205ffc2a..3118913e08 100644
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
@@ -83,31 +83,3 @@ index 1550751ae..5b7af5e79 100644
--
2.26.2
-
-
-From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 24 Apr 2020 18:55:30 +0200
-Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
- dir from include
-
----
- kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-index d2f41d70b..3eb3171ee 100644
---- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-+++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-@@ -53,7 +53,7 @@
-
- #include <stddef.h>
- #include <limits.h>
--#include <xorg/synaptics-properties.h>
-+#include <synaptics-properties.h>
-
- #define SYN_MAX_BUTTONS 12
-
---
-2.26.2
-
--git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
new file mode 100644
index 0000000000..181e89e7db
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
@@ -0,0 +1,26 @@
+From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 24 Apr 2020 18:55:30 +0200
+Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
+ dir from include
+
+---
+ kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+index d2f41d70b..3eb3171ee 100644
+--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
++++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+@@ -53,7 +53,7 @@
+
+ #include <stddef.h>
+ #include <limits.h>
+-#include <xorg/synaptics-properties.h>
++#include <synaptics-properties.h>
+
+ #define SYN_MAX_BUTTONS 12
+
+--
+2.26.2
+
--git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch
new file mode 100644
index 0000000000..6987d71ef6
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.80-synaptics-header.patch
@@ -0,0 +1,26 @@
+From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 24 Apr 2020 18:55:30 +0200
+Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
+ dir from include
+
+---
+ kcms/touchpad/backends/x11/synapticstouchpad.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/touchpad/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/backends/x11/synapticstouchpad.cpp
+index d2f41d70b..3eb3171ee 100644
+--- a/kcms/touchpad/backends/x11/synapticstouchpad.cpp
++++ b/kcms/touchpad/backends/x11/synapticstouchpad.cpp
+@@ -53,7 +53,7 @@
+
+ #include <stddef.h>
+ #include <limits.h>
+-#include <xorg/synaptics-properties.h>
++#include <synaptics-properties.h>
+
+ #define SYN_MAX_BUTTONS 12
+
+--
+2.26.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
index 6e6fa790ec..c6729eedfe 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
@@ -135,7 +135,8 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${P}-synaptics-header.patch" # TODO upstream
)
src_unpack() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
index 74192183d6..aafdf56ec2 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
@@ -136,6 +136,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # TODO upstream
)
src_unpack() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 37923f2037..4ef6e14442 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -136,6 +136,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${PN}-5.18.80-synaptics-header.patch" # TODO upstream
)
src_unpack() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2020-04-24 15:55 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-04-24 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 4ffcb9bb27792af73a780430410c03d9a2b6b93e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 15:53:57 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 15:54:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ffcb9bb
kde-plasma/plasma-desktop: Pull synaptics/xorg-server headers, drop USE touchpad
Add patch to FindSynaptics to override include dir. This makes it possible to
get rid of xf86-input-synaptics dependency only to build Touchpad KCM.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ma-desktop-5.18.4.1-override-include-dirs.patch | 38 +++++++++++++++++++---
kde-plasma/plasma-desktop/metadata.xml | 1 -
...r2.ebuild => plasma-desktop-5.18.4.1-r3.ebuild} | 16 ++++++---
.../plasma-desktop-5.18.49.9999.ebuild | 16 ++++++---
.../plasma-desktop/plasma-desktop-9999.ebuild | 16 ++++++---
5 files changed, 69 insertions(+), 18 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
index 54b8419e98..4a30d92f3f 100644
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
@@ -1,13 +1,19 @@
-From d44a6c8a732c3f82092f3fa3044000f1f8b3a0ec Mon Sep 17 00:00:00 2001
+From b11915786a97f55074b7bfe4eec6f3c5cc08ae78 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] cmake modules: Allow include dir overrides in FindEvdev,
- FindXorgLibinput
+Subject: [PATCH] cmake modules: Allow include dir overrides for various input
+ drivers
+FindEvdev - evdev-properties.h
+FindSynaptics - synaptics-properties.h
+FindXorgLibinput - libinput-properties.h
+
+Hint: Dependency for touchpad (Synaptics): xserver-properties.h (xorg-server)
---
cmake/modules/FindEvdev.cmake | 4 ++++
+ cmake/modules/FindSynaptics.cmake | 4 ++++
cmake/modules/FindXorgLibinput.cmake | 4 ++++
- 2 files changed, 8 insertions(+)
+ 3 files changed, 12 insertions(+)
diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
index 153128a90..c19c31a96 100644
@@ -31,6 +37,28 @@ index 153128a90..c19c31a96 100644
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
+diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
+index fb5f9bc3e..eb56965e0 100644
+--- a/cmake/modules/FindSynaptics.cmake
++++ b/cmake/modules/FindSynaptics.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
++if(NOT Synaptics_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
+
+@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
+ HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
+ )
+
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS)
+
diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
index 1550751ae..5b7af5e79 100644
--- a/cmake/modules/FindXorgLibinput.cmake
@@ -54,5 +82,5 @@ index 1550751ae..5b7af5e79 100644
find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
--
-2.26.0
+2.26.2
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index ad05be8124..49d2b2bec6 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -9,6 +9,5 @@
<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
- <flag name="touchpad">Enable touchpad KCM</flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
similarity index 86%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r2.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
index b48df34661..6e6fa790ec 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
@@ -13,19 +13,24 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
SHA_EVDEV="425ed601"
SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
SRC_URI+="
${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
+ ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
+ ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="~amd64"
-IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -110,7 +115,6 @@ COMMON_DEPEND="
)
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -141,6 +145,10 @@ src_unpack() {
"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
"${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
+ cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+ "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
+ cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+ "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
}
src_prepare() {
@@ -157,9 +165,9 @@ src_configure() {
$(cmake_use_find_package fontconfig Fontconfig)
-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package touchpad Synaptics)
)
if ! use emoji && ! use ibus; then
mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
index 516d269bb9..74192183d6 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
@@ -13,19 +13,24 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
SHA_EVDEV="425ed601"
SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
SRC_URI+="
${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
+ ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
+ ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -110,7 +115,6 @@ COMMON_DEPEND="
)
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -141,6 +145,10 @@ src_unpack() {
"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
"${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
+ cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+ "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
+ cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+ "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
}
src_prepare() {
@@ -157,9 +165,9 @@ src_configure() {
$(cmake_use_find_package fontconfig Fontconfig)
-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package touchpad Synaptics)
)
if ! use emoji && ! use ibus; then
mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index fd31f2ac7b..37923f2037 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -13,19 +13,24 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
-# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
SHA_EVDEV="425ed601"
SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
SRC_URI+="
${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
+ ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
+ ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -110,7 +115,6 @@ COMMON_DEPEND="
)
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- touchpad? ( x11-drivers/xf86-input-synaptics )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -141,6 +145,10 @@ src_unpack() {
"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
"${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
+ cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+ "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
+ cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+ "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
}
src_prepare() {
@@ -157,9 +165,9 @@ src_configure() {
$(cmake_use_find_package fontconfig Fontconfig)
-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+ -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package touchpad Synaptics)
)
if ! use emoji && ! use ibus; then
mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2020-04-08 15:51 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-04-08 15:51 UTC (permalink / raw
To: gentoo-commits
commit: f431f03a9373c22aace77d9f15fba456f46505a9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 5 22:55:11 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 8 15:50:01 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f431f03a
kde-plasma/plasma-desktop: Pull evdev/libinput headers, drop USE mouse
Add patch to FindEvdev and FindXorgLibinput to override include dirs.
This makes it possible to get rid of both xf86-input-libinput but more
importantly xf86-input-evdev dependencies only to build Mouse KCM.
Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ma-desktop-5.18.4.1-override-include-dirs.patch | 58 ++++++++++++++++++++++
kde-plasma/plasma-desktop/metadata.xml | 1 -
.../plasma-desktop-5.18.49.9999.ebuild | 32 +++++++++---
.../plasma-desktop/plasma-desktop-9999.ebuild | 32 +++++++++---
4 files changed, 108 insertions(+), 15 deletions(-)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
new file mode 100644
index 0000000000..54b8419e98
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
@@ -0,0 +1,58 @@
+From d44a6c8a732c3f82092f3fa3044000f1f8b3a0ec Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 6 Apr 2020 00:41:07 +0200
+Subject: [PATCH] cmake modules: Allow include dir overrides in FindEvdev,
+ FindXorgLibinput
+
+---
+ cmake/modules/FindEvdev.cmake | 4 ++++
+ cmake/modules/FindXorgLibinput.cmake | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
+index 153128a90..c19c31a96 100644
+--- a/cmake/modules/FindEvdev.cmake
++++ b/cmake/modules/FindEvdev.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
++if(NOT Evdev_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1)
+
+@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS
+ HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR}
+ )
+
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
+
+diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
+index 1550751ae..5b7af5e79 100644
+--- a/cmake/modules/FindXorgLibinput.cmake
++++ b/cmake/modules/FindXorgLibinput.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
++if(NOT XORGLIBINPUT_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_XORGLIBINPUT xorg-libinput)
+
+@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS
+ HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR}
+ )
+
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
+
+--
+2.26.0
+
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 9b61884e37..ad05be8124 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
- <flag name="mouse">Enable mouse KCM</flag>
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
<flag name="touchpad">Enable touchpad KCM</flag>
</use>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
index 0f09b8a685..7d850cd93e 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild
@@ -13,10 +13,19 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
+# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
+SHA_EVDEV="425ed601"
+SHA_LIBINPUT="e52daf20"
+XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
+SRC_URI+="
+ ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
+ ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
+"
+
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="emoji +fontconfig ibus +mouse scim +semantic-desktop touchpad"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -104,10 +113,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost
x11-base/xorg-proto
fontconfig? ( x11-libs/libXrender )
- mouse? (
- x11-drivers/xf86-input-evdev
- x11-drivers/xf86-input-libinput
- )
"
RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
@@ -122,6 +127,19 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/kdeplasma-addons-5.15.80
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
+)
+
+src_unpack() {
+ kde.org_src_unpack
+ mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
+ cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
+ "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
+ cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
+ "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
+}
+
src_prepare() {
ecm_src_prepare
@@ -134,8 +152,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package mouse Evdev)
- $(cmake_use_find_package mouse XorgLibinput)
+ -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
$(cmake_use_find_package touchpad Synaptics)
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 718317a06d..ec6504cb73 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -13,10 +13,19 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
+# Avoid pulling in xf86-input-{evdev,libinput} DEPEND just for 1 header
+SHA_EVDEV="425ed601"
+SHA_LIBINPUT="e52daf20"
+XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
+SRC_URI+="
+ ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
+ ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
+"
+
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="emoji +fontconfig ibus +mouse scim +semantic-desktop touchpad"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop touchpad"
COMMON_DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -104,10 +113,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost
x11-base/xorg-proto
fontconfig? ( x11-libs/libXrender )
- mouse? (
- x11-drivers/xf86-input-evdev
- x11-drivers/xf86-input-libinput
- )
"
RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
@@ -122,6 +127,19 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/kdeplasma-addons-5.15.80
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
+)
+
+src_unpack() {
+ kde.org_src_unpack
+ mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
+ cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
+ "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
+ cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
+ "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
+}
+
src_prepare() {
ecm_src_prepare
@@ -134,8 +152,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package mouse Evdev)
- $(cmake_use_find_package mouse XorgLibinput)
+ -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
$(cmake_use_find_package scim SCIM)
$(cmake_use_find_package semantic-desktop KF5Baloo)
$(cmake_use_find_package touchpad Synaptics)
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2020-02-13 22:41 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-02-13 22:41 UTC (permalink / raw
To: gentoo-commits
commit: c16e008e12aaba591023d126d9b37eb3db802201
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 22:09:40 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 22:09:40 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c16e008e
kde-plasma/plasma-desktop: Fix Fonts KCM, unlock widgets
See also: https://mail.kde.org/pipermail/plasma-devel/2020-February/111114.html
Can't apply changes in Fonts KCM
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=416358
Unlock Widgets
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=417424
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/plasma-desktop-5.18.0-kcm_fonts.patch | 14 ++
.../plasma-desktop-5.18.0-unlock-widgets.patch | 23 ++++
.../plasma-desktop/plasma-desktop-5.18.0-r1.ebuild | 148 +++++++++++++++++++++
3 files changed, 185 insertions(+)
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch
new file mode 100644
index 0000000000..ec05442bef
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-kcm_fonts.patch
@@ -0,0 +1,14 @@
+diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
+--- a/kcms/fonts/fonts.cpp
++++ b/kcms/fonts/fonts.cpp
+@@ -572,8 +572,8 @@
+ // previews
+ engine()->addImageProvider("preview", new PreviewImageProvider(m_settings->font()));
+
+- // reload state after loading by emiting a settings signal
+- emit m_settings->activeFontChanged();
++ // KCM expect save state to be false at this point (can be true because of setNearestExistingFonts
++ setNeedsSave(false);
+ }
+
+ void KFonts::save()
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch
new file mode 100644
index 0000000000..9ea643b865
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.0-unlock-widgets.patch
@@ -0,0 +1,23 @@
+From 2bc3c5e92d4789146548e8de4d520cd191994e1c Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Tue, 11 Feb 2020 16:41:26 +0100
+Subject: unlock widgets
+
+5.18 doesn't offer a way anymore from the gui
+so unlock them if they're locked
+BUG:417424
+---
+ desktoppackage/contents/updates/unlock_widgets.js | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 desktoppackage/contents/updates/unlock_widgets.js
+
+diff --git a/desktoppackage/contents/updates/unlock_widgets.js b/desktoppackage/contents/updates/unlock_widgets.js
+new file mode 100644
+index 0000000..c332270
+--- /dev/null
++++ b/desktoppackage/contents/updates/unlock_widgets.js
+@@ -0,0 +1,2 @@
++
++__AppInterface.locked = false;
+--
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild
new file mode 100644
index 0000000000..1ade6819cc
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.0-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+ >=kde-frameworks/attica-${KFMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kded-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ >=kde-plasma/kwin-${PVCUT}:5
+ >=kde-plasma/libksysguard-${PVCUT}:5
+ >=kde-plasma/plasma-workspace-${PVCUT}:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ media-libs/phonon[qt5(+)]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbfile
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ ibus? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ app-i18n/ibus
+ dev-libs/glib:2
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+ scim? ( app-i18n/scim )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+ touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
+ mouse? (
+ x11-drivers/xf86-input-evdev
+ x11-drivers/xf86-input-libinput
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+ >=kde-plasma/breeze-${PVCUT}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
+ >=kde-plasma/oxygen-${PVCUT}:5
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ sys-apps/util-linux
+ x11-apps/setxkbmap
+ !<kde-plasma/kdeplasma-addons-5.15.80
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-kcm_fonts.patch" # KDE-Bug #416358
+ "${FILESDIR}/${P}-unlock-widgets.patch" # KDE-Bug #417424
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package fontconfig Fontconfig)
+ $(cmake_use_find_package ibus IBus)
+ $(cmake_use_find_package mouse Evdev)
+ $(cmake_use_find_package mouse XorgLibinput)
+ $(cmake_use_find_package scim SCIM)
+ $(cmake_use_find_package semantic-desktop KF5Baloo)
+ $(cmake_use_find_package touchpad Synaptics)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+ # needs D-Bus, bug #634166
+ local myctestargs=(
+ -j1
+ -E "(foldermodeltest|positionertest|test_kio_fonts)"
+ )
+
+ ecm_src_test
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2015-07-01 20:40 Johannes Huber
0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2015-07-01 20:40 UTC (permalink / raw
To: gentoo-commits
commit: a824ae61a74b6331264609ed65a7e31b3d2458b1
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 1 20:40:54 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 1 20:40:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a824ae61
[kde-plasma/plasma-desktop] Unbreak pkg_configure
Adds a patch in review from upstream
https://git.reviewboard.kde.org/r/124215/
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 insertions(+)
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
new file mode 100644
index 0000000..76b21e0
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.4.0-cmake-xkb.patch
@@ -0,0 +1,78 @@
+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 df144d2..2c6a02b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -122,6 +122,8 @@ 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] 12+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/
@ 2015-01-28 19:51 Johannes Huber
0 siblings, 0 replies; 12+ messages in thread
From: Johannes Huber @ 2015-01-28 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 4150cc5a5283e810f55962364024f9abf58c020a
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 28 19:50:22 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 19:50:47 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4150cc5a
[kde-plasma/plasma-desktop] Drop upstreamed patch
Thanks to Andreas Sturmlechner <andreas.sturmlechner <AT> gmail.com>.
Package-Manager: portage-2.2.15
---
.../files/plasma-desktop-9999-tests-optional.patch | 35 ----------------------
.../plasma-desktop/plasma-desktop-9999.ebuild | 2 --
2 files changed, 37 deletions(-)
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
deleted file mode 100644
index f417286..0000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-9999-tests-optional.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 6701a83..e4f083f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -107,8 +107,6 @@ 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] 12+ messages in thread
end of thread, other threads:[~2024-11-17 20:05 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-07 21:05 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/files/, kde-plasma/plasma-desktop/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-17 20:05 Andreas Sturmlechner
2024-05-20 19:21 Andreas Sturmlechner
2023-12-14 21:24 Andreas Sturmlechner
2020-05-16 22:05 Andreas Sturmlechner
2020-04-26 21:37 Andreas Sturmlechner
2020-04-25 12:58 Andreas Sturmlechner
2020-04-24 15:55 Andreas Sturmlechner
2020-04-08 15:51 Andreas Sturmlechner
2020-02-13 22:41 Andreas Sturmlechner
2015-07-01 20:40 Johannes Huber
2015-01-28 19:51 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox