commit: beb9939a8a0a1834820a3ac5a7e24dfc378e4d18 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Mar 21 11:59:29 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Mar 21 12:16:17 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=beb9939a
kde-apps/umbrello: Add BUILD_QCH build switch and disable Doxygen Breaks cmake install right now. Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/umbrello-20.03.80-build-qch.patch | 37 ++++++++++++++++++++++ kde-apps/umbrello/umbrello-20.03.80.ebuild | 4 +++ kde-apps/umbrello/umbrello-20.04.49.9999.ebuild | 4 +++ kde-apps/umbrello/umbrello-9999.ebuild | 4 +++ 4 files changed, 49 insertions(+) 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 new file mode 100644 index 0000000000..6cc361fe2e --- /dev/null +++ b/kde-apps/umbrello/files/umbrello-20.03.80-build-qch.patch @@ -0,0 +1,37 @@ +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.80.ebuild b/kde-apps/umbrello/umbrello-20.03.80.ebuild index 8ec7f754bd..1283d94963 100644 --- a/kde-apps/umbrello/umbrello-20.03.80.ebuild +++ b/kde-apps/umbrello/umbrello-20.03.80.ebuild @@ -4,6 +4,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" +ECM_QTHELP="false" # TODO: figure out install error ECM_TEST="forceoptional" KFMIN=5.68.0 QTMIN=5.12.3 @@ -52,8 +53,11 @@ DEPEND="${RDEPEND} >=kde-frameworks/kdelibs4support-${KFMIN}:5 " +PATCHES=( "${FILESDIR}/${P}-build-qch.patch" ) + src_configure() { local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP -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 c2fffdbb39..f26171dbf6 100644 --- a/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild +++ b/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild @@ -4,6 +4,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" +ECM_QTHELP="false" # TODO: figure out install error ECM_TEST="forceoptional" KFMIN=5.68.0 QTMIN=5.12.3 @@ -52,8 +53,11 @@ 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_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 c2fffdbb39..f26171dbf6 100644 --- a/kde-apps/umbrello/umbrello-9999.ebuild +++ b/kde-apps/umbrello/umbrello-9999.ebuild @@ -4,6 +4,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" +ECM_QTHELP="false" # TODO: figure out install error ECM_TEST="forceoptional" KFMIN=5.68.0 QTMIN=5.12.3 @@ -52,8 +53,11 @@ 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_KF5=ON -DBUILD_PHP_IMPORT=$(usex php) -DBUILD_unittests=$(usex test)
