Hello community, here is the log from the commit of package kcrash for openSUSE:Factory checked in at 2018-01-22 15:59:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcrash (Old) and /work/SRC/openSUSE:Factory/.kcrash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcrash" Mon Jan 22 15:59:11 2018 rev:50 rq:566665 version:5.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcrash/kcrash.changes 2018-01-09 14:41:38.192315104 +0100 +++ /work/SRC/openSUSE:Factory/.kcrash.new/kcrash.changes 2018-01-22 15:59:20.735757030 +0100 @@ -1,0 +2,14 @@ +Tue Jan 16 22:50:15 CET 2018 - [email protected] + +- Update to 5.42.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.42.0.php +- Changes since 5.41.0: + * Remove obsolete reviewboardrc file + * Fix build on Linux without X11 + * Autotest: fix it to avoid a SIGPIPE. + * Add autotest for KCrash::AlwaysDirectly + * Add categories file for kdebugsettings + +------------------------------------------------------------------- Old: ---- kcrash-5.41.0.tar.xz New: ---- kcrash-5.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcrash.spec ++++++ --- /var/tmp/diff_new_pack.TL1uja/_old 2018-01-22 15:59:21.519720341 +0100 +++ /var/tmp/diff_new_pack.TL1uja/_new 2018-01-22 15:59:21.523720153 +0100 @@ -1,7 +1,7 @@ # # spec file for package kcrash # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ %define lname libKF5Crash5 -%define _tar_path 5.41 +%define _tar_path 5.42 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kcrash -Version: 5.41.0 +Version: 5.42.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -85,6 +85,7 @@ %defattr(-,root,root) %doc COPYING* README* %{_kf5_libdir}/libKF5Crash.so.* +%{_kf5_debugdir}/*.categories %files devel %defattr(-,root,root) ++++++ kcrash-5.41.0.tar.xz -> kcrash-5.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.41.0/.reviewboardrc new/kcrash-5.42.0/.reviewboardrc --- old/kcrash-5.41.0/.reviewboardrc 2017-12-02 10:55:44.000000000 +0100 +++ new/kcrash-5.42.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/kcrash' -BRANCH = 'master' -TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.41.0/CMakeLists.txt new/kcrash-5.42.0/CMakeLists.txt --- old/kcrash-5.41.0/CMakeLists.txt 2017-12-02 10:55:44.000000000 +0100 +++ new/kcrash-5.42.0/CMakeLists.txt 2018-01-06 00:41:18.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.41.0") # handled by release scripts -set(KF5_DEP_VERSION "5.41.0") # handled by release scripts +set(KF5_VERSION "5.42.0") # handled by release scripts +set(KF5_DEP_VERSION "5.42.0") # handled by release scripts project(KCrash VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.41.0 NO_MODULE) +find_package(ECM 5.42.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) @@ -99,4 +99,6 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +install(FILES kcrash.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.41.0/autotests/kcrashtest.cpp new/kcrash-5.42.0/autotests/kcrashtest.cpp --- old/kcrash-5.41.0/autotests/kcrashtest.cpp 2017-12-02 10:55:44.000000000 +0100 +++ new/kcrash-5.42.0/autotests/kcrashtest.cpp 2018-01-06 00:41:18.000000000 +0100 @@ -34,6 +34,7 @@ QDir::setCurrent(QCoreApplication::applicationDirPath()); } void testAutoRestart(); + void testAutoRestartDirectly(); void testEmergencySave(); }; @@ -66,6 +67,7 @@ QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert(QStringLiteral("ASAN_OPTIONS"), QStringLiteral("handle_segv=0,poison_heap=0")); // Disable ASAN proc.setProcessEnvironment(env); + proc.setProcessChannelMode(QProcess::ForwardedChannels); proc.start(processName, QStringList() << flag); bool ok = proc.waitForFinished(); QVERIFY(ok); @@ -82,11 +84,16 @@ QCOMPARE(QString(logData), QString(expectedOutput)); } -void KCrashTest::testAutoRestart() +void KCrashTest::testAutoRestart() // use kdeinit if possible, otherwise directly (ex: on CI) { startCrasher("AR", "starting AR\nautorestarted AR\n"); } +void KCrashTest::testAutoRestartDirectly() // test directly (so a developer can test the CI case) +{ + startCrasher("ARD", "starting ARD\nautorestarted ARD\n"); +} + void KCrashTest::testEmergencySave() { startCrasher("ES", "starting ES\nsaveFunction called\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.41.0/autotests/test_crasher.cpp new/kcrash-5.42.0/autotests/test_crasher.cpp --- old/kcrash-5.41.0/autotests/test_crasher.cpp 2017-12-02 10:55:44.000000000 +0100 +++ new/kcrash-5.42.0/autotests/test_crasher.cpp 2018-01-06 00:41:18.000000000 +0100 @@ -43,6 +43,8 @@ if (flag == "AR") { // auto restart KCrash::setFlags(KCrash::AutoRestart); + } else if (flag == "ARD") { // auto restart, always directly + KCrash::setFlags(KCrash::AutoRestart | KCrash::AlwaysDirectly); } else if (flag == "ES") { // emergency save KCrash::setEmergencySaveFunction(saveFunction); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.41.0/kcrash.categories new/kcrash-5.42.0/kcrash.categories --- old/kcrash-5.41.0/kcrash.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kcrash-5.42.0/kcrash.categories 2018-01-06 00:41:18.000000000 +0100 @@ -0,0 +1,2 @@ +# Logging categories (for kdebugsettings) +org.kde.kcrash KCrash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.41.0/src/kcrash.cpp new/kcrash-5.42.0/src/kcrash.cpp --- old/kcrash-5.41.0/src/kcrash.cpp 2017-12-02 10:55:44.000000000 +0100 +++ new/kcrash-5.42.0/src/kcrash.cpp 2018-01-06 00:41:18.000000000 +0100 @@ -260,40 +260,38 @@ // The following functions copy&pasted from kinit/wrapper.cpp : // (which copied it from kdeinit/kinit.cpp) +// Can't use QGuiApplication::platformName() here, there is no app instance. +#if HAVE_X11 || HAVE_XCB static const char* displayEnvVarName_c() { - // Can't use QGuiApplication::platformName() here, there is no app instance. -#if HAVE_X11 return "DISPLAY"; -#elif defined(Q_OS_OSX) - return "MAC_DISPLAY"; -#elif defined(Q_OS_WIN) - return "WIN_DISPLAY"; -#endif } +#endif // adapted from kdeinit/kinit.cpp // WARNING, if you change the socket name, adjust kinit.cpp too static const QString generate_socket_file_name() { +#if HAVE_X11 || HAVE_XCB QByteArray display = qgetenv(displayEnvVarName_c()); if (display.isEmpty()) { -#if HAVE_X11 fprintf(stderr, "Error: could not determine $%s.\n", displayEnvVarName_c()); return QString(); - } else { -#endif - int i; - if ((i = display.lastIndexOf('.')) > display.lastIndexOf(':') && i >= 0) { - display.truncate(i); - } + } + int i; + if ((i = display.lastIndexOf('.')) > display.lastIndexOf(':') && i >= 0) { + display.truncate(i); + } - display.replace(':', '_'); + display.replace(':', '_'); #ifdef __APPLE__ - display.replace('/', '_'); + display.replace('/', '_'); +#endif +#else + // not using a DISPLAY variable; use an empty string instead + QByteArray display = ""; #endif - } const QString socketFileName = QString::fromLatin1("kdeinit5_%1").arg(QLatin1String(display)); return socketFileName; }
