summaryrefslogtreecommitdiff
path: root/kde-frameworks
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/Manifest.gzbin13714 -> 13717 bytes
-rw-r--r--kde-frameworks/khtml/Manifest2
-rw-r--r--kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch100
-rw-r--r--kde-frameworks/khtml/khtml-5.96.0-r1.ebuild73
-rw-r--r--kde-frameworks/kinit/Manifest2
-rw-r--r--kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch72
-rw-r--r--kde-frameworks/kinit/kinit-5.96.0-r1.ebuild51
-rw-r--r--kde-frameworks/kio/Manifest2
-rw-r--r--kde-frameworks/kio/files/kio-5.96.0-with_x11.patch72
-rw-r--r--kde-frameworks/kio/kio-5.96.0-r3.ebuild96
10 files changed, 470 insertions, 0 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index bad588cc21b6..acba020cf574 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
Binary files differ
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 956408489e79..e0d74e7ceeb8 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,3 +1,5 @@
+AUX khtml-5.96.0-with_x11.patch 3371 BLAKE2B 4e4d8bcbdeb6d99b185400831a15fe77c81c54da98c82d5c922b194a8fd50b4a8eac2d814db9b61928bee553764a9e56a64550e0b3974a07e345c5b5f85ae3a0 SHA512 5ca257ec36652ba273afbb7baff2412357ef0bec047b3894152f18b4712ded3981f602cac4ed09229ba568fe9a24d6d5579a155bb636984015b5c465bf8a4953
DIST khtml-5.96.0.tar.xz 1965056 BLAKE2B 857a338c9831a03989348ecd6d9c355d6538458311eb22ccc2ae1c631137a7dd411866c70632f941d2ae64bd54584283b90e9bb0cf6573f6504d6ceab0cb01f5 SHA512 7ccd0c8dbca62486b316f381c437568650696cc4fca0b2e382bf8d337435f9c7fc7fa4664e01bbe8db509bd293c23ebb4abaabc34719be38e91480ae0b1d4141
+EBUILD khtml-5.96.0-r1.ebuild 1833 BLAKE2B 4f03daa22eec283c2cfde056d5872f5d2fa148447200e71b73727c624af7a95ca59489cf151aa608154f01d47268640796192131b1bcea12c2794f14d0745029 SHA512 e9f20679ce5be9ca4af304258b68fa3b3d1fc804a8eae6df74dcb782472a9d1a25934e2e49fc0feba7270b7615df2a2569885959476c2bbe4b6bd00af5bb3b9e
EBUILD khtml-5.96.0.ebuild 1790 BLAKE2B 765c616050c5c7217c075108e4c7dc2fb5afa2ca31fd9a5e49363d035841f249d4eccebd3644f50c23f2571af6f9a8e9516da7d03c6259da486fb2d089282077 SHA512 3a77aa609b50c48560cd610da34189ced45385d72e6d5377410758e5997ff6d3c29acbe69eb6223b4b82769eba2390b8d752d113a8a69f8a74c731fb336464d4
MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch b/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch
new file mode 100644
index 000000000000..fb75eaa49cb3
--- /dev/null
+++ b/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch
@@ -0,0 +1,100 @@
+From 9712a641636bf9b794e1ce3b7ec00534de56faa1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 6 Aug 2022 11:03:35 +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 | 14 +++++++-------
+ src/CMakeLists.txt | 5 ++---
+ tests/CMakeLists.txt | 4 ++--
+ 3 files changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bca3622..700a0a7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,9 +60,13 @@ set_package_properties(Perl PROPERTIES
+ PURPOSE "Required for generating JS bindings for elements"
+ )
+
+-if(NOT APPLE)
+- find_package(X11)
+- set(HAVE_X11 ${X11_FOUND})
++if(NOT WIN32 AND NOT APPLE)
++ option(WITH_X11 "Build with X11 integration" ON)
++ if(WITH_X11)
++ find_package(X11 REQUIRED)
++ set(HAVE_X11 1)
++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
++ endif()
+ endif()
+
+ find_package(Phonon4Qt5 4.6.60)
+@@ -94,10 +98,6 @@ set_package_properties(PNG PROPERTIES DESCRIPTION "PNG decoding library"
+ PURPOSE "Required for decoding and displaying PNG images"
+ )
+
+-if(NOT WIN32 AND NOT APPLE AND X11_FOUND)
+- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+-endif()
+-
+ find_package(Gperf REQUIRED)
+
+ # remove definitions set by KDEFrameworkCompilerSettings which we fail to meet
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 573fa88..14b2e73 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -592,7 +592,6 @@ target_link_libraries(KF5KHtml
+ ${JPEG_LIBRARIES}
+ ${GIF_LIBRARIES}
+ ${PNG_LIBRARIES}
+- ${X11_LIBRARIES}
+ Qt5::PrintSupport
+ KF5::Archive
+ KF5::SonnetCore
+@@ -604,8 +603,8 @@ target_link_libraries(KF5KHtml
+ KF5::Bookmarks
+ KF5::KIOWidgets # KUrlRequester
+ )
+-if(NOT WIN32 AND NOT APPLE AND X11_FOUND)
+- target_link_libraries(KF5KHtml PRIVATE Qt5::X11Extras)
++if(NOT WIN32 AND NOT APPLE AND HAVE_X11)
++ target_link_libraries(KF5KHtml PRIVATE ${X11_LIBRARIES} Qt5::X11Extras)
+ endif()
+
+ if (KJS_DEBUGGER)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index ae079ae..b6347d7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include(ECMMarkAsTest)
+
+-if(NOT WIN32 AND NOT APPLE AND X11_FOUND)
++if(NOT WIN32 AND NOT APPLE AND HAVE_X11)
+ find_package(Qt5X11Extras "${REQUIRED_QT_VERSION}" CONFIG REQUIRED)
+ set_package_properties(Qt5X11Extras PROPERTIES PURPOSE "Required for tests")
+ endif()
+@@ -79,7 +79,7 @@ endif()
+
+ # Note that testregression can't be compiled by default, it needs private Qt headers.
+ # See also BUILDING-TESTREGRESSION
+-if (KHTML_BUILD_TESTREGRESSION)
++if (KHTML_BUILD_TESTREGRESSION AND HAVE_X11)
+
+ set(testregression_SRCS
+ test_regression.cpp
+--
+GitLab
+
diff --git a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild b/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
new file mode 100644
index 000000000000..9bce8c63dca7
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RDEPEND="
+ dev-libs/openssl:0
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kcodecs-${PVCUT}*:5
+ =kde-frameworks/kcompletion-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kglobalaccel-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kio-${PVCUT}*:5
+ =kde-frameworks/kjobwidgets-${PVCUT}*:5
+ =kde-frameworks/kjs-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kparts-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5
+ =kde-frameworks/kwallet-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ =kde-frameworks/sonnet-${PVCUT}*:5
+ media-libs/giflib:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:0=
+ >=media-libs/phonon-4.11.0
+ sys-libs/zlib
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+ dev-lang/perl
+ dev-util/gperf
+"
+
+PATCHES=( "${FILESDIR}/${P}-with_x11.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
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
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index e0c05ddc3f1d..5f14d90e565b 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,5 +1,7 @@
AUX kio-5.96.0-fix-RAW-file-image-preview.patch 1439 BLAKE2B e987ab2493674d99c24e485f295b3229c852cf35c505b370b7b3603b1e1894a4514978ee8b6cf3edb135c4f0025ab9a1f5fd939ec448a95ce4602ea89087a91e SHA512 b71376b9fd5774037c7d434a248a3c50856e9de60c9b9e547e322e9bced4ee9d9dff3764b7dc0768b597790868545397f2288a5bd2d6fe33f15b009feffac405
AUX kio-5.96.0-fix-crash-in-dropjob.patch 1568 BLAKE2B 91837508cbcdb278a1b38747beccb9d61f99ca0424558264c422240f83d461c3977f5a9dda365305a4fc0a3c71d523ba55d95ea34dc4d12e9761ea8406809d10 SHA512 9a39c65a9603b73b0aacd51063d28d217a4e0bec26d6c1945e890a39f90c0375cfa5dedd7354326bc6f9a7527663de2ecb4940941d28175af28a0c7bc5f4b0e0
+AUX kio-5.96.0-with_x11.patch 2626 BLAKE2B 22fe308b5238b54627c52e6ef927ffe8a3300a9086e04e91c4bd44c6dba9d7b09ee402877f0d45f08f685504f40fa426ddbb9f542274ee698aae191ac72a7b13 SHA512 4c54455ce672f7841a536d87ebf339187bda6db5e4c7ae876f3ff86a7d0e337c9de04be3ee09c81cbbe8d01eab4111819e8ab29b4cafa11f3cbcedd9e64ccce7
DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3
EBUILD kio-5.96.0-r2.ebuild 2573 BLAKE2B 6eb6fa383b03f464fd5f6c9770a3bcdc7ef5b40c73d1e843efa3ab1549a0873219456e9b96438f310dca2329932149de6bcec85ccd19e5a1419defb6b7d1a700 SHA512 5f4107e0cd22bde707c2793964c926a7b7ac1051f3e22c3d6052231e546004b8ac0be3b2f236225014b305d3396a0faf059b6abb98d1aa8d100699df494bf304
+EBUILD kio-5.96.0-r3.ebuild 2614 BLAKE2B f6a3442675712a78b764ecdd9310bfc6b575a131a0ea14f5aae4b7bbf84dbcc16f040f628bec1476e638a1750fd71f79e47374cd578b67ebda0f88e789f9ef11 SHA512 85a541d71b24e47e2158b4583a1171c2c57261d8ed614f8d5b5d52defc3e6aa212c83e13884b4f04f5d7d97cbc19987db3ffd0b56134eeeb2141ea3c5a8c76ab
MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch
new file mode 100644
index 000000000000..9f87ec989af1
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch
@@ -0,0 +1,72 @@
+From c7a277e6810b74b7f664b029573beab592932421 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 1 Aug 2022 22:10:02 +0200
+Subject: [PATCH] Drop obsolete X11 dependency, introduce WITH_X11 option
+ instead
+
+This will only determine whether to search for Qt5X11Extras and then
+set HAVE_X11 accordingly. This is a behavior change as previously it was
+silently disabled if X11 was not found.
+
+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.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 19 +++++++++----------
+ src/ioslaves/http/CMakeLists.txt | 3 ---
+ 2 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95b5db299..c3372f7ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,17 +117,16 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of
+ PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used"
+ )
+
+-if (NOT APPLE AND NOT WIN32)
+- find_package(X11)
+-endif()
+-
+-set(HAVE_X11 ${X11_FOUND})
+-if (HAVE_X11)
+- if (QT_MAJOR_VERSION STREQUAL "5")
+- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+- else()
+- # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above
++if (NOT APPLE AND NOT WIN32 AND NOT ANDROID)
++ option(WITH_X11 "Build with X11 integration" ON)
++ if(WITH_X11)
++ if (QT_MAJOR_VERSION STREQUAL "5")
++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
++ else()
++ # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above
++ endif()
+ endif()
++ set(HAVE_X11 ${WITH_X11})
+ endif()
+
+ find_package(ACL)
+diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt
+index 4fbddb4a3..689f63dd8 100644
+--- a/src/ioslaves/http/CMakeLists.txt
++++ b/src/ioslaves/http/CMakeLists.txt
+@@ -3,9 +3,6 @@ include(ECMMarkNonGuiExecutable)
+ include(ConfigureChecks.cmake)
+ configure_file(config-kioslave-http.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h )
+
+-find_package(X11)
+-set(HAVE_X11 ${X11_FOUND})
+-
+ if(GSSAPI_FOUND)
+ set(HAVE_LIBGSSAPI 1)
+ if(GSSAPI_FLAVOR STREQUAL "MIT")
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.96.0-r3.ebuild b/kde-frameworks/kio/kio-5.96.0-r3.ebuild
new file mode 100644
index 000000000000..0a3ca54a7735
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.96.0-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/kauth-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kbookmarks-${PVCUT}*:5
+ =kde-frameworks/kcodecs-${PVCUT}*:5
+ =kde-frameworks/kcompletion-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kcrash-${PVCUT}*:5
+ =kde-frameworks/kdbusaddons-${PVCUT}*:5
+ =kde-frameworks/kguiaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kjobwidgets-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ =kde-frameworks/solid-${PVCUT}*:5
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+ X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ test? ( sys-libs/zlib )
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-crash-in-dropjob.patch" # KDE-bug 454747
+ "${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480
+ # Approved upstream: https://invent.kde.org/frameworks/kio/-/merge_requests/943
+ "${FILESDIR}/${P}-with_x11.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 18:41:07 +0000