gentoo resync : 03.11.2021

3 files changed, 22 insertions, 10 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index a8c443ff947b..40631922a9b7 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 0793552d0c81..be3dec2bf8d9 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 AUX umbrello-20.08.3-gentoo-docbundledir.patch 1990 BLAKE2B c629fa51a4d701576e2c5bc870d8368851773687b93309a02986f2cd3140089c435a2964edafd1be930796906295bc8ef1477ba8c9837f560f986ed07ae19358 SHA512 9635b33d0aa612eebbbed37f82812b5f1ea8edcc6bfd0a8749e667cbc718d3ed56568397a6db43838a84f04085682dcd5c3a8a272b92bd9ee9a84de30a2f2d40
-AUX umbrello-20.08.3-no-qtwebkit.patch 3168 BLAKE2B f3908ac2755b70b611182b9b92bf8d08124d11bc0bc690d2c49bb40fd498ab9a0cdb55b0dbac54d0a355c322ac65ba611c48d4a11a27d498ede1f3f3f251ca43 SHA512 6437226d9d3970f6ac8e9b0a53546470e2235021a3e1d4d3339202ba1107259f26ef817760635f40a4cf3ff581f301f49a665c22ef1f070236885ef25bfb24a0
+AUX umbrello-20.08.3-no-qtwebkit.patch 3512 BLAKE2B ae1f25f42c75f061c52f2f9316d88337153c81d20ca407dacdf786d7d343b5fa1207216c3ccb761321648cdcfc7785ddc77161fe6e471014cc36438e002c5486 SHA512 f03b54ee66d10dd51cb9b1a8a9affc0c832501ac0f40377c7357999649fecb05374f6227cd43bfff069900dfc94f9c6ee507e42188a826ed9f675dab39e77225
 DIST umbrello-21.04.3.tar.xz 5650032 BLAKE2B b306695798eb2791968b9b4ad98b34825c8712800fbf2a87a2f6398768cf9bcee1e94dd1efa8d513f2cb8f07f683ee880c8e655236d88b96c3c1bcc98929af6d SHA512 f4f632bf37f4170ebf6c1d776b70b058ded1c8a1a9626adea1c9b63e7d7cf45c0afaf77c4c9bf778c601265b9d819f5a898813ac32b58bcf29d7ab94c753d73d
 DIST umbrello-21.08.2.tar.xz 5650252 BLAKE2B a67d35bca086f26e343629eab2431a615bebf3a6d5a2990ff856ba42b0368862881576ca7ea511d571a74eba3b04b37747569677b817f5ce41f84d542ec2adb5 SHA512 90498caf980cd468b307c7e206621933a03402109fb1dd9b30f9a76cb86bb64993fc8eb4b3dc17fff63bf1e72d16ba4e0f0065fa3c97a0b42065b2470d6035b1
 EBUILD umbrello-21.04.3.ebuild 2049 BLAKE2B e7e686a565b1634e293cbd11a7f3258b446b659f1b86cf454ff4dc27329f61ef89a75f95d4932bdd5ecd2ba8ad5eb12d40b956e7602496ebdeb5bdeff88f2f25 SHA512 e24fe915980530b28a9b296fa1401856807732920b811b3fbc30048ea8302dfd5723c3a46b991aacd60e97c95ec2a239e7acf07a3731152d11318566c519e263
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
index bf41c2d40980..74a1e9b3e6d4 100644
--- a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
@@ -14,10 +14,10 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
  3 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 398415f09..7144f0990 100644
+index 50b0bd163..8673740cc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -95,9 +95,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+@@ -102,9 +102,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
      Test
      Widgets
      Xml
@@ -34,10 +34,10 @@ index 398415f09..7144f0990 100644
  find_package(KF5 REQUIRED COMPONENTS
      Archive
 diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
-index 264b25fde..f3286ae46 100644
+index 4a2168542..fd5ef8fbf 100644
 --- a/umbrello/CMakeLists.txt
 +++ b/umbrello/CMakeLists.txt
-@@ -549,7 +551,6 @@ else()
+@@ -549,7 +549,6 @@ else()
          Qt5::Xml
          Qt5::PrintSupport
          Qt5::Svg
@@ -45,7 +45,7 @@ index 264b25fde..f3286ae46 100644
          KF5::Archive
          KF5::Completion
          KF5::CoreAddons
-@@ -565,6 +566,9 @@ else()
+@@ -565,6 +564,9 @@ else()
          ${LIBXML2_LIBRARIES}
          codeimport
      )
@@ -56,10 +56,10 @@ index 264b25fde..f3286ae46 100644
          ICONS
          ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
 diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
-index a85de1f22..a7212cc8d 100644
+index 0c832048d..ad425a37f 100644
 --- a/umbrello/umlappprivate.h
 +++ b/umbrello/umlappprivate.h
-@@ -42,7 +42,11 @@
+@@ -37,7 +37,11 @@
  #include <QFileInfo>
  #include <QListWidget>
  #include <QObject>
@@ -71,7 +71,7 @@ index a85de1f22..a7212cc8d 100644
  
  class QWidget;
  
-@@ -160,6 +164,7 @@ public slots:
+@@ -155,6 +159,7 @@ public slots:
          // qDebug() << html;
          welcomeWindow = new QDockWidget(i18n("Welcome"), parent);
          welcomeWindow->setObjectName(QLatin1String("WelcomeDock"));
@@ -79,7 +79,7 @@ index a85de1f22..a7212cc8d 100644
          QWebView *view = new QWebView;
          view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
          view->setContextMenuPolicy(Qt::NoContextMenu);
-@@ -167,6 +172,14 @@ public slots:
+@@ -162,6 +167,14 @@ public slots:
          view->setHtml(html);
          view->show();
          welcomeWindow->setWidget(view);
@@ -94,6 +94,18 @@ index a85de1f22..a7212cc8d 100644
          parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
  
          viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
+diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
+index 26bd4b870..9dadb484a 100644
+--- a/unittests/CMakeLists.txt
++++ b/unittests/CMakeLists.txt
+@@ -59,7 +59,6 @@ else()
+         Qt5::Xml
+         Qt5::Test
+         Qt5::Widgets
+-        Qt5::WebKitWidgets
+         KF5::I18n
+         KF5::Crash
+         ${LIBXML2_LIBRARIES}
 -- 
 2.29.2