From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1463391-garchives=archives.gentoo.org@lists.gentoo.org>
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 D4824158020
for <garchives@archives.gentoo.org>; Sat, 3 Dec 2022 10:57:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1C475E0D59;
Sat, 3 Dec 2022 10:57:36 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 04C87E0D59
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Dec 2022 10:57:36 +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 47C53341428
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Dec 2022 10:57:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DB5CF692
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Dec 2022 10:57:33 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1670065046.7f321a3d5b3e5b157baf5beab89fa855d556fb48.asturm@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: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 7f321a3d5b3e5b157baf5beab89fa855d556fb48
X-VCS-Branch: master
Date: Sat, 3 Dec 2022 10:57:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 227256e2-2bb3-4736-8ad2-9019463abc75
X-Archives-Hash: 45740538bb4b52f0471b1c874a37103a
commit: 7f321a3d5b3e5b157baf5beab89fa855d556fb48
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 10:55:56 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 10:57:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f321a3d
kde-apps/umbrello: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/umbrello-20.08.3-no-qtwebkit.patch | 111 ---------------------
1 file changed, 111 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
deleted file mode 100644
index 74a1e9b3e6d4..000000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From eb753a7eb0f49c6ac5b349f81387ca4b4c64342b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 12 Oct 2020 11:46:24 +0200
-Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
- QTextBrowser fallback
-
-Thanks-to: Ralf Habacker <ralf.habacker@freenet.de> for QTextBrowser fallback code.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 7 ++++++-
- umbrello/CMakeLists.txt | 4 +++-
- umbrello/umlappprivate.h | 13 +++++++++++++
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 50b0bd163..8673740cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -102,9 +102,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
- Test
- Widgets
- Xml
-- WebKitWidgets
- )
-
-+find_package(Qt5WebKitWidgets ${QT_MIN_VERSION})
-+if(Qt5WebKitWidgets_FOUND)
-+ add_definitions(-DWEBKIT_WELCOMEPAGE)
-+ set(WEBKIT_WELCOMEPAGE 1)
-+endif()
-+
- # search packages used by KDE
- find_package(KF5 REQUIRED COMPONENTS
- Archive
-diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
-index 4a2168542..fd5ef8fbf 100644
---- a/umbrello/CMakeLists.txt
-+++ b/umbrello/CMakeLists.txt
-@@ -549,7 +549,6 @@ else()
- Qt5::Xml
- Qt5::PrintSupport
- Qt5::Svg
-- Qt5::WebKitWidgets
- KF5::Archive
- KF5::Completion
- KF5::CoreAddons
-@@ -565,6 +564,9 @@ else()
- ${LIBXML2_LIBRARIES}
- codeimport
- )
-+ if(WEBKIT_WELCOMEPAGE)
-+ target_link_libraries(libumbrello Qt5::WebKitWidgets)
-+ endif()
- ecm_add_app_icon(umbrello_SRCS
- ICONS
- ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
-diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
-index 0c832048d..ad425a37f 100644
---- a/umbrello/umlappprivate.h
-+++ b/umbrello/umlappprivate.h
-@@ -37,7 +37,11 @@
- #include <QFileInfo>
- #include <QListWidget>
- #include <QObject>
-+#ifdef WEBKIT_WELCOMEPAGE
- #include <QWebView>
-+#else
-+#include <QTextBrowser>
-+#endif
-
- class QWidget;
-
-@@ -155,6 +159,7 @@ public slots:
- // qDebug() << html;
- welcomeWindow = new QDockWidget(i18n("Welcome"), parent);
- welcomeWindow->setObjectName(QLatin1String("WelcomeDock"));
-+#ifdef WEBKIT_WELCOMEPAGE
- QWebView *view = new QWebView;
- view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
- view->setContextMenuPolicy(Qt::NoContextMenu);
-@@ -162,6 +167,14 @@ public slots:
- view->setHtml(html);
- view->show();
- welcomeWindow->setWidget(view);
-+#else
-+ QTextBrowser *tb = new QTextBrowser(dynamic_cast<QWidget*>(this));
-+ tb->setOpenExternalLinks(true);
-+ tb->setOpenLinks(false);
-+ tb->setHtml(html);
-+ connect(tb, SIGNAL(anchorClicked(const QUrl)), this, SLOT(slotWelcomeWindowLinkClicked(const QUrl)));
-+ welcomeWindow->setWidget(tb);
-+#endif
- 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
-