diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-04-05 05:24:13 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-05 05:24:13 +0100 |
commit | 6de28447d66e6c47ee682740b840cdb67244d4b1 (patch) | |
tree | 382b94d5f61bc727e86d8d8df99540eb1da88953 /kde-apps/konqueror | |
parent | 3b4ca161c9d7f5a66a93191da2c9ec02dbdde1b7 (diff) |
gentoo auto-resync : 05:04:2023 - 05:24:13
Diffstat (limited to 'kde-apps/konqueror')
-rw-r--r-- | kde-apps/konqueror/Manifest | 3 | ||||
-rw-r--r-- | kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch | 126 | ||||
-rw-r--r-- | kde-apps/konqueror/konqueror-22.08.3.ebuild | 92 |
3 files changed, 0 insertions, 221 deletions
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest index 79335e078ce7..87368652e73c 100644 --- a/kde-apps/konqueror/Manifest +++ b/kde-apps/konqueror/Manifest @@ -1,6 +1,3 @@ -AUX konqueror-22.04.3-without_x11.patch 3888 BLAKE2B 8311104ac6157badc858daff7d9e28e577ed49327e3ed20544146964cc9f7c109b5e74b2022216f0fd43269b77d17bbb762a20f3f609d294f38e61c84249b256 SHA512 25a3495bef4402eb83ebb8625348eb51b29d224f302f7048163bdf51b15e6c802aa4acf88cdc809654104264c63269e3adc2f6ef54c0e8b7a69ce4f6f2248a07 -DIST konqueror-22.08.3.tar.xz 7667060 BLAKE2B 929026d6d0c012864f6b3c2c50ded24762c0e72c8a624c5ea45436c78c7f34d762521fdf4282b436fc6471bb327593fb6e48097c0d5efd71dcb6b785e71b5cac SHA512 0ea80da0f72dcd6d5d5e8996243f66f38d1c6413261c9206dffe0869fa1c6d09cf90081b16b5b7d792fc30e8c3cf3258c553bbcb6eb2c8d47dfdb3aa334dd11d DIST konqueror-22.12.3.tar.xz 8494652 BLAKE2B 539079411548936dd132ba89cdea8771000ec52d007655cfef3a4f36b98f4b47dfe7e9702fd1c691ffb7bb3dc9c3312a49ecd6e3662b0a15bbc4b77be05e4616 SHA512 fa765e20d188864dc3569133e8d86c1c8ef4938d28d25d312a3e6814a41370a75b199565402a77a3869aef6c813cf8be24ba38d0d2a9ba83d0da0a95fc192441 -EBUILD konqueror-22.08.3.ebuild 2604 BLAKE2B 8492e05f5920f4ebf25b9d1d16c7fce70aa507e36e558c2fdc3c7b13acd01009cb324cc23b63742fdc45410b41bf214ba956655f47cc2a950db744ecc484be7a SHA512 afd20b9395a24a21284f63e9b1c73852cabbff1867d9aacd9564500f0c3b3352f3d2172ffaf8920bcde9dab0a7ac134390195b1fefd1ba664cf7d08085abe7cf EBUILD konqueror-22.12.3.ebuild 2546 BLAKE2B 0951ed998df1f69f26031bf2efd0ae7383d7f926cf0b8b703d00b9c7fa7658c9aae75100fc4fa1badc4360c3a58dceac657a16171ff6c6cd91cb4c3a4761956a SHA512 ebf16f442e05f1452d239662d2aaea517a9d0d8b4f790db9f8d3d31a9be7442549af83955e503a1c15c299c7e7065660661e027d477675d86a7c1587725f26de MISC metadata.xml 507 BLAKE2B 77685a065aa0ade094a8fce571997ccb451cb980a00c178cbca51068dfc907d646272e316e7d2d0e193d47c0ed185e29e2415fccfb29773906fcdf5a7b74ee62 SHA512 62e29c44e16f9d88083e1d89d7fd100700d95424862e894f6cd84a8c983641914e254d29e642b664f916e45106e14a09af1ad6d24e1b328bbf57dd8f331c058a diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch b/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch deleted file mode 100644 index ff1de8680e69..000000000000 --- a/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 503557c54c6162970072f31cb84b0eb934d409d4 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 31 Jul 2022 14:47:48 +0200 -Subject: [PATCH 1/2] Drop unused X11 dependency - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 8 ++------ - src/CMakeLists.txt | 4 ---- - 2 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 838197be7..d9218ae06 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,12 +47,8 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0") - add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH) - endif() - --find_package(X11) --set(KONQ_HAVE_X11 ${X11_FOUND}) -- --if (X11_FOUND) -- find_package(Qt5 REQUIRED X11Extras) --endif(X11_FOUND) -+find_package(Qt5X11Extras) -+set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND}) - - add_definitions( - -DQT_USE_QSTRINGBUILDER -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9a1343e04..286bc7da8 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -113,10 +113,6 @@ target_link_libraries(kdeinit_konqueror - KF5::SonnetUi - ) - --if (X11_FOUND) -- target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES}) --endif () -- - if (KActivities_FOUND) - target_link_libraries(kdeinit_konqueror KF5::Activities) - endif (KActivities_FOUND) --- -2.35.1 - - -From ff0e19961f8345faea54e4f85057312b7ad7007d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 27 Nov 2021 14:36:20 +0100 -Subject: [PATCH 2/2] Add CMake option to build WITHOUT_X11 - -We want to be able to build without X11 support even if some of the -used libraries may not work w/o Qt5X11Extras themselves yet or need -to be built with X11 support for other reverse dependencies. - -KONQ_HAVE_X11 already exists and is set automagically so far, but -using -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras will break if any -dependencies list Qt5X11Extras as required in their cmake config. - -Introducing this option means there is no behavior change by default, -cmake will just skip finding Qt5X11Extras or adding unwanted features -if the option is enabled. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 7 +++++-- - client/CMakeLists.txt | 4 ++-- - src/CMakeLists.txt | 4 ++-- - 3 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d9218ae06..71bc03ecb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,8 +47,11 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0") - add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH) - endif() - --find_package(Qt5X11Extras) --set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND}) -+option(WITHOUT_X11 "Build without X11 integration (skips finding Qt5X11Extras)" OFF) -+if(NOT WITHOUT_X11) -+ find_package(Qt5X11Extras) -+ set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND}) -+endif() - - add_definitions( - -DQT_USE_QSTRINGBUILDER -diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 24aedb14c..3c32c86f3 100644 ---- a/client/CMakeLists.txt -+++ b/client/CMakeLists.txt -@@ -30,9 +30,9 @@ if (WIN32) - else (WIN32) - kf5_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS}) - target_link_libraries(kdeinit_kfmclient ${kfmclient_LIBS}) -- if(X11_FOUND) -+ if(KONQ_HAVE_X11) - target_link_libraries(kdeinit_kfmclient Qt5::X11Extras) -- endif(X11_FOUND) -+ endif() - install(TARGETS kdeinit_kfmclient ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) - endif (WIN32) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 286bc7da8..500b9750c 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate - KF5::KIOGui - ) - --if(X11_FOUND) -+if(KONQ_HAVE_X11) - target_link_libraries(konquerorprivate Qt5::X11Extras) --endif(X11_FOUND) -+endif() - - - set_target_properties(konquerorprivate PROPERTIES VERSION ${KONQUEROR_LIB_VERSION} SOVERSION "5" ) --- -2.35.1 - diff --git a/kde-apps/konqueror/konqueror-22.08.3.ebuild b/kde-apps/konqueror/konqueror-22.08.3.ebuild deleted file mode 100644 index bb42e6cbd277..000000000000 --- a/kde-apps/konqueror/konqueror-22.08.3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=5.96.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit flag-o-matic ecm gear.kde.org optfeature - -DESCRIPTION="Web browser and file manager based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/konqueror/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~x86" -IUSE="activities speech X" - -# 4 of 4 tests fail. Last checked for 4.0.3 -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtscript-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdesu-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - sys-libs/zlib - speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) -" -DEPEND="${COMMON_DEPEND} - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) -" -RDEPEND="${COMMON_DEPEND} - kde-apps/kfind:5 - kde-plasma/kde-cli-tools:5 -" - -PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) - -src_prepare() { - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc - - ecm_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 634122 - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package speech Qt5TextToSpeech) - -DWITHOUT_X11=$(usex !X) - ) - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT} - optfeature "filemanager component" kde-apps/dolphin:${SLOT} - optfeature "SVG support" kde-apps/svg:${SLOT} - optfeature "Java support on webpages" virtual/jre - fi - ecm_pkg_postinst -} |