From 48f3e81fd35a18cd49f8b8d6a041f33ad88f9c89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Feb 2024 05:41:15 +0000 Subject: gentoo auto-resync : 29:02:2024 - 05:41:15 --- kde-apps/parley/Manifest | 1 + .../files/parley-24.02.0-webengine-optional.patch | 161 +++++++++++++++++++++ 2 files changed, 162 insertions(+) create mode 100644 kde-apps/parley/files/parley-24.02.0-webengine-optional.patch (limited to 'kde-apps/parley') diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest index fc83b05104e2..58c69695cc90 100644 --- a/kde-apps/parley/Manifest +++ b/kde-apps/parley/Manifest @@ -1,3 +1,4 @@ +AUX parley-24.02.0-webengine-optional.patch 5079 BLAKE2B a6f782160595d1071e46a4961c89d530b58b44042bc3fe21f9147ac1ffa9c3c96af6ece0ed4b3c2a39c9d0ce68395e594ec874f55b650bc8eb25ef9d82d8e85c SHA512 9593435c67d6de0b1848f2354135c4f5a9dd3410b1a3ef8ab7660c32b7c1cfad373d2c9b7e03f21637f56663cec10cf77cf54fe2e684eedb63fde0b5aeed79d3 DIST parley-23.08.4.tar.xz 8601656 BLAKE2B e6fc25613020615ed4cd6a347179eeebb8061e43a24a78bc21a485e83e44faef351be31cdff0ea77de9ea9e75a71314a8b558b5d928c375531ccbeee5543d396 SHA512 451a248fa796df60a6f5047afdb24e5dc9a4a1fe82ecee4e5a279658b18c3c94c6d0cd9b61a72aa4e015ed890169d929295b73086747825a7e5d6b3418a24c25 DIST parley-23.08.5.tar.xz 8610724 BLAKE2B e486826ea225a66dcc6a7023d9b8903e590b86526af395cda09b36a2d939fc1b0cbc9ea60cde9ecd561783101bb606b8af03dace64070be47268d2fda275f2c4 SHA512 2fa685a2b33fa2487d75380980c302d65dd858afd598a4ce3bd8c95b00120c7cf487b39bed500502ac87ce947b33b12199fcde1b5d3531d3ea69fce81f6015d5 DIST parley-24.02.0.tar.xz 8616768 BLAKE2B 402573dc098f7bdc9114e856c556bd720f9cf90e8b26448f3cdff2989a156514852a0d8ea4d6f8c1f7cafbf5ce5be2c0d16e4e321896e8c510e5c244668355b0 SHA512 8911571c2185986777461d263d790b78e5da613d914fedd0db2083b4ba5a98a95e7efc1a00667f91d37f74b1b9ec338cdf1c8bde68178da4b7eb78639cbbbe07 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 new file mode 100644 index 000000000000..d5a839a90583 --- /dev/null +++ b/kde-apps/parley/files/parley-24.02.0-webengine-optional.patch @@ -0,0 +1,161 @@ +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 + -- cgit v1.2.3