commit: d6b101980b5fc7fc565acd4c5a8ec54f08e50200 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Oct 30 21:59:49 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 30 21:59:49 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6b10198
kde-apps/umbrello: Unbundle dev-utils/kdevelop-php and update DEPENDs Upstream commit 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../umbrello-20.08.3-unbundle-kdevelop-php.patch | 92 ++++++++++++++++++++++ kde-apps/umbrello/umbrello-20.08.49.9999.ebuild | 8 +- kde-apps/umbrello/umbrello-9999.ebuild | 3 +- 3 files changed, 100 insertions(+), 3 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 0000000000..cce395a837 --- /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 <[email protected]> +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/umbrello-20.08.49.9999.ebuild b/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild index 1ec6ad0543..67eb70e963 100644 --- a/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild +++ b/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild @@ -45,12 +45,16 @@ RDEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 php? ( dev-util/kdevelop:5= - dev-util/kdevelop-pg-qt + dev-util/kdevelop-pg-qt:5 + dev-util/kdevelop-php:5 ) " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch + "${FILESDIR}"/${PN}-20.08.3-unbundle-kdevelop-php.patch +) src_configure() { local mycmakeargs=( diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild index e1ac904a25..f525d40125 100644 --- a/kde-apps/umbrello/umbrello-9999.ebuild +++ b/kde-apps/umbrello/umbrello-9999.ebuild @@ -45,7 +45,8 @@ RDEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 php? ( dev-util/kdevelop:5= - dev-util/kdevelop-pg-qt + dev-util/kdevelop-pg-qt:5 + dev-util/kdevelop-php:5 ) " DEPEND="${RDEPEND}"
