From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B734A158086 for ; Sun, 31 Oct 2021 02:44:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C7E3E092F; Sun, 31 Oct 2021 02:44:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06164E092F for ; Sun, 31 Oct 2021 02:44:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 84731343513 for ; Sun, 31 Oct 2021 02:44:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49492163 for ; Sun, 31 Oct 2021 02:44:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1635648242.8c3e2277df52ef8f701d8c51223c63eb84d33a12.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch X-VCS-Directories: kde-apps/umbrello/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8c3e2277df52ef8f701d8c51223c63eb84d33a12 X-VCS-Branch: master Date: Sun, 31 Oct 2021 02:44:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a2c24d81-9a73-4e91-8e45-d52fa296a99a X-Archives-Hash: 57d0f636fd8888e2aee4640204bf8680 commit: 8c3e2277df52ef8f701d8c51223c63eb84d33a12 Author: James Beddek posteo de> AuthorDate: Sat Oct 30 06:38:38 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 31 02:44:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3e2277 kde-apps/umbrello: fix configure with tests exclude Qt5::WebKitWidgets from unittests CMakeLists.txt Signed-off-by: James Beddek posteo.de> Closes: https://github.com/gentoo/gentoo/pull/22755 Signed-off-by: Sam James gentoo.org> .../files/umbrello-20.08.3-no-qtwebkit.patch | 30 +++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) 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 bf41c2d4098..74a1e9b3e6d 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 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 #include #include @@ -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(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