From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- .../umbrello-20.08.3-gentoo-docbundledir.patch | 41 +++++++++ .../files/umbrello-20.08.3-no-qtwebkit.patch | 99 ++++++++++++++++++++++ .../umbrello-20.08.3-unbundle-kdevelop-php.patch | 92 ++++++++++++++++++++ .../files/umbrello-20.08.3-unused-qtwebkit.patch | 25 ++++++ 4 files changed, 257 insertions(+) create mode 100644 kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch create mode 100644 kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch create mode 100644 kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch create mode 100644 kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch (limited to 'kde-apps/umbrello/files') diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch new file mode 100644 index 000000000000..e3915379be2a --- /dev/null +++ b/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch @@ -0,0 +1,41 @@ +From 29186bb3c1c3e4de89d77340db966c660789cdab Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 5 Nov 2020 14:39:51 +0100 +Subject: [PATCH] Fix hardcoded docbook install paths for Gentoo + +Gentoo sets KDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help". + +Signed-off-by: Andreas Sturmlechner +--- + umbrello/umlappprivate.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp +index d8bae2cfe..8c1c58a02 100644 +--- a/umbrello/umlappprivate.cpp ++++ b/umbrello/umlappprivate.cpp +@@ -36,17 +36,17 @@ QString UMLAppPrivate::findWelcomeFile() + + // from custom install + foreach(const QString &lang, langList) { +- dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/doc/HTML/%1/umbrello/apphelp")).arg(lang)); ++ dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/help/%1/umbrello/apphelp")).arg(lang)); + } +- dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/doc/HTML/en/umbrello/apphelp")); ++ dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/help/en/umbrello/apphelp")); + + QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); + // from real installation + foreach(const QString &location, locations) { + foreach(const QString &lang, langList) { +- dirList.append(QString(QLatin1String("%1/doc/HTML/%2/umbrello/apphelp")).arg(location).arg(lang)); ++ dirList.append(QString(QLatin1String("%1/help/%2/umbrello/apphelp")).arg(location).arg(lang)); + } +- dirList.append(QString(QLatin1String("%1/doc/HTML/en/umbrello/apphelp")).arg(location)); ++ dirList.append(QString(QLatin1String("%1/help/en/umbrello/apphelp")).arg(location)); + } + #else + KLocale *local = KGlobal::locale(); +-- +2.29.2 + 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 new file mode 100644 index 000000000000..bf41c2d40980 --- /dev/null +++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch @@ -0,0 +1,99 @@ +From eb753a7eb0f49c6ac5b349f81387ca4b4c64342b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 12 Oct 2020 11:46:24 +0200 +Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with + QTextBrowser fallback + +Thanks-to: Ralf Habacker for QTextBrowser fallback code. + +Signed-off-by: Andreas Sturmlechner +--- + 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 398415f09..7144f0990 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -95,9 +95,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 264b25fde..f3286ae46 100644 +--- a/umbrello/CMakeLists.txt ++++ b/umbrello/CMakeLists.txt +@@ -549,7 +551,6 @@ else() + Qt5::Xml + Qt5::PrintSupport + Qt5::Svg +- Qt5::WebKitWidgets + KF5::Archive + KF5::Completion + KF5::CoreAddons +@@ -565,6 +566,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 a85de1f22..a7212cc8d 100644 +--- a/umbrello/umlappprivate.h ++++ b/umbrello/umlappprivate.h +@@ -42,7 +42,11 @@ + #include + #include + #include ++#ifdef WEBKIT_WELCOMEPAGE + #include ++#else ++#include ++#endif + + class QWidget; + +@@ -160,6 +164,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); +@@ -167,6 +172,14 @@ public slots: + view->setHtml(html); + view->show(); + welcomeWindow->setWidget(view); ++#else ++ QTextBrowser *tb = new QTextBrowser(dynamic_cast(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(QLatin1String("view_show_welcome")); +-- +2.29.2 + diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch new file mode 100644 index 000000000000..cce395a837ff --- /dev/null +++ b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch @@ -0,0 +1,92 @@ +From 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Mon Sep 17 00:00:00 2001 +From: Ralf Habacker +Date: Fri, 30 Oct 2020 08:32:41 +0100 +Subject: [PATCH] Add support to use external KDevPHP packaga + +If no external development package has been found fallback to embedded +version. + +This commit adds an additional optional dependency for the KDevPHP package, which +named e.g. on openSUSE 'kdevelop5-plugin-php-devel'. + +BUG:428460 +FIXED-IN:2.32.80 (KDE releases 20.11.80) +--- + CMakeLists.txt | 20 ++++++++++++++------ + umbrello/codeimport/phpimport.cpp | 19 +++++++++++-------- + 2 files changed, 25 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 221c04e31..398415f09 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -129,18 +129,26 @@ if(KDEVPGQT_FOUND AND KDEVPLATFORM_FOUND) + include_directories( + ${KDEVPGQT_INCLUDE_DIR} + ${KDEVPLATFORM_INCLUDE_DIR} +- ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}/parser +- ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}/parser + ) +- set(NO_INSTALL 1) +- set(BUILD_PARSER_ONLY 1) + set(BUILD_PHP_IMPORT 1) + add_definitions( +- -DKDEVPHPPARSER_EXPORT= + -DENABLE_PHP_IMPORT + ) + add_subdirectory(lib/kdevplatform) +- add_subdirectory(${KDEV_SOURCE_DIR}) ++ find_package(KDevPHP) ++ if(NOT KDevPHP_FOUND) ++ set(NO_INSTALL 1) ++ set(BUILD_PARSER_ONLY 1) ++ set(BUILD_PHP_IMPORT 1) ++ add_definitions( ++ -DKDEVPHPPARSER_EXPORT= ++ ) ++ include_directories( ++ ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR} ++ ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR} ++ ) ++ add_subdirectory(${KDEV_SOURCE_DIR}) ++ endif() + else() + set(BUILD_PHP_IMPORT 0) + endif() +diff --git a/umbrello/codeimport/phpimport.cpp b/umbrello/codeimport/phpimport.cpp +index f45f1416f..f714dcbad 100644 +--- a/umbrello/codeimport/phpimport.cpp ++++ b/umbrello/codeimport/phpimport.cpp +@@ -39,18 +39,21 @@ QTextStream qout(stdout); + QTextStream qerr(stderr); + QTextStream qin(stdin); + +-#include "parsesession.h" +-#include "phplexer.h" +-#include "phpparser.h" +-#include "phpdebugvisitor.h" +-#include "phpast.h" +-#include "tokenstream.h" +-#include "phptokentext.h" +- ++// kdevphp ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++// kdevplatform + #include + #include + #include + #include ++#include + #include + + namespace Php { +-- +GitLab + diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch new file mode 100644 index 000000000000..bb1fde2878e6 --- /dev/null +++ b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch @@ -0,0 +1,25 @@ +From 5263f4e391c50c72e000da6c2bcf1123c28192e5 Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" +Date: Wed, 21 Jun 2017 14:05:28 +0200 +Subject: [PATCH] Remove finding WebKitWidgets, not used + +--- + lib/kdev5-php/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/kdev5-php/CMakeLists.txt b/lib/kdev5-php/CMakeLists.txt +index 2a40b48ae..6ef58b0c9 100644 +--- a/lib/kdev5-php/CMakeLists.txt ++++ b/lib/kdev5-php/CMakeLists.txt +@@ -28,7 +28,7 @@ include(KDECMakeSettings) + include(GenerateExportHeader) + include(FeatureSummary) + +-find_package(Qt5 REQUIRED Core Widgets Test WebKitWidgets) ++find_package(Qt5 REQUIRED Core Widgets Test) + find_package(KF5 REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils) + find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED) + find_package(KDevelop-PG-Qt REQUIRED) +-- +2.28.0 + -- cgit v1.2.3