Hello community, here is the log from the commit of package kcrash for openSUSE:Factory checked in at 2015-11-24 22:22:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcrash (Old) and /work/SRC/openSUSE:Factory/.kcrash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcrash" Changes: -------- --- /work/SRC/openSUSE:Factory/kcrash/kcrash.changes 2015-10-19 22:23:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcrash.new/kcrash.changes 2015-11-24 22:22:41.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Nov 8 16:58:41 UTC 2015 - [email protected] + +- Update to 5.16.0 (boo#955067) + * Improve search for drkonqui and keep it silent per default + if not found + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.16.0.php + +------------------------------------------------------------------- Old: ---- kcrash-5.15.0.tar.xz New: ---- kcrash-5.16.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcrash.spec ++++++ --- /var/tmp/diff_new_pack.jv584P/_old 2015-11-24 22:22:42.000000000 +0100 +++ /var/tmp/diff_new_pack.jv584P/_new 2015-11-24 22:22:42.000000000 +0100 @@ -17,9 +17,9 @@ %define lname libKF5Crash5 -%define _tar_path 5.15 +%define _tar_path 5.16 Name: kcrash -Version: 5.15.0 +Version: 5.16.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kcrash-5.15.0.tar.xz -> kcrash-5.16.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.15.0/CMakeLists.txt new/kcrash-5.16.0/CMakeLists.txt --- old/kcrash-5.15.0/CMakeLists.txt 2015-10-03 22:27:03.000000000 +0200 +++ new/kcrash-5.16.0/CMakeLists.txt 2015-11-08 12:02:01.000000000 +0100 @@ -3,7 +3,7 @@ project(KCrash) include(FeatureSummary) -find_package(ECM 5.15.0 NO_MODULE) +find_package(ECM 5.16.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) @@ -26,8 +26,8 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.15.0") # handled by release scripts -set(KF5_DEP_VERSION "5.15.0") # handled by release scripts +set(KF5_VERSION "5.16.0") # handled by release scripts +set(KF5_DEP_VERSION "5.16.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCrash VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcrash_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CrashConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.15.0/autotests/kcrashtest.cpp new/kcrash-5.16.0/autotests/kcrashtest.cpp --- old/kcrash-5.15.0/autotests/kcrashtest.cpp 2015-10-03 22:27:03.000000000 +0200 +++ new/kcrash-5.16.0/autotests/kcrashtest.cpp 2015-11-08 12:02:01.000000000 +0100 @@ -58,11 +58,11 @@ processName = "test_crasher.exe"; #else QVERIFY(QFile::exists("./test_crasher")); - processName = "./test_crasher"; + processName = QStringLiteral("./test_crasher"); #endif //qDebug() << proc.args(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("ASAN_OPTIONS", "handle_segv=0,poison_heap=0"); // Disable ASAN + env.insert(QStringLiteral("ASAN_OPTIONS"), QStringLiteral("handle_segv=0,poison_heap=0")); // Disable ASAN proc.setProcessEnvironment(env); proc.start(processName, QStringList() << flag); bool ok = proc.waitForFinished(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.15.0/autotests/test_crasher.cpp new/kcrash-5.16.0/autotests/test_crasher.cpp --- old/kcrash-5.15.0/autotests/test_crasher.cpp 2015-10-03 22:27:03.000000000 +0200 +++ new/kcrash-5.16.0/autotests/test_crasher.cpp 2015-11-08 12:02:01.000000000 +0100 @@ -57,7 +57,7 @@ } #endif - output.setFileName("kcrashtest_log"); + output.setFileName(QStringLiteral("kcrashtest_log")); if (!output.open(QIODevice::WriteOnly | QIODevice::Append)) return 1; if (qgetenv("KCRASH_AUTO_RESTARTED").isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.15.0/src/kcrash.cpp new/kcrash-5.16.0/src/kcrash.cpp --- old/kcrash-5.15.0/src/kcrash.cpp 2015-10-03 22:27:03.000000000 +0200 +++ new/kcrash-5.16.0/src/kcrash.cpp 2015-11-08 12:02:01.000000000 +0100 @@ -52,6 +52,17 @@ #include <QtCore/QDir> #include <QStandardPaths> #include <QThread> +#include <QLibraryInfo> + +#include <QLoggingCategory> +Q_DECLARE_LOGGING_CATEGORY(LOG_KCRASH) + +#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) +// logging category for this framework, default: log stuff >= warning +Q_LOGGING_CATEGORY(LOG_KCRASH, "org.kde.kcrash", QtWarningMsg) +#else +Q_LOGGING_CATEGORY(LOG_KCRASH, "org.kde.kcrash") +#endif #if HAVE_X11 #include <qx11info_x11.h> @@ -218,14 +229,16 @@ } s_launchDrKonqi = launchDrKonqi; if (s_launchDrKonqi && !s_drkonqiPath) { - const QList<QString> paths = QFile::decodeName(qgetenv("LIBEXEC_PATH")).split(QLatin1Char(':')); - const QString exec = QStandardPaths::findExecutable(QLatin1String("drkonqi"), paths); + // search paths + const QStringList paths = QStringList() + << QFile::decodeName(qgetenv("LIBEXEC_PATH")).split(QLatin1Char(':'), QString::SkipEmptyParts) // env var is used first + << QCoreApplication::applicationDirPath() // then look where our application binary is located + << QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) // look where libexec path is (can be set in qt.conf) + << QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR); // look at our installation location + const QString exec = QStandardPaths::findExecutable(QStringLiteral("drkonqi"), paths); if (exec.isEmpty()) { - s_drkonqiPath = qstrdup(CMAKE_INSTALL_FULL_LIBEXECDIR "/drkonqi"); - if (!QFile::exists(QLatin1String(s_drkonqiPath))) { - qWarning() << "Could not find drkonqi at" << s_drkonqiPath; - s_launchDrKonqi = 0; - } + qCDebug(LOG_KCRASH) << "Could not find drkonqi in search paths:" << paths; + s_launchDrKonqi = 0; } else { s_drkonqiPath = qstrdup(qPrintable(exec)); } @@ -286,7 +299,7 @@ if (!s_kdeinit_socket_file) { // Prepare this now to avoid mallocs in the crash handler. char *display = getDisplay(); - const QString socketFileName = QString::fromLatin1("kdeinit5_%1").arg(QLatin1String(display)); + const QString socketFileName = QStringLiteral("kdeinit5_%1").arg(QLatin1String(display)); free(display); QByteArray socketName = QFile::encodeName(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1Char('/') + socketFileName);
