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.habac...@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" <kosse...@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
-
