From 42d100735379ec54a77539383203e971a7ab8440 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Mar 2024 19:00:45 +0000 Subject: gentoo auto-resync : 21:03:2024 - 19:00:45 --- kde-apps/parley/Manifest | 5 +- .../files/parley-24.02.0-webengine-optional.patch | 161 --------------------- kde-apps/parley/parley-24.02.0.ebuild | 67 --------- kde-apps/parley/parley-24.02.1.ebuild | 65 +++++++++ 4 files changed, 67 insertions(+), 231 deletions(-) delete mode 100644 kde-apps/parley/files/parley-24.02.0-webengine-optional.patch delete mode 100644 kde-apps/parley/parley-24.02.0.ebuild create mode 100644 kde-apps/parley/parley-24.02.1.ebuild (limited to 'kde-apps/parley') diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest index 60ead603ac32..56fbf6d8b6a2 100644 --- a/kde-apps/parley/Manifest +++ b/kde-apps/parley/Manifest @@ -1,6 +1,5 @@ -AUX parley-24.02.0-webengine-optional.patch 5079 BLAKE2B a6f782160595d1071e46a4961c89d530b58b44042bc3fe21f9147ac1ffa9c3c96af6ece0ed4b3c2a39c9d0ce68395e594ec874f55b650bc8eb25ef9d82d8e85c SHA512 9593435c67d6de0b1848f2354135c4f5a9dd3410b1a3ef8ab7660c32b7c1cfad373d2c9b7e03f21637f56663cec10cf77cf54fe2e684eedb63fde0b5aeed79d3 DIST parley-23.08.5.tar.xz 8610724 BLAKE2B e486826ea225a66dcc6a7023d9b8903e590b86526af395cda09b36a2d939fc1b0cbc9ea60cde9ecd561783101bb606b8af03dace64070be47268d2fda275f2c4 SHA512 2fa685a2b33fa2487d75380980c302d65dd858afd598a4ce3bd8c95b00120c7cf487b39bed500502ac87ce947b33b12199fcde1b5d3531d3ea69fce81f6015d5 -DIST parley-24.02.0.tar.xz 8616768 BLAKE2B 402573dc098f7bdc9114e856c556bd720f9cf90e8b26448f3cdff2989a156514852a0d8ea4d6f8c1f7cafbf5ce5be2c0d16e4e321896e8c510e5c244668355b0 SHA512 8911571c2185986777461d263d790b78e5da613d914fedd0db2083b4ba5a98a95e7efc1a00667f91d37f74b1b9ec338cdf1c8bde68178da4b7eb78639cbbbe07 +DIST parley-24.02.1.tar.xz 8617016 BLAKE2B 6d29209345787b83c49b83569a0d35a6d562c56bae922af1ed6208c2688c2a6ee1d40118c7079194de7d58c35f75c747d96cf97998a92fb9a2524f6d453e0b11 SHA512 8b53749ed2be771c9f8b58d00176b0747f2b4dcd07ab655d1df84b37fde4269e3ba55b170a6038e1453d08f32ec2b52bb003f5991ef104eea760032197e63eda EBUILD parley-23.08.5.ebuild 1555 BLAKE2B c8c381ba1c1dbeb7ffda02eb275bdcfd41a540d147d0675092d2f742a87ac6204e5d9f8cb493dddcd6b60fe7e461babea8abcb4488a8fc0414b93c6ac79c01ac SHA512 f915187cb5033899c9f142b47220f989585936151c6a2e4bcfa0449200dad9629e0e1a29031daecaa1a7b3f5744c9c295026555adff29bca8b8ebf5e923a7c9f -EBUILD parley-24.02.0.ebuild 1670 BLAKE2B 7223f121d6e0847ae8ac4322e8a7decd22d4946146d9e6df12c99eefe65afddfcfeb37dc2375d23880b04eacea0dddd67731437cec482696d470d6df1b5e890e SHA512 37108fe26d402dc032833d29e737f6bb60415fa56a3c11b9b67ab7f779db2d09dd35547da6888b6d034f70ec5619e2ca3ac722431db8cea38a9ed09e4ce5ddfe +EBUILD parley-24.02.1.ebuild 1615 BLAKE2B 891237634e63199c608e5d4f33cd425453ee4c0f2401e94eb512c352f7da76f5a911f531a5de7f6390e074fb9399682c172a363b1e4b7295b898aa01f997a443 SHA512 3fe8c5cd2fbea098b0fa32c2bc45c0d1d28cf03d5b58d5ece73b0727d861f2d329473a5757242bf51b114decfc693473909a1e60d9e8f162106f3ae191d2af47 MISC metadata.xml 446 BLAKE2B c39085c0d8382fcc7c9f833be1072c16787297c17700c46cc8a85c58e25fcd7ac58433223ef98f31a6ba125521cfa69f37bffe0234f7eb9405ae96cbbf5d82f3 SHA512 b9fa5147e800934b6efcb5580d6610b9a1591c13194a1a9f325b96b34b4deb0bf7ef35b462dbd3a074248cad7de6cd9c2fa86faf01f4830e6401bf451c1e27f3 diff --git a/kde-apps/parley/files/parley-24.02.0-webengine-optional.patch b/kde-apps/parley/files/parley-24.02.0-webengine-optional.patch deleted file mode 100644 index d5a839a90583..000000000000 --- a/kde-apps/parley/files/parley-24.02.0-webengine-optional.patch +++ /dev/null @@ -1,161 +0,0 @@ -From e45b4a51f7fd17d3ecc0cc73a014280646f810c8 Mon Sep 17 00:00:00 2001 -From: Andreas Cord-Landwehr -Date: Sun, 18 Feb 2024 09:37:10 +0100 -Subject: [PATCH] Provide option to disable browser integration - -The web browser integration is only used for a small feature in the -editor part and pulls in a very big dependency via webengine that -sometimes is not wanted. - -(cherry picked from commit 8b66372fec610b1d7470e6b2dda80fce4fc6c530) ---- - CMakeLists.txt | 6 +++++- - src/CMakeLists.txt | 22 ++++++++++++++++++---- - src/browserintegration.h.in | 4 ++++ - src/editor/editor.cpp | 5 +++++ - 4 files changed, 32 insertions(+), 5 deletions(-) - create mode 100644 src/browserintegration.h.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a2624488..db8c5a1d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,13 +30,17 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - add_definitions(-DQT_NO_FOREACH) - add_definitions(-DKNEWSTUFFWIDGETS_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055A00) - -+option(BUILD_BROWSERINTEGRATION "Build integration for accessing the Internet (requires QtWebengine)" ON) -+ - find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED - Core - Svg - Concurrent - Multimedia -- WebEngineWidgets - ) -+if (BUILD_BROWSERINTEGRATION) -+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED WebEngineWidgets) -+endif() - - find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} MODULE REQUIRED COMPONENTS - DocTools #to produce the docbook -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index bf1e66ad..bac3ce7b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -4,6 +4,8 @@ add_subdirectory( settings ) - # This library is used both by parley itself and the unit tests. - add_library(parley_LIB STATIC) - -+configure_file(browserintegration.h.in browserintegration.h @ONLY) -+ - target_sources(parley_LIB PRIVATE - collection/collection.cpp - collection/collection.h -@@ -43,8 +45,6 @@ target_sources(parley_LIB PRIVATE - dashboard/gradereferencewidget.h - editor/audiowidget.cpp - editor/audiowidget.h -- editor/browserwidget.cpp -- editor/browserwidget.h - editor/comparisonwidget.cpp - editor/comparisonwidget.h - editor/conjugationwidget.cpp -@@ -194,6 +194,12 @@ target_sources(parley_LIB PRIVATE - utils.cpp - utils.h - ) -+if (BUILD_BROWSERINTEGRATION) -+ target_sources(parley_LIB PRIVATE -+ editor/browserwidget.cpp -+ editor/browserwidget.h -+ ) -+endif() - - ki18n_wrap_ui(parley_LIB - collection/entryfilterdialog.ui -@@ -204,7 +210,6 @@ ki18n_wrap_ui(parley_LIB - editor/imagechooserwidget.ui - editor/audiowidget.ui - editor/synonymwidget.ui -- editor/browserwidget.ui - editor/summarywordwidget.ui - editor/latexwidget.ui - practice/practicesummarywidget.ui -@@ -228,6 +233,11 @@ ki18n_wrap_ui(parley_LIB - statistics/statisticsmainwindow.ui - dashboard/dashboard.ui - ) -+if (BUILD_BROWSERINTEGRATION) -+ ki18n_wrap_ui(parley_LIB -+ editor/browserwidget.ui -+ ) -+endif() - - kconfig_add_kcfg_files(parley_LIB - settings/prefs.kcfgc -@@ -298,8 +308,12 @@ target_link_libraries(parley_LIB - Qt${QT_MAJOR_VERSION}::Widgets - Qt${QT_MAJOR_VERSION}::Concurrent - Qt${QT_MAJOR_VERSION}::Multimedia -- Qt${QT_MAJOR_VERSION}::WebEngineWidgets - ) -+if (BUILD_BROWSERINTEGRATION) -+ target_link_libraries(parley_LIB -+ Qt${QT_MAJOR_VERSION}::WebEngineWidgets -+ ) -+endif() - - add_executable(parley - main.cpp -diff --git a/src/browserintegration.h.in b/src/browserintegration.h.in -new file mode 100644 -index 00000000..2b350055 ---- /dev/null -+++ b/src/browserintegration.h.in -@@ -0,0 +1,4 @@ -+// SPDX-License-Identifier: MIT -+// SPDX-FileCopyrightText: Andreas Cord-Landwehr -+ -+#cmakedefine BUILD_BROWSERINTEGRATION -diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp -index 65d3146b..8a087c48 100644 ---- a/src/editor/editor.cpp -+++ b/src/editor/editor.cpp -@@ -7,6 +7,7 @@ - */ - - #include "editor.h" -+#include "browserintegration.h" - - #include - -@@ -24,7 +25,9 @@ - #include "wordtypeview.h" - - #include "audiowidget.h" -+#ifdef BUILD_BROWSERINTEGRATION - #include "browserwidget.h" -+#endif - #include "comparisonwidget.h" - #include "imagechooserwidget.h" - #include "inflectionwidget.h" -@@ -321,6 +324,7 @@ void EditorWindow::initDockWidgets() - m_mainWindow->tabifyDockWidget(imageDock, audioDock); - - // browser -+#ifdef BUILD_BROWSERINTEGRATION - QDockWidget *browserDock = new QDockWidget(i18n("Internet"), this); - browserDock->setObjectName(QStringLiteral("BrowserDock")); - BrowserWidget *htmlPart = new BrowserWidget(browserDock); -@@ -334,6 +338,7 @@ void EditorWindow::initDockWidgets() - browserDock->setVisible(false); - connect(m_vocabularyView, &VocabularyView::translationChanged, htmlPart, &BrowserWidget::setTranslation); - m_mainWindow->tabifyDockWidget(summaryDock, browserDock); -+#endif - - // LaTeX - QDockWidget *latexDock = new QDockWidget(i18n("LaTeX"), this); --- -2.44.0 - diff --git a/kde-apps/parley/parley-24.02.0.ebuild b/kde-apps/parley/parley-24.02.0.ebuild deleted file mode 100644 index 6f9537ebe1a1..000000000000 --- a/kde-apps/parley/parley-24.02.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_HANDBOOK_DIR="docs" -PVCUT=$(ver_cut 1-3) -KFMIN=6.0 -QTMIN=6.6.2 -inherit ecm gear.kde.org optfeature - -DESCRIPTION="Vocabulary trainer to help you memorize things" -HOMEPAGE="https://apps.kde.org/parley/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64" -IUSE="webengine" - -DEPEND=" - app-i18n/translate-shell - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,widgets] - >=dev-qt/qtmultimedia-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=kde-apps/libkeduvocdocument-${PVCUT}:6 - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/knewstuff-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/ktextwidgets-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/sonnet-${KFMIN}:6 - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] ) -" -RDEPEND="${DEPEND} - >=kde-apps/kdeedu-data-${PVCUT}:* -" - -PATCHES=( "${FILESDIR}/${P}-webengine-optional.patch" ) - -src_prepare() { - ecm_src_prepare - cmake_comment_add_subdirectory plugins -} - -src_configure() { - local mycmakeargs=( - -DBUILD_BROWSERINTEGRATION=$(usex webengine) - ) - - ecm_src_configure -} - -pkg_postinst() { - optfeature "online access to translations" app-i18n/translate-shell - ecm_pkg_postinst -} diff --git a/kde-apps/parley/parley-24.02.1.ebuild b/kde-apps/parley/parley-24.02.1.ebuild new file mode 100644 index 000000000000..10c37249627b --- /dev/null +++ b/kde-apps/parley/parley-24.02.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_HANDBOOK_DIR="docs" +PVCUT=$(ver_cut 1-3) +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org optfeature + +DESCRIPTION="Vocabulary trainer to help you memorize things" +HOMEPAGE="https://apps.kde.org/parley/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="webengine" + +DEPEND=" + app-i18n/translate-shell + dev-libs/libxml2:2 + dev-libs/libxslt + >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,widgets] + >=dev-qt/qtmultimedia-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-apps/libkeduvocdocument-${PVCUT}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] ) +" +RDEPEND="${DEPEND} + >=kde-apps/kdeedu-data-${PVCUT}:* +" + +src_prepare() { + ecm_src_prepare + cmake_comment_add_subdirectory plugins +} + +src_configure() { + local mycmakeargs=( + -DBUILD_BROWSERINTEGRATION=$(usex webengine) + ) + + ecm_src_configure +} + +pkg_postinst() { + optfeature "online access to translations" app-i18n/translate-shell + ecm_pkg_postinst +} -- cgit v1.2.3