Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcrash for openSUSE:Factory checked in at 2022-05-16 18:06:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcrash (Old) and /work/SRC/openSUSE:Factory/.kcrash.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcrash" Mon May 16 18:06:44 2022 rev:103 rq:977159 version:5.94.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcrash/kcrash.changes 2022-04-11 23:48:13.959763636 +0200 +++ /work/SRC/openSUSE:Factory/.kcrash.new.1538/kcrash.changes 2022-05-16 18:08:23.681267105 +0200 @@ -1,0 +2,12 @@ +Tue May 10 08:17:50 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.94.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.94.0 +- Changes since 5.93.0: + * Port away from QX11Info + * Remove Android CI + * Add windows CI + +------------------------------------------------------------------- Old: ---- kcrash-5.93.0.tar.xz kcrash-5.93.0.tar.xz.sig New: ---- kcrash-5.94.0.tar.xz kcrash-5.94.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcrash.spec ++++++ --- /var/tmp/diff_new_pack.L2tRBi/_old 2022-05-16 18:08:24.281267673 +0200 +++ /var/tmp/diff_new_pack.L2tRBi/_new 2022-05-16 18:08:24.285267677 +0200 @@ -17,7 +17,7 @@ %define lname libKF5Crash5 -%define _tar_path 5.93 +%define _tar_path 5.94 # 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 released Name: kcrash -Version: 5.93.0 +Version: 5.94.0 Release: 0 Summary: An application crash handler License: LGPL-2.1-or-later ++++++ kcrash-5.93.0.tar.xz -> kcrash-5.94.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.93.0/.gitlab-ci.yml new/kcrash-5.94.0/.gitlab-ci.yml --- old/kcrash-5.93.0/.gitlab-ci.yml 2022-04-02 11:57:00.000000000 +0200 +++ new/kcrash-5.94.0/.gitlab-ci.yml 2022-04-29 17:45:10.000000000 +0200 @@ -3,7 +3,6 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.93.0/.kde-ci.yml new/kcrash-5.94.0/.kde-ci.yml --- old/kcrash-5.93.0/.kde-ci.yml 2022-04-02 11:57:00.000000000 +0200 +++ new/kcrash-5.94.0/.kde-ci.yml 2022-04-29 17:45:10.000000000 +0200 @@ -7,4 +7,4 @@ Options: test-before-installing: True - require-passing-tests-on: [ 'Linux', 'FreeBSD' ] + require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.93.0/CMakeLists.txt new/kcrash-5.94.0/CMakeLists.txt --- old/kcrash-5.93.0/CMakeLists.txt 2022-04-02 11:57:00.000000000 +0200 +++ new/kcrash-5.94.0/CMakeLists.txt 2022-04-29 17:45:10.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.93.0") # handled by release scripts +set(KF_VERSION "5.94.0") # handled by release scripts set(KF_DEP_VERSION "5.93.0") # handled by release scripts project(KCrash VERSION ${KF_VERSION}) @@ -30,8 +30,6 @@ find_package(X11 REQUIRED) if (QT_MAJOR_VERSION STREQUAL "5") find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) - elseif (QT_MAJOR_VERSION STREQUAL "6") - find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # Gui/private/qtx11extras_p.h endif() set(HAVE_X11 TRUE) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.93.0/KF5CrashConfig.cmake.in new/kcrash-5.94.0/KF5CrashConfig.cmake.in --- old/kcrash-5.93.0/KF5CrashConfig.cmake.in 2022-04-02 11:57:00.000000000 +0200 +++ new/kcrash-5.94.0/KF5CrashConfig.cmake.in 2022-04-29 17:45:10.000000000 +0200 @@ -12,8 +12,6 @@ if (@WITH_X11@) if (TARGET Qt5::Core) find_dependency(Qt5X11Extras REQUIRED) - elseif(TARGET Qt6::Core) - find_dependency(Qt6Gui REQUIRED) # Gui/private/qtx11extras_p.h endif() find_dependency(X11 REQUIRED) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.93.0/src/CMakeLists.txt new/kcrash-5.94.0/src/CMakeLists.txt --- old/kcrash-5.93.0/src/CMakeLists.txt 2022-04-02 11:57:00.000000000 +0200 +++ new/kcrash-5.94.0/src/CMakeLists.txt 2022-04-29 17:45:10.000000000 +0200 @@ -40,13 +40,11 @@ endif () if(WITH_X11) - if (TARGET Qt5::X11Extras) - set(_qt_x11_libs Qt5::X11Extras) - elseif (TARGET Qt6::Gui) - set(_qt_x11_libs Qt6::GuiPrivate) # Gui/private/qtx11extras_p.h + if (QT_MAJOR_VERSION STREQUAL "5") + target_link_libraries(KF5Crash PRIVATE Qt5::X11Extras) endif() - target_link_libraries(KF5Crash PRIVATE X11::X11 ${_qt_x11_libs}) + target_link_libraries(KF5Crash PRIVATE X11::X11) endif() set_target_properties(KF5Crash PROPERTIES VERSION ${KCrash_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.93.0/src/kcrash.cpp new/kcrash-5.94.0/src/kcrash.cpp --- old/kcrash-5.93.0/src/kcrash.cpp 2022-04-02 11:57:00.000000000 +0200 +++ new/kcrash-5.94.0/src/kcrash.cpp 2022-04-29 17:45:10.000000000 +0200 @@ -55,9 +55,7 @@ #if HAVE_X11 #include <X11/Xlib.h> -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -#include <private/qtx11extras_p.h> -#else +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QX11Info> #endif #endif @@ -495,8 +493,13 @@ if (platformName == QByteArrayLiteral("xcb")) { // start up on the correct display char *display = nullptr; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if (QX11Info::display()) { display = XDisplayString(QX11Info::display()); +#else + if (auto disp = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()->display()) { + display = XDisplayString(disp); +#endif } else { display = getenv("DISPLAY"); } @@ -597,9 +600,15 @@ closeAllFDs(); } #if HAVE_X11 +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) else if (QX11Info::display()) { close(ConnectionNumber(QX11Info::display())); } +#else + else if (auto display = qGuiApp->nativeInterface<QNativeInterface::QX11Application>()->display()) { + close(ConnectionNumber(display)); + } +#endif #endif #endif
