diff --git a/.gitignore b/.gitignore index 1e1c3a4..b80777f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kuserfeedback-1.0.0.tar.xz +/kuserfeedback-1.2.0.tar.xz diff --git a/0077-opengl-source-Do-not-crash-if-we-could-not-make-our-.patch b/0077-opengl-source-Do-not-crash-if-we-could-not-make-our-.patch deleted file mode 100644 index b93fb4e..0000000 --- a/0077-opengl-source-Do-not-crash-if-we-could-not-make-our-.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 77/77] 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)))); --- -2.34.1 - diff --git a/kuserfeedback.spec b/kuserfeedback.spec index b175f41..65454f3 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,22 +1,19 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys -Version: 1.0.0 -Release: 11%{?dist} +Version: 1.2.0 +Release: 1%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz ## upstream patches -# git clone https://invent.kde.org/libraries/kuserfeedback.git -# cd kuserfeedback -# git format-patch v1.0.0 -Patch77: 0077-opengl-source-Do-not-crash-if-we-could-not-make-our-.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: kf5-rpm-macros +BuildRequires: libappstream-glib BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules @@ -76,17 +73,18 @@ Analytics and administration tool for UserFeedback servers. %check -desktop-file-validate %{buildroot}%{_datadir}/applications/UserFeedbackConsole.desktop +appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.kuserfeedback-console.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kuserfeedback-console.desktop %files -f userfeedbackprovider5.lang %doc README.md %license COPYING.LIB -%{_sysconfdir}/xdg/org_kde_UserFeedback.categories %{_bindir}/userfeedbackctl %{_libdir}/libKUserFeedbackCore.so.1* %{_libdir}/libKUserFeedbackWidgets.so.1* %{_kf5_qmldir}/org/kde/userfeedback/ +%{_kf5_datadir}/qlogging-categories5/org_kde_UserFeedback.categories %files devel @@ -99,10 +97,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/UserFeedbackConsole.d %files console -f userfeedbackconsole5.lang %{_bindir}/UserFeedbackConsole -%{_datadir}/applications/UserFeedbackConsole.desktop +%{_datadir}/applications/org.kde.kuserfeedback-console.desktop +%{_kf5_metainfodir}/org.kde.kuserfeedback-console.appdata.xml %changelog +* Fri Feb 04 2022 Yaroslav Sidlovsky - 1.2.0-1 +- update to 1.2.0 + * Fri Feb 04 2022 Rex Dieter - 1.0.0-11 - -console: uses qt5-qtcharts private api - -devel: use cmake-style deps instead of hard-coding qt5-qtbase diff --git a/sources b/sources index 269e021..28749c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kuserfeedback-1.0.0.tar.xz) = d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7 +SHA512 (kuserfeedback-1.2.0.tar.xz) = 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470