* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/khtml/files/, kde-frameworks/khtml/
@ 2022-05-04 20:50 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-05-04 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 2be75fd52490576e12226be350bf6a5e802d9d84
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 21:37:04 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 4 20:49:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be75fd5
kde-frameworks/khtml: drop 5.90.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/khtml/Manifest | 1 -
.../files/khtml-5.90.0-fix-crash-in-wayland.patch | 42 -------------
kde-frameworks/khtml/khtml-5.90.0-r1.ebuild | 73 ----------------------
3 files changed, 116 deletions(-)
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index b2e176c1b787..28393106fab9 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,3 +1,2 @@
-DIST khtml-5.90.0.tar.xz 2093520 BLAKE2B dbab7070371c4b426ea5027b69cc928f76b7c52a40c4373c576f568dbf69752914793445cc51b8f73c46fe625c39f9e283cd17551bb72b3266acc6cc552d3b02 SHA512 0292a7497c51a576ae9603cfa3bf49031d9bd2a5ee493be08935bcedf67d75d9a41b06d0a0829e1f08391aafb60c7145859e596885dbd3d40017d1181ee2969d
DIST khtml-5.92.0.tar.xz 2093568 BLAKE2B 1c94b1ee041fe69d173798ade211feada3c9f123fd9a6f6775cf3453ab677f8001053f7785dd492acb81c6908286bebb592eded670771c2dab42a8a9aa58c300 SHA512 270d3ba357ed5c031b41564a56e0d91df87702cd05ea810434a8e2cafd87fbdc0be8984ed535745edf592c318107464f0aaada0c2ef42fbde7a6f87228edfcef
DIST khtml-5.93.0.tar.xz 2094172 BLAKE2B bed3869f2918f27d8bff52eeefba70fd4032296a1ec1c1008749ae73ba4bb3ff5edd53b0693b8590d0c1600d11c99b4bfc933bfa38f70bfa6e187e9d9f120b95 SHA512 019946343bb17d8c9021e6e05632f4f0576cb6e1d1f29c0a8364129e323e6b8283199b21a63e5afcdd09f40a9ad1d396fef4868331745dc310df48484d990bf6
diff --git a/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch b/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch
deleted file mode 100644
index c6ed34998037..000000000000
--- a/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 04aa1739d06d3ff7d16a3296fd27fa392d8ba318 Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Sat, 1 Jan 2022 23:42:16 +0100
-Subject: [PATCH] fix khtml crash in wayland session
-
----
- src/khtmlview.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/khtmlview.cpp b/src/khtmlview.cpp
-index 79f0d7c..75df959 100644
---- a/src/khtmlview.cpp
-+++ b/src/khtmlview.cpp
-@@ -69,6 +69,7 @@
- #include <kstringhandler.h>
- #include <kconfiggroup.h>
- #include <ksharedconfig.h>
-+#include <KWindowSystem>
-
- #include <QBitmap>
- #include <QDialog>
-@@ -1530,7 +1531,8 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse)
-
- if (linkCursor != LINK_NORMAL && isVisible() && hasFocus()) {
- #if HAVE_X11
--
-+ // ensure we don't trigger this code paths if we run in a Wayland session
-+ if (KWindowSystem::isPlatformX11()) {
- if (!d->cursorIconWidget) {
- #if HAVE_X11
- d->cursorIconWidget = new QLabel(nullptr, Qt::X11BypassWindowManagerHint);
-@@ -1572,6 +1574,7 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse)
- //TODO?
- #endif
- d->cursorIconWidget->show();
-+ }
- #endif
- } else if (d->cursorIconWidget) {
- d->cursorIconWidget->hide();
---
-GitLab
-
diff --git a/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild b/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild
deleted file mode 100644
index 783d1f0dab39..000000000000
--- a/kde-frameworks/khtml/khtml-5.90.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.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="X"
-
-BDEPEND="
- dev-lang/perl
- dev-util/gperf
-"
-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
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- =kde-frameworks/sonnet-${PVCUT}*:5
- media-libs/giflib:=
- media-libs/libpng:0=
- >=media-libs/phonon-4.11.0
- sys-libs/zlib
- virtual/jpeg:0
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
- X? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-crash-in-wayland.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/khtml/files/, kde-frameworks/khtml/
@ 2022-08-08 14:40 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-08-08 14:40 UTC (permalink / raw
To: gentoo-commits
commit: b0928beb65bcc0722ba20192ff57572341f15244
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 09:31:31 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 14:39:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0928beb
kde-frameworks/khtml: Fix build with USE -X
Upstream commit 9712a641636bf9b794e1ce3b7ec00534de56faa1
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../khtml/files/khtml-5.96.0-with_x11.patch | 100 +++++++++++++++++++++
kde-frameworks/khtml/khtml-5.96.0-r1.ebuild | 73 +++++++++++++++
2 files changed, 173 insertions(+)
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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-08 14:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-04 20:50 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/khtml/files/, kde-frameworks/khtml/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-08-08 14:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox