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-01-11 21:16:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcrash (Old) and /work/SRC/openSUSE:Factory/.kcrash.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcrash" Tue Jan 11 21:16:08 2022 rev:99 rq:945043 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcrash/kcrash.changes 2021-12-13 20:43:52.884481294 +0100 +++ /work/SRC/openSUSE:Factory/.kcrash.new.1892/kcrash.changes 2022-01-11 21:18:33.512928819 +0100 @@ -1,0 +2,10 @@ +Mon Jan 3 12:47:22 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Change the build system to enable building with Qt 6 + +------------------------------------------------------------------- Old: ---- kcrash-5.89.0.tar.xz kcrash-5.89.0.tar.xz.sig New: ---- kcrash-5.90.0.tar.xz kcrash-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcrash.spec ++++++ --- /var/tmp/diff_new_pack.M1OWYe/_old 2022-01-11 21:18:34.104929235 +0100 +++ /var/tmp/diff_new_pack.M1OWYe/_new 2022-01-11 21:18:34.108929238 +0100 @@ -17,22 +17,22 @@ %define lname libKF5Crash5 -%define _tar_path 5.89 +%define _tar_path 5.90 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: kcrash -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: An application crash handler License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif ++++++ kcrash-5.89.0.tar.xz -> kcrash-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.89.0/CMakeLists.txt new/kcrash-5.90.0/CMakeLists.txt --- old/kcrash-5.89.0/CMakeLists.txt 2021-12-04 17:57:45.000000000 +0100 +++ new/kcrash-5.90.0/CMakeLists.txt 2022-01-01 13:13:03.000000000 +0100 @@ -1,23 +1,24 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project(KCrash VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(KDEGitCommitHooks) +set(REQUIRED_QT_VERSION 5.15.2) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) + if (UNIX AND NOT APPLE AND NOT ANDROID) option(WITH_X11 "Build with X11 integration" ON) else() @@ -26,10 +27,14 @@ if (WITH_X11) find_package(X11 REQUIRED) - find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) + 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() - +find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG REQUIRED) include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) @@ -57,7 +62,7 @@ "Raising signals to kernel core patterns (iff the pattern is a process). You may wish to not install drkonqi if this can cause a UI conflict.") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) @@ -95,7 +100,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/kcrash_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.89.0/KF5CrashConfig.cmake.in new/kcrash-5.90.0/KF5CrashConfig.cmake.in --- old/kcrash-5.89.0/KF5CrashConfig.cmake.in 2021-12-04 17:57:45.000000000 +0100 +++ new/kcrash-5.90.0/KF5CrashConfig.cmake.in 2022-01-01 13:13:03.000000000 +0100 @@ -3,14 +3,18 @@ # Any changes in this file will be overwritten by CMake. include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) if (NOT @BUILD_SHARED_LIBS@) find_dependency(KF5CoreAddons REQUIRED) find_dependency(KF5WindowSystem REQUIRED) if (@WITH_X11@) - find_dependency(Qt5X11Extras REQUIRED) + 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() endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.89.0/autotests/CMakeLists.txt new/kcrash-5.90.0/autotests/CMakeLists.txt --- old/kcrash-5.89.0/autotests/CMakeLists.txt 2021-12-04 17:57:45.000000000 +0100 +++ new/kcrash-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:13:03.000000000 +0100 @@ -2,16 +2,15 @@ include(ECMAddTests) -find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) -find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG QUIET) +find_package(Qt${QT_MAJOR_VERSION}Widgets ${REQUIRED_QT_VERSION} CONFIG QUIET) -if(NOT Qt5Test_FOUND) - message(STATUS "Qt5Test not found, autotests will not be built.") +if(NOT TARGET Qt${QT_MAJOR_VERSION}::Test) + message(STATUS "Qt${QT_MAJOR_VERSION}Test not found, autotests will not be built.") return() endif() -if(NOT Qt5Widgets_FOUND) - message(STATUS "Qt5Widgets not found, autotests will not be built.") +if(NOT Qt${QT_MAJOR_VERSION}Widgets_FOUND) + message(STATUS "Qt${QT_MAJOR_VERSION}Widgets not found, autotests will not be built.") return() endif() @@ -23,11 +22,11 @@ if(NOT WIN32) ecm_add_tests( kcrashtest.cpp - LINK_LIBRARIES Qt5::Core Qt5::Test + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Test ) add_executable(test_crasher test_crasher.cpp) - target_link_libraries(test_crasher Qt5::Widgets KF5::Crash) + target_link_libraries(test_crasher Qt${QT_MAJOR_VERSION}::Widgets KF5::Crash) ecm_mark_as_test(test_crasher) ecm_mark_nongui_executable(test_crasher) @@ -36,10 +35,10 @@ ecm_add_tests( coreconfigtest.cpp - LINK_LIBRARIES Qt5::Core Qt5::Test + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Test ) ecm_add_tests( metadatatest.cpp - LINK_LIBRARIES Qt5::Core Qt5::Test + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Test ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.89.0/src/CMakeLists.txt new/kcrash-5.90.0/src/CMakeLists.txt --- old/kcrash-5.89.0/src/CMakeLists.txt 2021-12-04 17:57:45.000000000 +0100 +++ new/kcrash-5.90.0/src/CMakeLists.txt 2022-01-01 13:13:03.000000000 +0100 @@ -25,9 +25,9 @@ generate_export_header(KF5Crash BASE_NAME KCrash) -target_include_directories(KF5Crash INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KCrash>") +target_include_directories(KF5Crash INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KCrash>") -target_link_libraries(KF5Crash PUBLIC Qt5::Core) +target_link_libraries(KF5Crash PUBLIC Qt${QT_MAJOR_VERSION}::Core) target_link_libraries(KF5Crash PRIVATE KF5::CoreAddons KF5::WindowSystem) # FIXME: It is needed to work around undefined reference error on FreeBSD @@ -40,7 +40,13 @@ endif () if(WITH_X11) - target_link_libraries(KF5Crash PRIVATE Qt5::X11Extras X11::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 + endif() + + target_link_libraries(KF5Crash PRIVATE X11::X11 ${_qt_x11_libs}) endif() set_target_properties(KF5Crash PROPERTIES VERSION ${KCrash_VERSION} @@ -60,7 +66,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcrash_export.h ${KCrash_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KCrash COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KCrash COMPONENT Devel ) ecm_qt_install_logging_categories( @@ -94,5 +100,5 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KCrash LIB_NAME KF5Crash DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KCrash) +ecm_generate_pri_file(BASE_NAME KCrash LIB_NAME KF5Crash DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KCrash) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-5.89.0/src/kcrash.cpp new/kcrash-5.90.0/src/kcrash.cpp --- old/kcrash-5.89.0/src/kcrash.cpp 2021-12-04 17:57:45.000000000 +0100 +++ new/kcrash-5.90.0/src/kcrash.cpp 2022-01-01 13:13:03.000000000 +0100 @@ -55,7 +55,11 @@ #if HAVE_X11 #include <X11/Xlib.h> -#include <qx11info_x11.h> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <private/qtx11extras_p.h> +#else +#include <QX11Info> +#endif #endif #include "coreconfig_p.h"
