Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package drkonqi5 for openSUSE:Factory checked in at 2023-02-13 16:39:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drkonqi5 (Old) and /work/SRC/openSUSE:Factory/.drkonqi5.new.1848 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drkonqi5" Mon Feb 13 16:39:35 2023 rev:100 rq:1064503 version:5.27.0 Changes: -------- --- /work/SRC/openSUSE:Factory/drkonqi5/drkonqi5.changes 2023-01-06 17:03:50.847605768 +0100 +++ /work/SRC/openSUSE:Factory/.drkonqi5.new.1848/drkonqi5.changes 2023-02-13 16:41:39.167634742 +0100 @@ -1,0 +2,36 @@ +Thu Feb 9 14:19:36 UTC 2023 - Fabian Vogt <[email protected]> + +- Update to 5.27.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.27.0 +- No code changes since 5.26.90 + +------------------------------------------------------------------- +Tue Jan 31 08:36:48 UTC 2023 - Fabian Vogt <[email protected]> + +- Add patch to actually disable sentry: + * 0001-Handle-WITH_SENTRY-correctly.patch +- Add patch to avoid unnecessary dependencies of the gdb script: + * 0002-Make-python-distro-and-psutil-modules-in-the-gdb-pre.patch + +------------------------------------------------------------------- +Thu Jan 19 14:42:33 UTC 2023 - Fabian Vogt <[email protected]> + +- Update to 5.26.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.26.90 +- Changes since 5.26.5: + * pass the bug id not the attachment id to the gui (kde#462432) + * remove pointless todo + * check telemetrymode + * Use qdbus to query for the hostname + * allow using debuginfod for symbol resolution with gdb12 (kde#454063) + * add some a11y annotations + * do not submit to sentry when the bugzilla url is overridden + * Install po folder + * Port away from deprecated KDeclarative::setupEngine +- Avoid try-restarting a template unit in %postun + +------------------------------------------------------------------- Old: ---- drkonqi-5.26.5.tar.xz drkonqi-5.26.5.tar.xz.sig New: ---- 0001-Handle-WITH_SENTRY-correctly.patch 0002-Make-python-distro-and-psutil-modules-in-the-gdb-pre.patch drkonqi-5.27.0.tar.xz drkonqi-5.27.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drkonqi5.spec ++++++ --- /var/tmp/diff_new_pack.gEVWrs/_old 2023-02-13 16:41:39.631637462 +0100 +++ /var/tmp/diff_new_pack.gEVWrs/_new 2023-02-13 16:41:39.635637486 +0100 @@ -23,19 +23,20 @@ %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF) %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} -Version: 5.26.5 +Version: 5.27.0 Release: 0 Summary: Helper for debugging and reporting crashes License: GPL-2.0-or-later Group: Development/Tools/Debuggers URL: http://www.kde.org/ -Source: https://download.kde.org/stable/plasma/%{version}/drkonqi-%{version}.tar.xz +Source: drkonqi-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/plasma/%{version}/drkonqi-%{version}.tar.xz.sig +Source1: drkonqi-%{version}.tar.xz.sig Source2: plasma.keyring %endif -# PATCHES 100-199 are from upstream 5.16 branch -# PATCHES 200-299 and above are from upstream master/5.17+ branch +# PATCH-FIX-UPSTREAM https://invent.kde.org/plasma/drkonqi/-/merge_requests/84 +Patch1: 0001-Handle-WITH_SENTRY-correctly.patch +Patch2: 0002-Make-python-distro-and-psutil-modules-in-the-gdb-pre.patch BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: cmake(KF5Completion) >= %{kf5_version} BuildRequires: cmake(KF5Config) >= %{kf5_version} @@ -89,24 +90,30 @@ %lang_package %prep -%setup -q -n drkonqi-%{version} +%autosetup -p1 -n drkonqi-%{version} %build %if 0%{?suse_version} < 1550 export CXX=g++-10 %endif - %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} + # Turn off sentry unconditionally. It needs qdbus -> -qt5 fixing + # before it can be used. + %{cmake_kf5 -d build -- \ +%if 0%{?suse_version} >= 1550 + -DWITH_GDB12=ON \ +%endif + -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} \ + -DWITH_SENTRY=OFF} + %cmake_build %install - %kf5_makeinstall -C build +%kf5_makeinstall -C build - %if %{with released} - %{kf5_find_lang} - %endif +%{kf5_find_lang} - install -p -D -m755 src/doc/examples/installdbgsymbols_suse.sh \ - %{buildroot}%{_kf5_bindir}/installdbgsymbols.sh +install -p -D -m755 src/doc/examples/installdbgsymbols_suse.sh \ +%{buildroot}%{_kf5_bindir}/installdbgsymbols.sh %pre %service_add_pre [email protected] @@ -121,7 +128,7 @@ %postun %{systemd_user_postun drkonqi-coredump-cleanup.service drkonqi-coredump-cleanup.timer drkonqi-coredump-launcher.socket} -%service_del_postun [email protected] +%service_del_postun -n [email protected] %files %license LICENSES/* @@ -144,8 +151,6 @@ %{_libexecdir}/drkonqi-coredump-processor %{_kf5_applicationsdir}/org.kde.drkonqi.coredump.gui.desktop -%if %{with released} %files lang -f %{name}.lang -%endif %changelog ++++++ 0001-Handle-WITH_SENTRY-correctly.patch ++++++ >From 2e3e56c5ec62a817409d3c47bc0ccd716e288d9a Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Wed, 23 Nov 2022 10:22:22 +0100 Subject: [PATCH 1/2] Handle WITH_SENTRY correctly cmakedefine01 always defines the macro, so #ifdef is always true. Use #if instead. --- src/backtracegenerator.cpp | 2 +- src/bugzillaintegration/reportinterface.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backtracegenerator.cpp b/src/backtracegenerator.cpp index 0fd38646..4101f00c 100644 --- a/src/backtracegenerator.cpp +++ b/src/backtracegenerator.cpp @@ -190,7 +190,7 @@ void BacktraceGenerator::setBackendPrepared() if (!m_tempDirectory->isValid()) { qCWarning(DRKONQI_LOG) << "Failed to create temporary directory for generator!"; } else { -#ifdef WITH_SENTRY +#if WITH_SENTRY m_proc->setEnv(QStringLiteral("DRKONQI_WITH_SENTRY"), QStringLiteral("1")); #endif m_proc->setEnv(QStringLiteral("DRKONQI_TMP_DIR"), m_tempDirectory->path()); diff --git a/src/bugzillaintegration/reportinterface.cpp b/src/bugzillaintegration/reportinterface.cpp index 6951a75b..c4ce4ea6 100644 --- a/src/bugzillaintegration/reportinterface.cpp +++ b/src/bugzillaintegration/reportinterface.cpp @@ -330,7 +330,7 @@ Bugzilla::NewBug ReportInterface::newBugReportTemplate() const void ReportInterface::sendCrashEvent() { -#ifdef WITH_SENTRY +#if WITH_SENTRY if (DrKonqi::debuggerManager()->backtraceGenerator()->state() == BacktraceGenerator::Loaded) { m_sentryBeacon.sendEvent(); return; @@ -350,7 +350,7 @@ void ReportInterface::sendCrashEvent() void ReportInterface::sendCrashComment() { -#ifdef WITH_SENTRY +#if WITH_SENTRY m_sentryBeacon.sendUserFeedback(m_reportTitle + QLatin1Char('\n') + m_reportDetailText + QLatin1Char('\n') + DrKonqi::kdeBugzillaURL() + QLatin1String("show_bug.cgi?id=%1").arg(QString::number(m_sentReport))); #endif -- 2.39.1 ++++++ 0002-Make-python-distro-and-psutil-modules-in-the-gdb-pre.patch ++++++ >From 188c0e8297f65f7bf222dde86bd472f6fadeab4d Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Wed, 23 Nov 2022 10:23:37 +0100 Subject: [PATCH 2/2] Make python distro and psutil modules in the gdb preable optional Those are only used if sentry is enabled. The other modules are part of python itself. If they are missing, disable sentry support. --- src/data/gdb/preamble.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/data/gdb/preamble.py b/src/data/gdb/preamble.py index 114a5ad9..1f7595e5 100644 --- a/src/data/gdb/preamble.py +++ b/src/data/gdb/preamble.py @@ -6,7 +6,6 @@ import gdb from gdb.FrameDecorator import FrameDecorator from datetime import datetime -import distro import uuid import os import json @@ -15,11 +14,11 @@ import signal import re import binascii import platform -import psutil import multiprocessing from pathlib import Path if os.getenv('DRKONQI_WITH_SENTRY'): + # Initialize sentry reports for exceptions in this script try: import sentry_sdk sentry_sdk.init( @@ -31,6 +30,13 @@ if os.getenv('DRKONQI_WITH_SENTRY'): except ImportError: print("python sentry-sdk not installed :(") + try: + import distro + import psutil + except ImportError: + print("python distro and/or psutil modules missing, disabling sentry") + del os.environ['DRKONQI_WITH_SENTRY'] + def mangle_path(path): if not path: return path -- 2.39.1 ++++++ drkonqi-5.26.5.tar.xz -> drkonqi-5.27.0.tar.xz ++++++ ++++ 136593 lines of diff (skipped)
