Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libkcompactdisc for openSUSE:Factory checked in at 2021-08-16 10:07:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkcompactdisc (Old) and /work/SRC/openSUSE:Factory/.libkcompactdisc.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkcompactdisc" Mon Aug 16 10:07:01 2021 rev:58 rq:911769 version:21.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libkcompactdisc/libkcompactdisc.changes 2021-07-09 23:59:29.600452644 +0200 +++ /work/SRC/openSUSE:Factory/.libkcompactdisc.new.1899/libkcompactdisc.changes 2021-08-16 10:08:48.315294633 +0200 @@ -1,0 +2,24 @@ +Fri Aug 6 09:41:56 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.08.0 +- No code change since 21.07.90 + +------------------------------------------------------------------- +Fri Jul 30 10:05:43 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.90 + * New feature release +- No code change since 21.07.80 + +------------------------------------------------------------------- +Sat Jul 17 20:06:53 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.07.80 + * New feature release +- No code change since 21.04.3 +- Only install the license files once + +------------------------------------------------------------------- Old: ---- libkcompactdisc-21.04.3.tar.xz libkcompactdisc-21.04.3.tar.xz.sig New: ---- libkcompactdisc-21.08.0.tar.xz libkcompactdisc-21.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkcompactdisc.spec ++++++ --- /var/tmp/diff_new_pack.4GwvNP/_old 2021-08-16 10:08:51.315291040 +0200 +++ /var/tmp/diff_new_pack.4GwvNP/_new 2021-08-16 10:08:51.319291036 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: libkcompactdisc -Version: 21.04.3 +Version: 21.08.0 Release: 0 Summary: CD drive library for KDE Platform License: GPL-2.0-or-later @@ -89,16 +89,13 @@ %{_kf5_libdir}/libKF5CompactDisc.so.* %files devel -%license COPYING* %{_kf5_cmakedir}/KF5CompactDisc/ %{_kf5_includedir}/KCompactDisc/ %{_kf5_includedir}/kcompactdisc_version.h %{_kf5_libdir}/libKF5CompactDisc.so -%{_kf5_mkspecsdir}/qt_KCompactDisc.pri %if %{with lang} %files lang -f %{name}.lang -%license COPYING* %endif %changelog ++++++ libkcompactdisc-21.04.3.tar.xz -> libkcompactdisc-21.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcompactdisc-21.04.3/CMakeLists.txt new/libkcompactdisc-21.08.0/CMakeLists.txt --- old/libkcompactdisc-21.04.3/CMakeLists.txt 2021-01-17 16:48:31.000000000 +0100 +++ new/libkcompactdisc-21.08.0/CMakeLists.txt 2021-05-17 02:25:27.000000000 +0200 @@ -1,9 +1,9 @@ -???cmake_minimum_required(VERSION 3.5) +???cmake_minimum_required(VERSION 3.16) project(KCompactDisc VERSION 5.0.0) -set(QT_MIN_VERSION "5.12.0") -set(KF_MIN_VERSION "5.68.0") +set(QT_MIN_VERSION "5.15.0") +set(KF_MIN_VERSION "5.80.0") # Dependencies include(FeatureSummary) @@ -16,22 +16,13 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) + include(ECMGenerateHeaders) include(ECMSetupVersion) include(ECMGeneratePriFile) include(GenerateExportHeader) include(CMakePackageConfigHelpers) -# Version Setup - -ecm_setup_version( - ${KCompactDisc_VERSION} - VARIABLE_PREFIX KCOMPACTDISC - VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_version.h - PACKAGE_VERSION_FILE ${CMAKE_CURRENT_BINARY_DIR}/KF5CompactDiscConfigVersion.cmake - SOVERSION 5 -) - # Qt5, KF5 and Phonon Packages find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus) @@ -44,9 +35,9 @@ # Sources add_definitions( - -DQT_DISABLE_DEPRECATED_BEFORE=0x050C00 + -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00 -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 - -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400 + -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000 -DKF_DEPRECATED_WARNINGS_SINCE=0x060000 -DQT_NO_FOREACH -DQT_NO_KEYWORDS @@ -64,37 +55,6 @@ add_subdirectory(tests) endif() -# Additional - -set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5CompactDisc) - -configure_package_config_file( - ${CMAKE_CURRENT_SOURCE_DIR}/KF5CompactDiscConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/KF5CompactDiscConfig.cmake - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} -) - -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/KF5CompactDiscConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/KF5CompactDiscConfigVersion.cmake - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel -) - -install(EXPORT - KF5CompactDiscTargets - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - FILE KF5CompactDiscTargets.cmake - NAMESPACE KF5:: - COMPONENT Devel -) - -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_version.h - DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" - COMPONENT Devel -) - ki18n_install(po) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcompactdisc-21.04.3/KF5CompactDiscConfig.cmake.in new/libkcompactdisc-21.08.0/KF5CompactDiscConfig.cmake.in --- old/libkcompactdisc-21.04.3/KF5CompactDiscConfig.cmake.in 2021-01-17 16:48:31.000000000 +0100 +++ new/libkcompactdisc-21.08.0/KF5CompactDiscConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @QT_MIN_VERSION@) - -include(${CMAKE_CURRENT_LIST_DIR}/KF5CompactDiscTargets.cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcompactdisc-21.04.3/po/zh_CN/libkcompactdisc.po new/libkcompactdisc-21.08.0/po/zh_CN/libkcompactdisc.po --- old/libkcompactdisc-21.04.3/po/zh_CN/libkcompactdisc.po 2021-07-06 07:20:46.000000000 +0200 +++ new/libkcompactdisc-21.08.0/po/zh_CN/libkcompactdisc.po 2021-08-06 02:16:37.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2019-05-20 03:09+0200\n" -"PO-Revision-Date: 2021-06-20 07:37\n" +"PO-Revision-Date: 2021-07-26 13:49\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcompactdisc-21.04.3/src/CMakeLists.txt new/libkcompactdisc-21.08.0/src/CMakeLists.txt --- old/libkcompactdisc-21.04.3/src/CMakeLists.txt 2021-01-17 16:48:31.000000000 +0100 +++ new/libkcompactdisc-21.08.0/src/CMakeLists.txt 2021-05-17 02:25:27.000000000 +0200 @@ -13,20 +13,49 @@ TYPE OPTIONAL PURPOSE "Play back audio CDs via ALSA") set(HAVE_ALSA ${ALSA_FOUND}) + +set(KCOMPACTDISC_INSTALL_INCLUDEDIR "${KDE_INSTALL_INCLUDEDIR_KF5}/KCompactDisc") +set(KCOMPACTDISC_CMAKECONFIG_NAME "KF5CompactDisc") + +# Version Setup + +ecm_setup_version(${KCompactDisc_VERSION} + VARIABLE_PREFIX KCOMPACTDISC + VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_version.h + PACKAGE_VERSION_FILE ${CMAKE_CURRENT_BINARY_DIR}/${KCOMPACTDISC_CMAKECONFIG_NAME}ConfigVersion.cmake + SOVERSION 5 +) + configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) +add_library(KCompactDisc SHARED) +add_library(KF5::CompactDisc ALIAS KCompactDisc) + if (HAVE_ALSA) - include_directories(${ALSA_INCLUDE_DIRS}) -endif () + target_include_directories(KCompactDisc PRIVATE ${ALSA_INCLUDE_DIRS}) +endif() + +if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU) + set(USE_WMLIB false) +else() + set(USE_WMLIB true) +endif() + +target_sources(KCompactDisc PRIVATE + kcompactdisc.cpp + kcompactdisc_p.cpp + phonon_interface.cpp +) + +if (USE_WMLIB) + target_sources(KCompactDisc PRIVATE + wmlib_interface.cpp -set(wmlib_audio_SRCS wmlib/audio/audio.c wmlib/audio/audio_arts.c wmlib/audio/audio_alsa.c wmlib/audio/audio_sun.c -) -set(wmlib_SRCS wmlib/cdda.c wmlib/cddb.c wmlib/cdrom.c @@ -48,34 +77,18 @@ wmlib/plat_scor5.c wmlib/drv_sony.c wmlib/drv_toshiba.c -) - -if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU) - set(USE_WMLIB false) -else (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU) - set(USE_WMLIB true) -endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL GNU) - -set(KCD_LIB_SRCS - kcompactdisc.cpp - kcompactdisc_p.cpp - phonon_interface.cpp -) + ) + target_compile_definitions(KCompactDisc PRIVATE -DUSE_WMLIB=1) +endif() -if (USE_WMLIB) - set(KCD_LIB_SRCS ${KCD_LIB_SRCS} wmlib_interface.cpp ${wmlib_SRCS} ${wmlib_audio_SRCS}) - add_definitions(-DUSE_WMLIB=1) -endif (USE_WMLIB) - -add_library(KF5CompactDisc SHARED ${KCD_LIB_SRCS}) -add_library(KF5::CompactDisc ALIAS KF5CompactDisc) -set_target_properties(KF5CompactDisc PROPERTIES +set_target_properties(KCompactDisc PROPERTIES VERSION ${KCOMPACTDISC_VERSION} SOVERSION ${KCOMPACTDISC_SOVERSION} + OUTPUT_NAME KF5CompactDisc EXPORT_NAME CompactDisc ) -target_link_libraries(KF5CompactDisc +target_link_libraries(KCompactDisc PUBLIC Qt5::Core PRIVATE @@ -86,34 +99,70 @@ ) if (HAVE_ALSA) - target_link_libraries(KF5CompactDisc PRIVATE ${ALSA_LIBRARY}) -endif () + target_link_libraries(KCompactDisc PRIVATE ${ALSA_LIBRARY}) +endif() if (USE_WMLIB) find_package(Threads) - target_link_libraries(KF5CompactDisc PRIVATE ${CMAKE_THREAD_LIBS_INIT}) -endif (USE_WMLIB) + target_link_libraries(KCompactDisc PRIVATE ${CMAKE_THREAD_LIBS_INIT}) +endif() + +target_include_directories(KCompactDisc + INTERFACE + "$<INSTALL_INTERFACE:${KCOMPACTDISC_INSTALL_INCLUDEDIR}>" +) -target_include_directories(KF5CompactDisc INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KCompactDisc>") ecm_generate_headers(KCompactDisc_HEADERS HEADER_NAMES KCompactDisc REQUIRED_HEADERS KCompactDisc_HEADERS ) -generate_export_header(KF5CompactDisc BASE_NAME KCompactDisc) +generate_export_header(KCompactDisc BASE_NAME KCompactDisc) + + +install(TARGETS KCompactDisc EXPORT KCompactDiscTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_export.h + ${KCompactDisc_HEADERS} + DESTINATION ${KCOMPACTDISC_INSTALL_INCLUDEDIR} + COMPONENT Devel +) +install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) + + +set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_CMAKEPACKAGEDIR}/${KCOMPACTDISC_CMAKECONFIG_NAME}) + +configure_package_config_file( + ${CMAKE_CURRENT_SOURCE_DIR}/${KCOMPACTDISC_CMAKECONFIG_NAME}Config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${KCOMPACTDISC_CMAKECONFIG_NAME}Config.cmake + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${KCOMPACTDISC_CMAKECONFIG_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${KCOMPACTDISC_CMAKECONFIG_NAME}ConfigVersion.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel +) + +install(EXPORT + KCompactDiscTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE ${KCOMPACTDISC_CMAKECONFIG_NAME}Targets.cmake + NAMESPACE KF5:: + COMPONENT Devel +) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_version.h + DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}" + COMPONENT Devel +) ecm_generate_pri_file( BASE_NAME KCompactDisc LIB_NAME KF5CompactDisc DEPS "core dbus phonon4qt5 KCoreAddons KI18n Solid" FILENAME_VAR PRI_FILENAME - INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KCompactDisc + INCLUDE_INSTALL_DIR ${KCOMPACTDISC_INSTALL_INCLUDEDIR} ) - - -install(TARGETS KF5CompactDisc EXPORT KF5CompactDiscTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_export.h - ${KCompactDisc_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KCompactDisc COMPONENT Devel) -install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkcompactdisc-21.04.3/src/KF5CompactDiscConfig.cmake.in new/libkcompactdisc-21.08.0/src/KF5CompactDiscConfig.cmake.in --- old/libkcompactdisc-21.04.3/src/KF5CompactDiscConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libkcompactdisc-21.08.0/src/KF5CompactDiscConfig.cmake.in 2021-05-17 02:25:27.000000000 +0200 @@ -0,0 +1,6 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(Qt5Core @QT_MIN_VERSION@) + +include(${CMAKE_CURRENT_LIST_DIR}/KF5CompactDiscTargets.cmake)