From 33108594992db78a518bf3a9a92b09379433ae65 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 4 Apr 2021 19:07:35 +0200 Subject: kde-apps/umbrello: drop 20.08.3* Signed-off-by: Andreas Sturmlechner --- kde-apps/umbrello/Manifest | 1 - .../umbrello-20.08.3-unbundle-kdevelop-php.patch | 92 ---------------------- kde-apps/umbrello/umbrello-20.08.3.ebuild | 76 ------------------ 3 files changed, 169 deletions(-) delete mode 100644 kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch delete mode 100644 kde-apps/umbrello/umbrello-20.08.3.ebuild (limited to 'kde-apps') diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest index ee65e951e9cf..96769a301aa3 100644 --- a/kde-apps/umbrello/Manifest +++ b/kde-apps/umbrello/Manifest @@ -1,2 +1 @@ -DIST umbrello-20.08.3.tar.xz 5555108 BLAKE2B c8ccc39d43f061d78889776e6adc6d1a07a67608b8cbfc8c18e8f94a3d1608b3764c15d496538bb76db2672cd6bdfa8158b30a24f38f3c40e8b18dfe72262155 SHA512 541d637cd892f5b162fa88e3380c9ed4c9c175d5479bb1947b415b8fa59a419fd90eac2e47d939ec3d9b7b43b14fbf6777683f884b7ff10e7dee85eccb59f813 DIST umbrello-20.12.3.tar.xz 5555804 BLAKE2B a923d4f4d952dbbfc8166b2ca2bff990a4ad8652762277c3f16d4c37ffd26c1761a3480d45640c2821b0e85633158a90d82358afedc11fae98b2d5e58d0e7f57 SHA512 619d83ffd307be57fc8f3dc935dde6bdeffc60186ab675b8f2e530bb6a125ec1e03fccc49772c6d4cc120b3280e56f28344cba2627c3b955f9cd338cd071da6a 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 cce395a837ff..000000000000 --- 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 -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/umbrello-20.08.3.ebuild b/kde-apps/umbrello/umbrello-20.08.3.ebuild deleted file mode 100644 index ac0fd86af5da..000000000000 --- a/kde-apps/umbrello/umbrello-20.08.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_QTHELP="false" # TODO: figure out install error -ECM_TEST="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE UML Modeller" -HOMEPAGE="https://apps.kde.org/en/umbrello https://umbrello.kde.org" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="php" - -RDEPEND=" - dev-libs/libxml2 - dev-libs/libxslt - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - php? ( - dev-util/kdevelop:5= - dev-util/kdevelop-pg-qt:5 - dev-util/kdevelop-php:5 - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-{no,unused}-qtwebkit.patch - "${FILESDIR}"/${P}-gentoo-docbundledir.patch # downstream fix hardcoded path - "${FILESDIR}"/${P}-unbundle-kdevelop-php.patch -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON - -DBUILD_APIDOC=OFF - -DBUILD_KF5=ON - -DBUILD_PHP_IMPORT=$(usex php) - -DBUILD_unittests=$(usex test) - ) - use test && mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON - ) - - ecm_src_configure -} -- cgit v1.2.3-65-gdbad