commit: ffe47b1e8593cfd45a03d89523054ad36ecfc957 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Feb 11 11:38:47 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Feb 11 11:40:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe47b1e
dev-libs/kuserfeedback: 1.2.0 version bump Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/kuserfeedback/Manifest | 1 + .../files/kuserfeedback-1.2.0-enable_docs.patch | 48 +++++++++++++++++ dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild | 61 ++++++++++++++++++++++ 3 files changed, 110 insertions(+) diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest index 5b106a00711e..a6ad8ea41303 100644 --- a/dev-libs/kuserfeedback/Manifest +++ b/dev-libs/kuserfeedback/Manifest @@ -1 +1,2 @@ DIST kuserfeedback-1.0.0.tar.xz 187784 BLAKE2B 24acb6c1f143a0811a84c7d4f5ffe923df2fe94b0d13e361870d308b65ee8be747cef1a2ab719c6023b4f5885fb9970620a2a5da0d073e70b1e4912c6f64c5d1 SHA512 d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7 +DIST kuserfeedback-1.2.0.tar.xz 206364 BLAKE2B 4ae1683f8a3470ee3db7b3039c27ebd7bc210afd5cd8cdd992a107e541971f4778d7add3fb330befbfd7d62e04d9d2aba8fc22eab5a368f4b92e98f7baa1ec41 SHA512 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470 diff --git a/dev-libs/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch b/dev-libs/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch new file mode 100644 index 000000000000..77915f1b4040 --- /dev/null +++ b/dev-libs/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch @@ -0,0 +1,48 @@ +From f523d1da91dbf944cb753e8aed8ad40367e8826c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Fri, 11 Feb 2022 12:29:50 +0100 +Subject: [PATCH] Hide finding docs dependencies behind ENABLE_DOCS + +It was also oddly placed within CMakeLists.txt so moved it below +major Qt dependency calls (and the actual "# Dependencies" block). + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ea764a..48623bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,12 +39,6 @@ include(ECMGeneratePriFile) + include(FeatureSummary) + include(GenerateExportHeader) + +-if(QT_MAJOR_VERSION STREQUAL "5") +- find_package(Qt5 CONFIG OPTIONAL_COMPONENTS DocTools) +-else() +- find_package(Qt6 CONFIG OPTIONAL_COMPONENTS ToolsTools) +-endif() +- + ecm_setup_version(PROJECT + VARIABLE_PREFIX KUSERFEEDBACK + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kuserfeedback_version.h" +@@ -61,6 +55,14 @@ if (NOT CMAKE_CROSSCOMPILING) + find_package(Qt${QT_MAJOR_VERSION} NO_MODULE QUIET OPTIONAL_COMPONENTS Help) + endif() + ++if (ENABLE_DOCS) ++ if(QT_MAJOR_VERSION STREQUAL "5") ++ find_package(Qt5 CONFIG OPTIONAL_COMPONENTS DocTools) ++ else() ++ find_package(Qt6 CONFIG OPTIONAL_COMPONENTS ToolsTools) ++ endif() ++endif() ++ + set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES URL "http://qt-project.org/";) + set_package_properties(Qt${QT_MAJOR_VERSION}Widgets PROPERTIES TYPE RECOMMENDED PURPOSE "Required for feedback configuration and notification widgets.") + set_package_properties(Qt${QT_MAJOR_VERSION}Charts PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.") +-- +2.35.1 + diff --git a/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild new file mode 100644 index 000000000000..ff6e5c22bb87 --- /dev/null +++ b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=5.82.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi +LICENSE="MIT" +SLOT="5" +IUSE="doc" + +DEPEND=" + >=dev-qt/qtcharts-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + doc? ( + >=dev-qt/qdoc-${QTMIN}:5 + >=dev-qt/qthelp-${QTMIN}:5 + ) +" + +# https://invent.kde.org/libraries/kuserfeedback/-/merge_requests/21 +PATCHES=( "${FILESDIR}/${P}-enable_docs.patch" ) + +src_configure() { + local mycmakeargs=( + -DQT_MAJOR_VERSION=5 + # disable server application + -DENABLE_PHP=NO + -DENABLE_PHP_UNIT=NO + -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES + -DENABLE_DOCS=$(usex doc) + ) + + ecm_src_configure +}
