[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/khtml/, kde-frameworks/khtml/files/

[Andreas Sturmlechner]

commit:     0418f562b97bfa9f4004526ab4f09a3379b54da7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:14:06 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:20:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0418f562

kde-frameworks/khtml: drop 5.96.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/khtml/Manifest                      |   1 -
 .../khtml/files/khtml-5.96.0-with_x11.patch        | 100 ---------------------
 kde-frameworks/khtml/khtml-5.96.0-r1.ebuild        |  73 ---------------
 3 files changed, 174 deletions(-)

diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 9f982dc5f9f6..d65c06f52625 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,3 +1,2 @@
 DIST khtml-5.100.0.tar.xz 4030332 BLAKE2B b3019d9b5f64741b404ac82435df45e77091361109a7391b32bb30248cabd6d5c3bb73fe7ded9a3e13fb9574a5e61e0dfe30ecae1d5a9bea1114030b2a3f32c5 SHA512 12a27f52d88db46b5bda575dc3d5669513fc8a9063e828657afa0abe70b0bcfa9c82d9da492399c47de86750c550f440c09a7986d40f1b25b8fe31307d8615b0
-DIST khtml-5.96.0.tar.xz 1965056 BLAKE2B 857a338c9831a03989348ecd6d9c355d6538458311eb22ccc2ae1c631137a7dd411866c70632f941d2ae64bd54584283b90e9bb0cf6573f6504d6ceab0cb01f5 SHA512 7ccd0c8dbca62486b316f381c437568650696cc4fca0b2e382bf8d337435f9c7fc7fa4664e01bbe8db509bd293c23ebb4abaabc34719be38e91480ae0b1d4141
 DIST khtml-5.99.0.tar.xz 1964536 BLAKE2B 995f84f321fca9694074178e0881f819f21f625da36346bb09a1e53906abb5e9f4ad39ecf358409c6d49a5ebb25906c31c94780b30ac5cfdc2eb02c3c0964455 SHA512 ebb3d5b28ea66a73a535b757385fe48647528b4ac5bdec6a02c952b5678cab0a1f21129ff98c5c4353c54ccd4fa30d760053734b3fca3f21e50edf6860965b6f

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
deleted file mode 100644
index fb75eaa49cb3..000000000000
--- a/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 9712a641636bf9b794e1ce3b7ec00534de56faa1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-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@g.o>
----
- 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
deleted file mode 100644
index fe5e4869c9eb..000000000000
--- a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
-}