From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-libs/kuserfeedback/Manifest | 6 ++- .../kuserfeedback-1.0.0-fix-opengl-crash.patch | 39 ++++++++++++++ .../files/kuserfeedback-1.2.0-enable_docs.patch | 48 +++++++++++++++++ .../kuserfeedback/kuserfeedback-1.0.0-r1.ebuild | 59 +++++++++++++++++++++ dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild | 58 -------------------- dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild | 61 ++++++++++++++++++++++ 6 files changed, 212 insertions(+), 59 deletions(-) create mode 100644 dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch create mode 100644 dev-libs/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch create mode 100644 dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild delete mode 100644 dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild create mode 100644 dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild (limited to 'dev-libs/kuserfeedback') diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest index 14054521055d..bfb56022fbd9 100644 --- a/dev-libs/kuserfeedback/Manifest +++ b/dev-libs/kuserfeedback/Manifest @@ -1,3 +1,7 @@ +AUX kuserfeedback-1.0.0-fix-opengl-crash.patch 1513 BLAKE2B d53f4c02ab9c1bb298708694d2f4dc0f655ba93bb9ac83e1a24b264c810dd0caa0ea955e8a1f03418f133a0702ad324233ac5f7e46030980169936ee0903e3c7 SHA512 f3d91845ed05d592696b0a79bbc5d70c03b2c211fe9a4c1937da849c4f9f2fabbf339aced2038c97be9a66f4506bf021dabce558a51bf26916967f2087254923 +AUX kuserfeedback-1.2.0-enable_docs.patch 1776 BLAKE2B 6eab84c4ea3d678911ea6ab73dac0b4b7ff563dc9fa3fb11f563f2a9de6db7853fa16306c843f0380e14e734c28cb1654c06b9ec776dda89c784c6687f64d659 SHA512 209e8687c409a0c91d48b5fd0677088e7933270e9250b0fc389f2e78e733a13df52618a8e61d28d17ddaaf2f1a1a7f1207af0c30e0132b33337fc13c2395b8f5 DIST kuserfeedback-1.0.0.tar.xz 187784 BLAKE2B 24acb6c1f143a0811a84c7d4f5ffe923df2fe94b0d13e361870d308b65ee8be747cef1a2ab719c6023b4f5885fb9970620a2a5da0d073e70b1e4912c6f64c5d1 SHA512 d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7 -EBUILD kuserfeedback-1.0.0.ebuild 1278 BLAKE2B 194802ce04a1a0d5d98249c779beb6320ab3d80f1cfaa0c3cf52fa7a89067ecfd0846a6a54eb5da38a11beaede97011d0c0c52c8903c292c2cc06e988e0e6a0c SHA512 84b34c90ce042990074c2918b11972ced89367e1ca60871b9b00258469b02eaee87c7a4e8a774e63e0fed2b91ddb2d985b68e1246bbe1e7ac5f0cfa02e055a1e +DIST kuserfeedback-1.2.0.tar.xz 206364 BLAKE2B 4ae1683f8a3470ee3db7b3039c27ebd7bc210afd5cd8cdd992a107e541971f4778d7add3fb330befbfd7d62e04d9d2aba8fc22eab5a368f4b92e98f7baa1ec41 SHA512 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470 +EBUILD kuserfeedback-1.0.0-r1.ebuild 1332 BLAKE2B 53cb13e2a7d21a6d64241b16d0311d78770f171abd09d8ba4b315c79f3f8ad2abf91f31501c5ffd613a71dfdeebec3602f014854257707b7975c3814d29ca05c SHA512 a078b5a6a4a3050cdbee78224549759d38d0dd35fa36628ee114b75966b521991c67d99b319a5c9717d23c79f5b1a203fdfac8600bc620f8426522b92fc9d63f +EBUILD kuserfeedback-1.2.0.ebuild 1422 BLAKE2B cf3a08771d740484b475eaff0b51095b4ae079e22e6c9af709741b979395beba100c357e00a61d5375100d808fed92936b71759c1b5a3b720b6ce35102158ee6 SHA512 6474a37d6b3b8288d6131c6fd8a19ad944a4887c1c8aa61f6bb0b808399c2967beb0677c5091830ad7c1026577fdbb4dddaf7c0ae0092b0782f085643eb96b11 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch b/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch new file mode 100644 index 000000000000..57321355b23a --- /dev/null +++ b/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch @@ -0,0 +1,39 @@ +From 17db7d75643b4f3dccd5b36a6ab175f03ba74297 Mon Sep 17 00:00:00 2001 +From: Aleix Pol +Date: Wed, 2 Feb 2022 20:36:40 +0100 +Subject: [PATCH] opengl source: Do not crash if we could not make our context + current + +BUG: 449505 +--- + src/provider/core/openglinfosource.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/provider/core/openglinfosource.cpp b/src/provider/core/openglinfosource.cpp +index 5117d85..08402c7 100644 +--- a/src/provider/core/openglinfosource.cpp ++++ b/src/provider/core/openglinfosource.cpp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include "logging_p.h" + #endif + + using namespace KUserFeedback; +@@ -37,7 +38,11 @@ QVariant OpenGLInfoSource::data() + QWindow window; + window.setSurfaceType(QSurface::OpenGLSurface); + window.create(); +- context.makeCurrent(&window); ++ if (!context.makeCurrent(&window)) { ++ qCWarning(Log) << "Could not make OpenGL context current"; ++ m.insert(QStringLiteral("type"), QStringLiteral("none")); ++ return m; ++ } + QOpenGLFunctions functions(&context); + m.insert(QStringLiteral("vendor"), OpenGLInfoSourcePrivate::normalizeVendor(reinterpret_cast(functions.glGetString(GL_VENDOR)))); + m.insert(QStringLiteral("renderer"), OpenGLInfoSourcePrivate::normalizeRenderer(reinterpret_cast(functions.glGetString(GL_RENDERER)))); +-- +GitLab + 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 +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 +--- + 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.0.0-r1.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild new file mode 100644 index 000000000000..d3d0eb2f85e9 --- /dev/null +++ b/dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild @@ -0,0 +1,59 @@ +# 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 + ) +" + +PATCHES=( "${FILESDIR}/${P}-fix-opengl-crash.patch" ) + +src_configure() { + local mycmakeargs=( + # disable server application + -DENABLE_PHP=NO + -DENABLE_PHP_UNIT=NO + -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES + -DENABLE_DOCS=$(usex doc) + ) + + ecm_src_configure +} diff --git a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild deleted file mode 100644 index 85edbc6aa810..000000000000 --- a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -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" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - doc? ( - >=dev-qt/qdoc-${QTMIN}:5 - >=dev-qt/qthelp-${QTMIN}:5 - ) -" -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}" - -src_configure() { - local mycmakeargs=( - # disable server application - -DENABLE_PHP=NO - -DENABLE_PHP_UNIT=NO - -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES - -DENABLE_DOCS=$(usex doc) - ) - - ecm_src_configure -} 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 +} -- cgit v1.2.3