gentoo auto-resync : 29:02:2024 - 05:41:15

7 files changed, 166 insertions, 2 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b1737f59db64..0a49a5f47843 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 428cda7e01d6..52ae3753c185 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -3,5 +3,5 @@ DIST akonadi-contacts-23.08.5.tar.xz 420904 BLAKE2B 8292b4ed461826a06884a891501e
 DIST akonadi-contacts-24.02.0.tar.xz 424844 BLAKE2B 7c5c0c77973ab1cd8ca7cb7699994c61d492705e84f625a886c0d6f95406fa5a4bb5f159638eea875f1c8c6951c26d4d887090af09f21e9432d8d864e779470f SHA512 ba4bcf6e3b47d21a01f25562b2f27d87ae82b289d2b4629cd5779b491da474f487b25b791bd8430c898c548dfed9752b9e05f9a80015cdc246845e03286f83b5
 EBUILD akonadi-contacts-23.08.4.ebuild 1254 BLAKE2B 84d26c5273e54f0de5b74d37c943175dd3b9136fa7df01f5545072ffea3e347b3b45bf4d4633e4ce81894562e45d520b5cd44f9eeb80341c8aaf6a08cf08aae1 SHA512 3ffc94f526e0cf7de434f3f8a7bb9ba389872b0d5b26745b2f065a4d4d80839386a8d361e09b29d7be8ca40cdb06dd1953330446749f59cf42b8d0e45a097f97
 EBUILD akonadi-contacts-23.08.5.ebuild 1257 BLAKE2B 3a951c3404c4b313933357b9a5556622a7d02807ce1c69edacbe69654d57c086eaac6039c48ee679d86ebf0b5f147f51ee7df5907a403f9c4dab879f03682a5c SHA512 fd9058ab88b9451a301ad7f32ac9dff8e811f0db80fcde38cc950c4e93c136ae61a57e19f9411744b3bff4c84afb2ed8ad034120df903e3665f08e9360478807
-EBUILD akonadi-contacts-24.02.0.ebuild 1193 BLAKE2B 779241673c0cd77e6b6ddbf9807fccfe7e13c254319b2bc8ce7af4849dcc905181551ab41d6ed3d9f9959b05c266a090e1b242a66e361fe6fc5d34b2271a2482 SHA512 4b0416d76abe1eb358ca02db209ea86c762829d659984a1dd6c291b42f014c480bb1729270e6883ca999e343ac0595ff947515e7ad0744969822c0cd967c3e6a
+EBUILD akonadi-contacts-24.02.0-r1.ebuild 1225 BLAKE2B 53fcf1237c0c8077d3b8d87a60cb07a832f1693959cc6da88ec8dace816b3e68b9efe7adf3ea9662a794fc8171ff854c31fa524c02eedc4bce2eafd60e81a734 SHA512 a8ec40dbf6ee05ce9035cb31ff677fe44e2d7b91e09c6c98b1ebb7d97e6ee1c63049389b8cc8806875b74e377a42cfb3f8c64536e8ce3bef3699a4e5d86094cb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-24.02.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-24.02.0-r1.ebuild
index 5e5b41b90b47..2227966fe564 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-24.02.0.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-24.02.0-r1.ebuild
@@ -21,6 +21,7 @@ IUSE=""
 RESTRICT="test"
 
 RDEPEND="
+	>=dev-libs/ktextaddons-1.5.2:6
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
 	>=kde-apps/akonadi-${PVCUT}:6
 	>=kde-apps/grantleetheme-${PVCUT}:6
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index bc99d042698f..9904aa650d32 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -3,5 +3,5 @@ DIST akonadi-search-23.08.5.tar.xz 110248 BLAKE2B a3a00b36546a91fc4f7d7337f31fa8
 DIST akonadi-search-24.02.0.tar.xz 111252 BLAKE2B 0cb52bec230663599b3682b333c12d3df94f7ed88fa92a684d5f4294aec95b73525c1ec9c3b77b65fe608b40c7ad2ea61af988d982c927abe06f955a23c9203c SHA512 e677458c8351135000f779f9f7aa6378eec739d4966bd3527a0bd14fba1aeb7ebff666e597a33f13cc4cbe258a778c1a8adf6532e8d4fe7c63cadc06382df2b1
 EBUILD akonadi-search-23.08.4.ebuild 1305 BLAKE2B 4fb3cfd2c2b993629b5c67c5d303563f70d9d411d0765d2555448335f68cb4dff6302b5992492e506b3a7768263ec887d95a330de658e11f4ddca83545115e9a SHA512 a8c783b56cb246395bdb54e6411d043b6f4c70a1b4c3f7f86f457f0396836a0921305edc5d15365a14fd771023b050eff071612c2a6f26e8b3e582e520cb65da
 EBUILD akonadi-search-23.08.5.ebuild 1308 BLAKE2B 1c5ab62e75cc33c648eb55a62bb153a9307337813911274ad0b74603405a4b3786cc6b3e560c3e76c1a5b97bb2738d3960eb82ed79075827f97b89ef3962f3fb SHA512 ed4a4766ec109ad4f26b62070b5a801986acf84525ae2b5a037ffa29be4107096c8f19cf0b239dbf32fb1285a0e33af801714d1539765744fb4cea481ddbd8e7
-EBUILD akonadi-search-24.02.0.ebuild 1237 BLAKE2B 5e0e859e5cb15fc2976fb0ee23ed882a125a2d6eae20e2dd0a1de2e214f63f1f663ae1b294b79bc22fcb6c14cdcb674f75cfb1920c2c907e9781cb2810c14b1f SHA512 b226f7be5ba6b5d6d24daece6037ff59a4a180ed43b08ce1ff274089934a91ab100912c5c96e92ffa078385a26e4457acd71423220765e33c87fd191f81e2b45
+EBUILD akonadi-search-24.02.0-r1.ebuild 1269 BLAKE2B a81f6b661296b8b3906c5a977dd99684541083b4bcf52a0a5fe60b988e612cfb0ea4f4630b75c192dbdeb8bc0eb7f8e899eb298b99971e58eac8ba0c06aae851 SHA512 c7a92e6bb8feefbb988b70d108630be0958cb860e4b8ee4e2e1b4c5c30c2a8c16a158023e9e346cf6be459d67b65bf94ab61f0b1cc37dfb383a11465148eff63
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-search/akonadi-search-24.02.0.ebuild b/kde-apps/akonadi-search/akonadi-search-24.02.0-r1.ebuild
index e6de427eb4bd..78a02cae8be6 100644
--- a/kde-apps/akonadi-search/akonadi-search-24.02.0.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-24.02.0-r1.ebuild
@@ -21,6 +21,7 @@ IUSE=""
 RESTRICT="test" # perpetually broken, bug 662378
 
 RDEPEND="
+	>=dev-libs/ktextaddons-1.5.2:6
 	>=dev-libs/xapian-1.3:=[chert(+)]
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
 	>=kde-apps/akonadi-${PVCUT}:6
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 <cordlandwehr@kde.org>
+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 <cordlandwehr@kde.org>
++
++#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 <config-parley.h>
+ 
+@@ -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
+