From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- dev-libs/kuserfeedback/Manifest | 5 +- .../kuserfeedback-1.0.0-fix-opengl-crash.patch | 39 -------------- .../kuserfeedback/kuserfeedback-1.0.0-r1.ebuild | 59 ---------------------- dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild | 2 +- 4 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch delete mode 100644 dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild (limited to 'dev-libs/kuserfeedback') diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest index 3f42b979dcdd..b060ded83a95 100644 --- a/dev-libs/kuserfeedback/Manifest +++ b/dev-libs/kuserfeedback/Manifest @@ -1,7 +1,4 @@ -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 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 1421 BLAKE2B 4c1c16ddfa81a14eb27835e4eaa3ef2d58898ba1605161a7724faa8141cba5e1798027fb44096656bd8ec0d70f8e84a4e464fb0176b1c5d7e5791906d8d81e46 SHA512 419b2717419142b99caa568f69da0c4dcb37912393d36ee33d9c720881ee2906e8c37182db5ae8b0bcc7068581f970e29e1b08baa536f47e34cfeb872b3c0fab +EBUILD kuserfeedback-1.2.0.ebuild 1419 BLAKE2B 944fac7740c1683b73fe926a342d9ed5a12ddcf2c0c0c33e4596ce099ae05f46fe0262006f1fd1013a24f47c2e05726b5dcdac334fb380454a43d9f6696e3dc7 SHA512 b540a86cea17dd5a7e0ceef7263ef9aea1d0796b2e974672b7e6dd54c03f3886e4a56938e5365ac6614197cb3ecbd4bbf792ec15db70730bcc3a3ded66d300e5 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 deleted file mode 100644 index 57321355b23a..000000000000 --- a/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/kuserfeedback-1.0.0-r1.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild deleted file mode 100644 index d3d0eb2f85e9..000000000000 --- a/dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# 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.2.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild index 16eb367d08cc..9c1cc52b9a84 100644 --- a/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild +++ b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Framework to collect user feedback for applications via telemetry a if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" fi LICENSE="MIT" SLOT="5" -- cgit v1.2.3