diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-03 14:59:59 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-03 14:59:59 +0000 |
commit | 529abfa74a08ae5099db9780bcdf8250aa52ecb6 (patch) | |
tree | 2e2d1a9fd6e89b4872499afea3dc57490271e69c /kde-apps/konqueror | |
parent | e6ba529df30e3fc9dfdf55ec5797f2f764df6e54 (diff) |
gentoo auto-resync : 03:12:2022 - 14:59:58
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-with_x11.patch | 83 | ||||
-rw-r--r-- | kde-apps/konqueror/konqueror-22.04.3.ebuild | 92 |
3 files changed, 0 insertions, 178 deletions
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest index 7ce6ddd8ffe9..94beeababceb 100644 --- a/kde-apps/konqueror/Manifest +++ b/kde-apps/konqueror/Manifest @@ -1,7 +1,4 @@ -AUX konqueror-22.04.3-with_x11.patch 2326 BLAKE2B 086f7ce20655021f52dc66aac3480c6c322516a28c49d41646c88bace0c9ac67178e852c2aad42e061b28ef72fc578478c2939668b4d1f8f9b0e91ae70e6e1c0 SHA512 433d8ac2bf5f6f6eab211d68637c2aec503c03211827b2f461a029d9410675938c41626612b6f4889ca78d2e2b12785a6da98c61942a1656ba9bfb26d9a455a3 AUX konqueror-22.04.3-without_x11.patch 3888 BLAKE2B 8311104ac6157badc858daff7d9e28e577ed49327e3ed20544146964cc9f7c109b5e74b2022216f0fd43269b77d17bbb762a20f3f609d294f38e61c84249b256 SHA512 25a3495bef4402eb83ebb8625348eb51b29d224f302f7048163bdf51b15e6c802aa4acf88cdc809654104264c63269e3adc2f6ef54c0e8b7a69ce4f6f2248a07 -DIST konqueror-22.04.3.tar.xz 7669364 BLAKE2B 9778cdb920854e6f76fad5fc8717263beaa3869ada35b96be68db5234a102f3a3b60f76d0171bff73136001b10114f6a2fce6b79eb6caf17f8be21679da10bd9 SHA512 e64115a083dddbe6a66c8cfdeb0b081d52068ae877cf51b09d8573e0ba87cb3665421175d915b51f6532be5199e9667f11fe5dd8c0765c4f434b9a65f218a2c6 DIST konqueror-22.08.3.tar.xz 7667060 BLAKE2B 929026d6d0c012864f6b3c2c50ded24762c0e72c8a624c5ea45436c78c7f34d762521fdf4282b436fc6471bb327593fb6e48097c0d5efd71dcb6b785e71b5cac SHA512 0ea80da0f72dcd6d5d5e8996243f66f38d1c6413261c9206dffe0869fa1c6d09cf90081b16b5b7d792fc30e8c3cf3258c553bbcb6eb2c8d47dfdb3aa334dd11d -EBUILD konqueror-22.04.3.ebuild 2587 BLAKE2B 402df4f36dd1f41ab9b233dce1d68cd0797590f6d5e73db8ff218c843b3eeee5c8791b64e07c9f45f24060b4fed7224f24e3f825ee6643cf07f0b86135571559 SHA512 ec5ac65805e241d4b955fea1f6645b842cfa31d51cb739b4c1776ca6545f0842b7df6fd9b9dba8ad82be3620582e6518366704deb80978f612afc8501d0af4fc EBUILD konqueror-22.08.3.ebuild 2603 BLAKE2B 42b3a2faef2c5602b6a14352089247b2184776408df7b5444fe3e05a4a68b61bb9c8fdbf9c7580fc505530501f342cea5b36d16c450936c934bd48668a009c64 SHA512 a0c7acfb1d81a974e9edde119e09d4fc4f6080496a8c45a11b4fac1d792106cd5f5c26feec7ceeddd3a9a684912104a143d4641eed58a88b74b1b19ade2ff4ce MISC metadata.xml 507 BLAKE2B 77685a065aa0ade094a8fce571997ccb451cb980a00c178cbca51068dfc907d646272e316e7d2d0e193d47c0ed185e29e2415fccfb29773906fcdf5a7b74ee62 SHA512 62e29c44e16f9d88083e1d89d7fd100700d95424862e894f6cd84a8c983641914e254d29e642b664f916e45106e14a09af1ad6d24e1b328bbf57dd8f331c058a diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch b/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch deleted file mode 100644 index 90273b072f0e..000000000000 --- a/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 69c2186c1a6c4fc0bf7f13b571b581e5f6157063 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 27 Nov 2021 14:36:20 +0100 -Subject: [PATCH] Add CMake option to build without X11 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 16 ++++++++++------ - client/CMakeLists.txt | 4 ++-- - src/CMakeLists.txt | 6 +++--- - 3 files changed, 15 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 77f5ea645..488ee7dc4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,12 +46,16 @@ 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) -+if (NOT WIN32) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if (WITH_X11) -+ find_package(X11 REQUIRED) -+ find_package(Qt5X11Extras NO_MODULE REQUIRED) -+ set(KONQ_HAVE_X11 TRUE) -+ endif() -+else() -+ set(WITH_X11 OFF) -+endif() - - add_definitions( - -DQT_USE_QSTRINGBUILDER -diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 24aedb14c..51d2b44d0 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(WITH_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 2113e1c2f..07e64d90f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate - KF5::KIOGui - ) - --if(X11_FOUND) -+if(WITH_X11) - target_link_libraries(konquerorprivate Qt5::X11Extras) --endif(X11_FOUND) -+endif() - - - set_target_properties(konquerorprivate PROPERTIES VERSION ${KONQUEROR_LIB_VERSION} SOVERSION "5" ) -@@ -113,7 +113,7 @@ target_link_libraries(kdeinit_konqueror - KF5::SonnetUi - ) - --if (X11_FOUND) -+if (WITH_X11) - target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES}) - endif () - --- -2.34.1 - diff --git a/kde-apps/konqueror/konqueror-22.04.3.ebuild b/kde-apps/konqueror/konqueror-22.04.3.ebuild deleted file mode 100644 index 05c5705662e8..000000000000 --- a/kde-apps/konqueror/konqueror-22.04.3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=5.92.0 -QTMIN=5.15.4 -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}/${P}-with_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) - -DWITH_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 -} |