gentoo auto-resync : 08:08:2022 - 20:14:39

3 files changed, 125 insertions, 0 deletions

diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index b4f982734a70..ffb14da29eb3 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,3 +1,5 @@
+AUX kinit-5.96.0-with_x11.patch 2306 BLAKE2B ec443e5351d1fd727ccb4ba212a19dac96db7934bf59850590566f00a4713fee37cdfa30e676df01c7f7c72ee87d717b121e7613472f965baf1b29a3a298ea57 SHA512 dfc82d59a925503a586c2229581b754b26baf7ffec0614da32c60dbb0ed14a9107a323ba57d2a545ffbcc38d06d38a3f22bf4a6ef7538f05caa343c844946880
 DIST kinit-5.96.0.tar.xz 119408 BLAKE2B 7372a85d89e1344e1205035fd1bd643b88619ccb487667cb7f41b64b59046253e8afcb053e51e5093c31a86a8ee7bb71c8c1b9b9fdca342612d0a9ba024c4fb6 SHA512 e3f2a8fc3a4487baa1ecc60ac86e6322b9b15a1cc0fdda288eba9cf9fce387fb299435a689abeaef8570e22c9f5fdd646021409a72aa37653e28e37c8a230e7d
+EBUILD kinit-5.96.0-r1.ebuild 1245 BLAKE2B e87fb2d8a69bad77a6470578e6814e1d8209f3cd750f3d009b0c2c4d42d8aba2277b59e8248ea3b6d723ddf0cad1d309d10fafb7770b1c87869e4c3cc5614f26 SHA512 f50453ad216e05330350d296f2ff821efee9057b7a84f361e74ba75a3aaa8474f94261bdc7c7f3a78fe513b721ed5d2727494aff9f9e4c02304a92eac3a6001f
 EBUILD kinit-5.96.0.ebuild 1159 BLAKE2B 6561c5868b8cf8d539ea07bf0fff51535560c1066aa03507b5dde5962afeac486ac844b56a96253c61a4120ef8d15638655635105e9b52dac22b54bc3db7076c SHA512 d1cf2d85ecaa690437f1df43205dc051fb888bf3e674f0b7b91d0d09d44cd45500b453d699642b854018185f54477582ed40d03cb7f00c06f95142597d18358e
 MISC metadata.xml 565 BLAKE2B 8e740127ae95b251e2e5cdf63fc19fb605cf5ef42e631b54e0ef300e8f21f04e288527c4628500c076e884da4b3017d041b1b45ff9a6680e72585a43caa452a4 SHA512 0efe6998f185b5a5aca504a041b3e5fc1ef8da0a4f9eaf2398ef9533054d9de27ae50c9e940001b24e69958d2ead67ab829304d8e322404cb19fda0c904e952d
diff --git a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch b/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch
new file mode 100644
index 000000000000..fd6efe2fae00
--- /dev/null
+++ b/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch
@@ -0,0 +1,72 @@
+From 85ca4b6515ac2539fb31b74db6fe5ceae1590be1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 2 Aug 2022 00:19:19 +0200
+Subject: [PATCH] Add CMake option to build WITH_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config. This is a behavior change as previously
+it was silently disabled if X11 was not found.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt             | 15 +++++++++------
+ src/kdeinit/CMakeLists.txt |  4 ++--
+ 2 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90baa57..e27c41f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,13 +30,16 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KINIT
+ 
+ #optional features
+ if (NOT APPLE)
+-    find_package(X11)
++    option(WITH_X11 "Build with X11 integration" ON)
++    if(WITH_X11)
++        find_package(X11 REQUIRED)
++        set(HAVE_X11 1)
++
++        find_package(XCB MODULE COMPONENTS XCB)
++        set_package_properties(XCB PROPERTIES TYPE OPTIONAL)
++        set(HAVE_XCB ${XCB_XCB_FOUND})
++    endif()
+ endif()
+-set(HAVE_X11 ${X11_FOUND})
+-
+-find_package(XCB MODULE COMPONENTS XCB)
+-set_package_properties(XCB PROPERTIES TYPE OPTIONAL)
+-set(HAVE_XCB ${XCB_XCB_FOUND})
+ 
+ # used by 4 executables in this module
+ if(HAVE_SOCKET_LIBRARY)
+diff --git a/src/kdeinit/CMakeLists.txt b/src/kdeinit/CMakeLists.txt
+index af84a14..3fcbd1c 100644
+--- a/src/kdeinit/CMakeLists.txt
++++ b/src/kdeinit/CMakeLists.txt
+@@ -38,7 +38,7 @@ target_compile_definitions(kdeinit5 PRIVATE
+     KDE_INSTALL_FULL_LIBEXECDIR_KF5="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}"
+ )
+ 
+-if (X11_FOUND)
++if (HAVE_X11)
+   target_link_libraries(kdeinit5 ${X11_X11_LIB})
+ endif()
+ 
+@@ -63,7 +63,7 @@ if (NOT WIN32)
+ 
+   target_link_libraries(kdeinit5_wrapper  ${KINIT_SOCKET_LIBRARY} Qt5::Core KF5::DBusAddons)
+ 
+-  if (NOT X11_FOUND)
++  if (NOT HAVE_X11)
+     target_compile_definitions(kdeinit5_wrapper PRIVATE -DNO_DISPLAY)
+   endif ()
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
new file mode 100644
index 000000000000..986e68c5fce6
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Helper library to speed up start of applications on KDE workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+caps +man X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
+	caps? ( sys-libs/libcap )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+# Approved upstream: https://invent.kde.org/frameworks/kinit/-/merge_requests/13
+PATCHES=( "${FILESDIR}/${P}-with_x11.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package man KF5DocTools)
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}