commit: 4daa79f755bd1af87e42bd313a350b17c08b8698 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Apr 3 17:51:11 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Apr 3 17:51:11 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4daa79f7
kde-apps/umbrello: Replace patch with -DBUILD_APIDOC=OFF See also: https://mail.kde.org/pipermail/release-team/2020-April/011825.html Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/umbrello-20.03.80-build-qch.patch | 37 ---------------------- kde-apps/umbrello/umbrello-20.03.90.ebuild | 3 +- kde-apps/umbrello/umbrello-20.04.49.9999.ebuild | 3 +- kde-apps/umbrello/umbrello-9999.ebuild | 3 +- 4 files changed, 3 insertions(+), 43 deletions(-) diff --git a/kde-apps/umbrello/files/umbrello-20.03.80-build-qch.patch b/kde-apps/umbrello/files/umbrello-20.03.80-build-qch.patch deleted file mode 100644 index 6cc361fe2e..0000000000 --- a/kde-apps/umbrello/files/umbrello-20.03.80-build-qch.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fd272f86829c41a32c06fa8440eae5a4bfd7483e Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Sat, 21 Mar 2020 12:46:15 +0100 -Subject: [PATCH] Use quasi standard BUILD_QCH option - -As found in use consistently in KDE Frameworks and some other libraries. ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 588f2e000..886916c5a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,6 +29,8 @@ option(BUILD_KF5 "Build for KDE Frameworks 5" ON) - - option(BUILD_PHP_IMPORT "Build with php import support" ON) - -+option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) -+ - # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked - list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - include(Macros) -@@ -236,7 +238,9 @@ add_unstable_feature(OBJECT_DIAGRAM) # see https://bugs.kde.org/show_bug.cgi?id= - find_package(Doxygen OPTIONAL_COMPONENTS dot) - if(DOXYGEN_FOUND) - message(STATUS "found doxygen package") -- find_program(QHELPGENERATOR_EXECUTABLE qhelpgenerator) -+ if (BUILD_QCH) -+ find_program(QHELPGENERATOR_EXECUTABLE qhelpgenerator) -+ endif() - - set(DOXYGEN_ABBREVIATE_BRIEF "The $name class" "The $name widget") - set(DOXYGEN_CALL_GRAPH YES) --- -2.25.2 - diff --git a/kde-apps/umbrello/umbrello-20.03.90.ebuild b/kde-apps/umbrello/umbrello-20.03.90.ebuild index c7b689eef8..c6979db7aa 100644 --- a/kde-apps/umbrello/umbrello-20.03.90.ebuild +++ b/kde-apps/umbrello/umbrello-20.03.90.ebuild @@ -53,11 +53,10 @@ DEPEND="${RDEPEND} >=kde-frameworks/kdelibs4support-${KFMIN}:5 " -PATCHES=( "${FILESDIR}/${PN}-20.03.80-build-qch.patch" ) - src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP + -DBUILD_APIDOC=OFF -DBUILD_KF5=ON -DBUILD_PHP_IMPORT=$(usex php) -DBUILD_unittests=$(usex test) diff --git a/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild b/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild index 716c016eaa..704581c29b 100644 --- a/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild +++ b/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild @@ -53,11 +53,10 @@ DEPEND="${RDEPEND} >=kde-frameworks/kdelibs4support-${KFMIN}:5 " -PATCHES=( "${FILESDIR}/${PN}-20.03.80-build-qch.patch" ) - src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP + -DBUILD_APIDOC=OFF -DBUILD_KF5=ON -DBUILD_PHP_IMPORT=$(usex php) -DBUILD_unittests=$(usex test) diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild index 716c016eaa..704581c29b 100644 --- a/kde-apps/umbrello/umbrello-9999.ebuild +++ b/kde-apps/umbrello/umbrello-9999.ebuild @@ -53,11 +53,10 @@ DEPEND="${RDEPEND} >=kde-frameworks/kdelibs4support-${KFMIN}:5 " -PATCHES=( "${FILESDIR}/${PN}-20.03.80-build-qch.patch" ) - src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP + -DBUILD_APIDOC=OFF -DBUILD_KF5=ON -DBUILD_PHP_IMPORT=$(usex php) -DBUILD_unittests=$(usex test)
