Hello community, here is the log from the commit of package kcrash for openSUSE:Factory checked in at 2014-03-10 12:17: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 2014-02-24 06:53:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcrash.new/kcrash.changes 2014-03-10 12:17:42.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:39:13 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- kcrash-4.96.0.tar.xz New: ---- kcrash-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcrash.spec ++++++ --- /var/tmp/diff_new_pack.jc5ET9/_old 2014-03-10 12:17:43.000000000 +0100 +++ /var/tmp/diff_new_pack.jc5ET9/_new 2014-03-10 12:17:43.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5Crash4 +%define lname libKF5Crash5 Name: kcrash -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kf5-filesystem ++++++ kcrash-4.96.0.tar.xz -> kcrash-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.96.0/CMakeLists.txt new/kcrash-4.97.0/CMakeLists.txt --- old/kcrash-4.96.0/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kcrash-4.97.0/CMakeLists.txt 2014-03-01 12:50:23.000000000 +0100 @@ -2,7 +2,7 @@ project(KCrash) -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION 5.2.0) @@ -11,7 +11,10 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -find_package(X11) +if (NOT APPLE) + find_package(X11) +endif() + set(HAVE_X11 ${X11_FOUND}) include(FeatureSummary) @@ -19,10 +22,11 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") 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") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CrashConfigVersion.cmake" + SOVERSION 5) if(NOT kdelibs_SOURCE_DIR) find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED) @@ -35,9 +39,9 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Crash") -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5CrashConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5CrashConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.96.0/autotests/test_crasher.cpp new/kcrash-4.97.0/autotests/test_crasher.cpp --- old/kcrash-4.96.0/autotests/test_crasher.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kcrash-4.97.0/autotests/test_crasher.cpp 2014-03-01 12:50:23.000000000 +0100 @@ -23,6 +23,7 @@ #include <kcrash.h> #ifdef Q_OS_UNIX #include <sys/resource.h> // setrlimit +#include <errno.h> #endif QFile output; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.96.0/src/CMakeLists.txt new/kcrash-4.97.0/src/CMakeLists.txt --- old/kcrash-4.96.0/src/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kcrash-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:23.000000000 +0100 @@ -41,13 +41,12 @@ EXPORT_NAME Crash ) -ecm_generate_headers( +ecm_generate_headers(KCrash_HEADERS + HEADER_NAMES KCrash - MODULE_NAME KCrash REQUIRED_HEADERS KCrash_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KCrash DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5Crash EXPORT KF5CrashTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.96.0/src/kcrash.cpp new/kcrash-4.97.0/src/kcrash.cpp --- old/kcrash-4.96.0/src/kcrash.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kcrash-4.97.0/src/kcrash.cpp 2014-03-01 12:50:23.000000000 +0100 @@ -36,6 +36,7 @@ #ifndef Q_OS_WIN #include <sys/resource.h> #include <sys/un.h> +#include <errno.h> #else #include <qt_windows.h> #endif @@ -47,7 +48,7 @@ #include <kstartupinfo.h> #include <QDebug> -#include <QCoreApplication> +#include <QGuiApplication> #include <QtCore/QFileInfo> #include <QtCore/QDir> #include <QStandardPaths> @@ -404,19 +405,27 @@ return; } - const char *argv[27]; // don't forget to update this + const char *argv[29]; // don't forget to update this int i = 0; // argument 0 has to be drkonqi argv[i++] = s_drkonqiPath; + const QByteArray platformName = QGuiApplication::platformName().toUtf8(); + if (!platformName.isEmpty()) { + argv[i++] = "-platform"; + argv[i++] = platformName.constData(); + } + #if HAVE_X11 - // start up on the correct display - argv[i++] = "-display"; - if (QX11Info::display()) { - argv[i++] = XDisplayString(QX11Info::display()); - } else { - argv[i++] = getenv("DISPLAY"); + if (platformName == QByteArrayLiteral("xcb")) { + // start up on the correct display + argv[i++] = "-display"; + if (QX11Info::display()) { + argv[i++] = XDisplayString(QX11Info::display()); + } else { + argv[i++] = getenv("DISPLAY"); + } } #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
