From c650f7cf611feaa59620fd8626e78108fa3b5e51 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 Oct 2022 19:38:57 +0100 Subject: gentoo auto-resync : 11:10:2022 - 19:38:57 --- kde-plasma/drkonqi/Manifest | 4 + kde-plasma/drkonqi/drkonqi-5.26.0.ebuild | 63 +++++++++++ .../drkonqi/files/drkonqi-5.25.90-unused-dep.patch | 115 +++++++++++++++++++++ 3 files changed, 182 insertions(+) create mode 100644 kde-plasma/drkonqi/drkonqi-5.26.0.ebuild create mode 100644 kde-plasma/drkonqi/files/drkonqi-5.25.90-unused-dep.patch (limited to 'kde-plasma/drkonqi') diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest index c9688b2c9f48..683754c161ed 100644 --- a/kde-plasma/drkonqi/Manifest +++ b/kde-plasma/drkonqi/Manifest @@ -1,3 +1,7 @@ +AUX drkonqi-5.25.90-unused-dep.patch 3631 BLAKE2B 1978a7b653a90537849ca3141106464fddbfcf9d0d5bd838ca0794fa195440f51c27ac4cd1820cfc3bf803884d75fe5821843d7b62fd60f808531549d391bf6d SHA512 988b46e797426972d9e98fd62cc5b74da5550f9cb3367913b9cf5c8c160d73a138c99adafd1e14e5ae99dc9329956486610159588eb6baca4258e13b9d4534b1 DIST drkonqi-5.25.5.tar.xz 495252 BLAKE2B 1c445ba55c133723569f3d91839cc3b10bba81352a308329185bca21d975651b151057e77d6233bf8c25675b8670325621c10bcbe576c219e78d458d747d348b SHA512 71c450f057e6e8390849249a9c4deabc88eccb8d33ebe1b9cd3311e910d81584594c956c167035f2da6d162cd24a5fb6192d4a7019189e085f1c8ee5dfcf1d73 +DIST drkonqi-5.26.0-revert-add-sentry-support.patch.xz 11656 BLAKE2B dd35a147bc22b5af9e37c61f5013db6f2018154ecdcccd0c6463f55242ed9dbbe71f0268f8b0fa75b835f400403aaecbc2d2a6e1de434276acd2cc3a31ff6611 SHA512 417f760469854f5822af82fd9eecbb653f81c37465ae8704df1cf6e344ed072d26eeb60f809bb95e64e019a10d71ea77b3e7d98530e62f5c5a63fb1b8319b33a +DIST drkonqi-5.26.0.tar.xz 505600 BLAKE2B bb1090b63ae8fa4407d16ee00bb20d6e7a30b3230a2355822150c0b10b16c3ab242fdd3a0d7a8259d03f9eb56ea28dde425e44fbe5008853846dd4b89430bfd5 SHA512 158231fc87737765d0a2f62cefb524cef9a02469d0df25383ac44b2058b5869998a139d0e31d6f4cb3adaa9827f46a74cbe722ec361e65650bd6aab726db037f EBUILD drkonqi-5.25.5.ebuild 1466 BLAKE2B e035db636b1be56b6c3da18b6f540b45503c4c59c5b67810eb52d3bbe4934fe45c1031a8485d0572b725158b58aea43cf4b48452778a51d9c111b83b1ba9b7cc SHA512 95cd9e6007b28ef38f6b51fbe416546ceb00ad6ffe4fe83eb4abe60efb37992f3f635435f08181e9be64685bcfbfff05a6c96138aa60e55f9f42bf2d457573a8 +EBUILD drkonqi-5.26.0.ebuild 1626 BLAKE2B cae6268fba0139730531ed93394bf9f8771a8e3a6befd864150ded55cdc3b05eaeca790bd690449f6d143df7eae767a2eaf8ae4826c538d6002f0cbaf97c33f1 SHA512 d1fecdc97ad398883818885648fa8881c0a3e14e5cfc9e476b48479ba4dfe89347fc97b9bc897edbf5d2e7ff9708e1df6247c2ef26be7b557311d69ff3fad668 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild new file mode 100644 index 000000000000..85dd047cbb11 --- /dev/null +++ b/kde-plasma/drkonqi/drkonqi-5.26.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.99.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.5 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.26.0-revert-add-sentry-support.patch.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + || ( + sys-devel/gdb + dev-util/lldb + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.25.90-unused-dep.patch" # git master + "${WORKDIR}/${P}-revert-add-sentry-support.patch" # bug 871759 +) + +src_test() { + # needs network access, bug #698510 + local myctestargs=( + -E "(connectiontest)" + ) + ecm_src_test +} diff --git a/kde-plasma/drkonqi/files/drkonqi-5.25.90-unused-dep.patch b/kde-plasma/drkonqi/files/drkonqi-5.25.90-unused-dep.patch new file mode 100644 index 000000000000..896d3468832e --- /dev/null +++ b/kde-plasma/drkonqi/files/drkonqi-5.25.90-unused-dep.patch @@ -0,0 +1,115 @@ +From ef22aade1ae5299367b5cfb4d828c8849839caf2 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Sat, 17 Sep 2022 15:51:41 +0200 +Subject: [PATCH] Port away from deprecated KDeclarative::setupEngine + +We do not need this, because we neither do network requests from QML +and also do not use the "image://icon" icon provider that is set up by this method. +--- + .kde-ci.yml | 1 - + CMakeLists.txt | 1 - + src/CMakeLists.txt | 2 +- + src/coredump/gui/CMakeLists.txt | 1 - + src/coredump/gui/main.cpp | 2 -- + src/drkonqidialog.cpp | 2 -- + 6 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/.kde-ci.yml b/.kde-ci.yml +index 93680ef6..83a819f3 100644 +--- a/.kde-ci.yml ++++ b/.kde-ci.yml +@@ -11,7 +11,6 @@ Dependencies: + 'frameworks/kconfig': '@latest' + 'frameworks/kcoreaddons': '@latest' + 'frameworks/kcrash': '@latest' +- 'frameworks/kdeclarative': '@latest' + 'frameworks/ki18n': '@latest' + 'frameworks/kidletime': '@latest' + 'frameworks/kio': '@latest' +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7d22ee73..92fa795b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,7 +44,6 @@ find_package( + CoreAddons + Config + Service +- Declarative + JobWidgets + KIO + Crash +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index fb03182b..112d97f7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -95,6 +95,7 @@ target_link_libraries( + KF5::WindowSystem + Qt::DBus + Qt::Concurrent ++ Qt::Qml + KF5::WidgetsAddons + KF5::Wallet + KF5::Notifications # for status notifier +@@ -102,7 +103,6 @@ target_link_libraries( + KF5::SyntaxHighlighting # Backtrace Highlighting + drkonqi_backtrace_parser + qbugzilla +- KF5::Declarative + KUserFeedbackCore + ) + +diff --git a/src/coredump/gui/CMakeLists.txt b/src/coredump/gui/CMakeLists.txt +index f9eebfa9..8c964e1a 100644 +--- a/src/coredump/gui/CMakeLists.txt ++++ b/src/coredump/gui/CMakeLists.txt +@@ -8,7 +8,6 @@ target_compile_definitions(drkonqi-coredump-gui + + target_link_libraries(drkonqi-coredump-gui + DrKonqiInternal +- KF5::Declarative + Qt::Quick + KF5::I18n + drkonqi-coredump +diff --git a/src/coredump/gui/main.cpp b/src/coredump/gui/main.cpp +index 8d5b479a..03164572 100644 +--- a/src/coredump/gui/main.cpp ++++ b/src/coredump/gui/main.cpp +@@ -10,7 +10,6 @@ + + #include + #include +-#include + #include + + #include +@@ -53,7 +52,6 @@ int main(int argc, char *argv[]) + + QQmlApplicationEngine engine; + engine.rootContext()->setContextObject(&i18nContext); +- KDeclarative::KDeclarative::setupEngine(&engine); + + const QUrl url(QStringLiteral("qrc:/main.qml")); + QObject::connect( +diff --git a/src/drkonqidialog.cpp b/src/drkonqidialog.cpp +index e93521c0..78b9d09e 100644 +--- a/src/drkonqidialog.cpp ++++ b/src/drkonqidialog.cpp +@@ -9,7 +9,6 @@ + + #include "drkonqidialog.h" + +-#include + #include + #include + +@@ -57,7 +56,6 @@ void DrKonqiDialog::show() + static auto l10nContext = new KLocalizedContext(engine); + l10nContext->setTranslationDomain(QStringLiteral(TRANSLATION_DOMAIN)); + engine->rootContext()->setContextObject(l10nContext); +- KDeclarative::KDeclarative::setupEngine(engine); + + qmlRegisterType("org.kde.drkonqi", 1, 0, "Bugzilla"); + qmlRegisterType("org.kde.drkonqi", 1, 0, "DuplicateModel"); +-- +GitLab + -- cgit v1.2.3