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

3 files changed, 170 insertions, 0 deletions

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
+}