Hello community, here is the log from the commit of package kcrash for openSUSE:Factory checked in at 2019-09-23 12:22:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcrash (Old) and /work/SRC/openSUSE:Factory/.kcrash.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcrash" Mon Sep 23 12:22:04 2019 rev:71 rq:730916 version:5.62.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcrash/kcrash.changes 2019-08-19 21:04:25.184901207 +0200 +++ /work/SRC/openSUSE:Factory/.kcrash.new.7948/kcrash.changes 2019-09-23 12:22:06.877760586 +0200 @@ -1,0 +2,13 @@ +Sat Sep 7 20:36:36 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.62.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.62.0.php +- Changes since 5.61.0: + * Avoid enabling kcrash if it's only included via a plugin (kde#401637) + * Disable kcrash when running under rr + * Remove unused includes +- Replace foo-devel with cmake(KF5Foo) in build requirements + +------------------------------------------------------------------- Old: ---- kcrash-5.61.0.tar.xz kcrash-5.61.0.tar.xz.sig New: ---- kcrash-5.62.0.tar.xz kcrash-5.62.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcrash.spec ++++++ --- /var/tmp/diff_new_pack.WeURk0/_old 2019-09-23 12:22:07.541760477 +0200 +++ /var/tmp/diff_new_pack.WeURk0/_new 2019-09-23 12:22:07.541760477 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Crash5 -%define _tar_path 5.61 +%define _tar_path 5.62 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kcrash -Version: 5.61.0 +Version: 5.62.0 Release: 0 Summary: An application crash handler License: LGPL-2.1-or-later @@ -40,10 +40,10 @@ BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} BuildRequires: pkgconfig +BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} +BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} BuildRequires: cmake(Qt5Core) >= 5.6.0 BuildRequires: cmake(Qt5Test) >= 5.6.0 BuildRequires: cmake(Qt5X11Extras) >= 5.6.0 ++++++ kcrash-5.61.0.tar.xz -> kcrash-5.62.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.61.0/CMakeLists.txt new/kcrash-5.62.0/CMakeLists.txt --- old/kcrash-5.61.0/CMakeLists.txt 2019-08-03 21:31:41.000000000 +0200 +++ new/kcrash-5.62.0/CMakeLists.txt 2019-09-07 14:33:30.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.61.0") # handled by release scripts -set(KF5_DEP_VERSION "5.61.0") # handled by release scripts +set(KF5_VERSION "5.62.0") # handled by release scripts +set(KF5_DEP_VERSION "5.62.0") # handled by release scripts project(KCrash VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.61.0 NO_MODULE) +find_package(ECM 5.62.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.61.0/autotests/kcrashtest.cpp new/kcrash-5.62.0/autotests/kcrashtest.cpp --- old/kcrash-5.61.0/autotests/kcrashtest.cpp 2019-08-03 21:31:41.000000000 +0200 +++ new/kcrash-5.62.0/autotests/kcrashtest.cpp 2019-09-07 14:33:30.000000000 +0200 @@ -20,7 +20,6 @@ #include <QProcess> #include <QFile> #include <QTest> -#include <QSignalSpy> #include <QDebug> class KCrashTest : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.61.0/src/kcrash.cpp new/kcrash-5.62.0/src/kcrash.cpp --- old/kcrash-5.61.0/src/kcrash.cpp 2019-08-03 21:31:41.000000000 +0200 +++ new/kcrash-5.62.0/src/kcrash.cpp 2019-09-07 14:33:30.000000000 +0200 @@ -49,11 +49,10 @@ #include <QDebug> #include <QGuiApplication> -#include <QFileInfo> -#include <QDir> #include <QStandardPaths> #include <QThread> #include <QLibraryInfo> +#include <QFile> #include <QLoggingCategory> Q_DECLARE_LOGGING_CATEGORY(LOG_KCRASH) @@ -108,6 +107,39 @@ static void kcrashInitialize() { + + // Static because in some cases this is called multiple times + // but if an application had any of the bad cases we always want + // to skip the check + static bool doAutoInitKCrash = true; + + if (!doAutoInitKCrash) { + return; + } + + QCoreApplication *app = QCoreApplication::instance(); + if (!app) { + doAutoInitKCrash = false; + return; + } + + if (!QCoreApplication::startingUp()) { + // If the app has already started, this means we're not being run as part of + // qt_call_pre_routines, which most probably means that we're being run as part + // of KCrash being loaded as part of some plugin of the app, so don't + // do any magic + doAutoInitKCrash = false; + return; + } + + if (!QCoreApplication::eventDispatcher()) { + // We are called with event dispatcher being null when KCrash is being loaded + // through plasma-integration instead of being linked to the app (i.e. QtCreator vs Okular) + // For apps that don't link directly to KCrash do not do the magic + doAutoInitKCrash = false; + return; + } + KCrash::initialize(); } Q_COREAPP_STARTUP_FUNCTION(kcrashInitialize) @@ -129,7 +161,8 @@ } const QStringList args = QCoreApplication::arguments(); if (!qEnvironmentVariableIsSet("KDE_DEBUG") - && !qEnvironmentVariableIsSet("KCRASH_AUTO_RESTARTED")) { + && !qEnvironmentVariableIsSet("KCRASH_AUTO_RESTARTED") + && !qEnvironmentVariableIntValue("RUNNING_UNDER_RR")) { // enable drkonqi KCrash::setDrKonqiEnabled(true); } else {
