* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/
@ 2020-11-05 17:59 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-11-05 17:59 UTC (permalink / raw
To: gentoo-commits
commit: a87d3721ab3bc9dc61ce68e6ca2a2594303252a0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 5 12:47:49 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 12:48:58 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a87d3721
kde-apps/umbrello: patch--
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../umbrello-20.08.3-unbundle-kdevelop-php.patch | 92 ----------------------
.../files/umbrello-20.08.3-unused-qtwebkit.patch | 25 ------
2 files changed, 117 deletions(-)
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
deleted file mode 100644
index cce395a837..0000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-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 <parser/parsesession.h>
-+#include <parser/phplexer.h>
-+#include <parser/phpparser.h>
-+#include <parser/phpdebugvisitor.h>
-+#include <parser/phpast.h>
-+#include <parser/tokenstream.h>
-+#include <parser/phptokentext.h>
-+
-+// kdevplatform
- #include <tests/autotestshell.h>
- #include <language/duchain/duchain.h>
- #include <language/duchain/problem.h>
- #include <language/codegen/coderepresentation.h>
-+#include <language/editor/documentrange.h>
- #include <tests/testcore.h>
-
- 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
deleted file mode 100644
index bb1fde2878..0000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5263f4e391c50c72e000da6c2bcf1123c28192e5 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/
@ 2021-10-31 2:44 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-10-31 2:44 UTC (permalink / raw
To: gentoo-commits
commit: bfdc0f7967c73b6771722c5a77d14dc8a9126fe8
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sat Oct 30 06:38:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:44:22 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bfdc0f79
kde-apps/umbrello: fix configure with tests
exclude Qt5::WebKitWidgets from unittests CMakeLists.txt
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22755
Signed-off-by: Sam James <sam <AT> 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 bf41c2d409..74a1e9b3e6 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-31 2:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-31 2:44 [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-11-05 17:59 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox