forked from pool/drkonqi5
Plasma 5.27.1
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/drkonqi5?expand=0&rev=212
This commit is contained in:
Christophe Marin
Git OBS Bridge
parent
55fb61f418
commit
e94e6ea980
@ -1,50 +0,0 @@
|
||||
From 2e3e56c5ec62a817409d3c47bc0ccd716e288d9a Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
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
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
From 188c0e8297f65f7bf222dde86bd472f6fadeab4d Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8fb601f1d73fcb035dad59579147e29cd5b671cba22d69c0d7d523c2b3dab104
|
||||
size 852672
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmPk3/kACgkQ11dEg7tX
|
||||
sY1GaQ//W41TBCnj6vh31NhtXHnjhPuvlX9J9qwtpwDjzqMpiRuqmcW4siKZuLdI
|
||||
0X9uznnxXRo3R4tu7Un1Hd7RPL8KU8aNJXjJMiL9+K58fREyMUSRM29owwhCCoVb
|
||||
ytDvEKfAdylXUfq0GIs91zYKHui21ZNdyAsLPPkQQ30D/A7CE06f3mqTjMvXDhDl
|
||||
YruVK/csp2ipygacT5fChlr+6whssJh2evbt7C8z3yfxjPtrLR/Jk3rYWf90nykB
|
||||
E0ESCL/pFKXl+dvPd4CXs2fn+4iScRUyHrt9XBDoUmr0hh1oAJI9moeCD+y0pDNC
|
||||
NTRnvOS1LOYZcVCF1+uhyn69cJKuIdQXMR0PmBbV1aKiIr4le+G355O72c6K+6LX
|
||||
iPudkGAlOcvR/LzDkTXzg3V6yZrl7DQY3DJ+mc5n0rn06mgXAJegVfweVchwcJmp
|
||||
Sd6lXhUuTQGxvjnm4PL+QgQ+CQj85ocYfpfmGOIhRkSwDoQuyNYh7VChRS5IkH90
|
||||
oPBsRi8xDyOgryA/tgPWexALt4l/lF0SFmd4c6kPR41ptWz6Kq+vI+GAa4kHfTKj
|
||||
WXkUfc1adPrDSDEh1VQxXNwf5XtlfcLF9B0Efa4SJ+D6Z/cP7+xvfVm6q5dDC8Ln
|
||||
O6Q2PL9iNlPUCP5q/w1YSSbCngVvvLd/V/d+9MM3XygvERlS1t0=
|
||||
=w3/J
|
||||
-----END PGP SIGNATURE-----
|
||||
3
drkonqi-5.27.1.tar.xz
Normal file
3
drkonqi-5.27.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:06145f5ee40157067298ad979aa4c930046fded92c0a2403e0fbcb63dcbf09c8
|
||||
size 852852
|
||||
16
drkonqi-5.27.1.tar.xz.sig
Normal file
16
drkonqi-5.27.1.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmP0q7AACgkQ11dEg7tX
|
||||
sY33Hw//aqqdogupWgH7Ksqy2ZHfj0yvZMv5bKsk1NCQxMX5FoX4wISrMk8jolcI
|
||||
8FneqTgzv5dMfPewCBWjaecj80HShH17LSAaw+JQ0+fPOT2IvZejK3sjaIlmBdQs
|
||||
b/m3mJbM3SK1QHC9YrfDLJ6/rnYlrJ+oIMKndM/o4UyjjsWXY/7Th/thyO5RFmi/
|
||||
oU7oPLSbpQofBrOxjRKt+qlO+rccXqTxCrnaQf58GLbZrI67gjbHq+OcTQGHis15
|
||||
S4haYyN7GsRSoN5nTodmtyvFCBUukjwf6K/bjbeXgq8Gycajkke7tvZ4HDU2mFrU
|
||||
/kLLHEzzzqruz4uFL8Gg9pc5OwmZI/7xLkcyWsVbOXjsK8j7G3KLQLMg2Mto9q0I
|
||||
+9dJSFNyVpcTgVLXa5CH0oH32WKVNIZMCBGYgGDKjstlzks1KuIny8zLJh0u1jh2
|
||||
EIl6VpvMY2GCyegKhojJkAPMMcUkQzFZOSQ0c/HzpcZGmJqKcqhA2sjteeV9Kx4P
|
||||
SoF1qUqmu0H9B34v30ZS8hNwRmpgnGe+USZqa9+hZV2glz4N//Xdp7U1/qMNfUL9
|
||||
2wMVCAGTBF+f+fS5YBd9x1NmcpvHbZBwOSga53Ra4K+qhYO6ABN/0Ee8OuwjEfcX
|
||||
a5QqTCYuuifLY7ub5F5eDltx6EUtFb/UF0oopkLQbHHfZIuPWy4=
|
||||
=6CvQ
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 21 14:09:15 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.27.1
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/plasma/5/5.27.1
|
||||
- Changes since 5.27.0:
|
||||
* Make python distro and psutil modules in the gdb preable optional
|
||||
* Handle WITH_SENTRY correctly
|
||||
* login on field accepting (kde#466109)
|
||||
- Drop patches, now upstream:
|
||||
* 0001-Handle-WITH_SENTRY-correctly.patch
|
||||
* 0002-Make-python-distro-and-psutil-modules-in-the-gdb-pre.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 9 14:19:36 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@ -23,20 +23,17 @@ Name: drkonqi5
|
||||
%{!?_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.27.0
|
||||
Version: 5.27.1
|
||||
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: drkonqi-%{version}.tar.xz
|
||||
Source: https://download.kde.org/stable/plasma/%{version}/drkonqi-%{version}.tar.xz
|
||||
%if %{with released}
|
||||
Source1: drkonqi-%{version}.tar.xz.sig
|
||||
Source1: https://download.kde.org/stable/plasma/%{version}/drkonqi-%{version}.tar.xz.sig
|
||||
Source2: plasma.keyring
|
||||
%endif
|
||||
# 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}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user