diff options
Diffstat (limited to 'kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch')
-rw-r--r-- | kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch | 92 |
1 files changed, 92 insertions, 0 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 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 <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 + |