Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libkdcraw for openSUSE:Factory checked in at 2024-03-11 15:27:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdcraw (Old) and /work/SRC/openSUSE:Factory/.libkdcraw.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkdcraw" Mon Mar 11 15:27:00 2024 rev:162 rq:1151044 version:24.02.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libkdcraw/libkdcraw.changes 2023-12-09 22:52:31.426010410 +0100 +++ /work/SRC/openSUSE:Factory/.libkdcraw.new.1770/libkdcraw.changes 2024-03-11 15:29:13.920032066 +0100 @@ -1,0 +2,14 @@ +Fri Feb 23 14:00:33 UTC 2024 - Christophe Marin <[email protected]> + +- Update to 24.02.0 + * New feature release +- No code change since 24.01.95 + +------------------------------------------------------------------- +Fri Feb 9 16:09:41 UTC 2024 - Christophe Marin <[email protected]> + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ +- Add a Qt6 build flavor + +------------------------------------------------------------------- Old: ---- libkdcraw-23.08.4.tar.xz libkdcraw-23.08.4.tar.xz.sig New: ---- _multibuild libkdcraw-24.02.0.tar.xz libkdcraw-24.02.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdcraw.spec ++++++ --- /var/tmp/diff_new_pack.f4SZ9I/_old 2024-03-11 15:29:14.572055996 +0100 +++ /var/tmp/diff_new_pack.f4SZ9I/_new 2024-03-11 15:29:14.572055996 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkdcraw # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,47 @@ # -%define _so 5 -%define lname libKF5KDcraw +%define rname libkdcraw +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "qt6" +%define qt6 1 +%define pkg_suffix -qt6 +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 +%define library_name libKDcrawQt6 +%define so_suffix -5 +%else +%define qt5 1 +%define kf5_version 5.91.0 +%define qt5_version 5.15.0 +%define library_name libKF5KDcraw +%define so_suffix 5 +%endif %bcond_without released -Name: libkdcraw -Version: 23.08.4 +Name: libkdcraw%{?pkg_suffix} +Version: 24.02.0 Release: 0 Summary: Shared library interface around dcraw License: LGPL-2.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: %{rname}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: %{rname}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: extra-cmake-modules -BuildRequires: kf5-filesystem BuildRequires: pkgconfig -BuildRequires: xz -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Gui) -BuildRequires: pkgconfig(libraw) >= 0.16.0 -Obsoletes: libkdcraw-kf5 < %{version} +BuildRequires: pkgconfig(libraw) >= 0.18.0 +%if 0%{?qt6} +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +%else +BuildRequires: extra-cmake-modules >= %{kf5_version} +BuildRequires: cmake(Qt5Core) >= %{qt5_version} +BuildRequires: cmake(Qt5Gui) >= %{qt5_version} Provides: libkdcraw-kf5 = %{version} +Obsoletes: libkdcraw-kf5 < %{version} +%endif %description Libkdcraw is a C++ interface around dcraw binary program used to decode @@ -48,10 +66,11 @@ This library is used by kipi-plugins, digiKam and others kipi host programs. -%package -n %{lname}%{_so} +%package -n %{library_name}%{so_suffix} Summary: Shared library interface around dcraw +Requires: %{name} >= %{version} -%description -n %{lname}%{_so} +%description -n %{library_name}%{so_suffix} Libkdcraw is a C++ interface around dcraw binary program used to decode RAW picture files. The library documentation is available on header files. @@ -61,9 +80,11 @@ %package devel Summary: Shared library interface around dcraw -Requires: %{lname}%{_so} = %{version} +Requires: %{library_name}%{so_suffix} = %{version} +%if 0%{?qt5} Obsoletes: libkdcraw-kf5-devel < %{version} Provides: libkdcraw-kf5-devel = %{version} +%endif %description devel Libkdcraw is a C++ interface around dcraw binary program used to decode @@ -74,25 +95,45 @@ programs. %prep -%autosetup -p1 +%autosetup -p1 -n %{rname}-%{version} %build - %cmake_kf5 -d build -- -DENABLE_LCMS2=true -DENABLE_RAWSPEED=true - %cmake_build +%if 0%{?qt6} +%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE +%kf6_build +%else +%cmake_kf5 -d build +%cmake_build +%endif %install - %kf5_makeinstall -C build +%if 0%{?qt6} +%kf6_install +%else +%kf5_makeinstall -C build +%endif -%ldconfig_scriptlets -n %{lname}%{_so} +%ldconfig_scriptlets -n %{library_name}%{so_suffix} -%files -n %{lname}%{_so} -%license LICENSES/* +%files +%if 0%{?qt6} +%{_kf6_debugdir}/libkdcraw.categories +%else %{_kf5_debugdir}/libkdcraw.categories -%{_kf5_libdir}/%{lname}.so.* +%endif + +%files -n %{library_name}%{so_suffix} +%license LICENSES/* +%{_libdir}/%{library_name}.so.* %files devel %doc README +%if 0%{?qt6} +%{_kf6_cmakedir}/KDcrawQt6/ +%{_includedir}/KDcrawQt6/ +%else %{_kf5_cmakedir}/KF5KDcraw/ -%{_kf5_includedir}/ -%{_kf5_libdir}/%{lname}.so +%{_kf5_includedir}/KDCRAW/ +%endif +%{_libdir}/%{library_name}.so ++++++ _multibuild ++++++ <multibuild> <flavor>qt6</flavor> </multibuild> ++++++ applications.keyring ++++++ Binary files /var/tmp/diff_new_pack.f4SZ9I/_old and /var/tmp/diff_new_pack.f4SZ9I/_new differ ++++++ libkdcraw-23.08.4.tar.xz -> libkdcraw-24.02.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdcraw-23.08.4/.gitlab-ci.yml new/libkdcraw-24.02.0/.gitlab-ci.yml --- old/libkdcraw-23.08.4/.gitlab-ci.yml 2023-06-21 02:10:04.000000000 +0200 +++ new/libkdcraw-24.02.0/.gitlab-ci.yml 2023-11-23 07:31:03.000000000 +0100 @@ -2,9 +2,11 @@ # SPDX-License-Identifier: CC0-1.0 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/linux-qt6.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/windows.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml + - project: sysadmin/ci-utilities + file: + - /gitlab-templates/linux.yml + - /gitlab-templates/linux-qt6.yml + - /gitlab-templates/freebsd.yml + - /gitlab-templates/windows.yml + - /gitlab-templates/freebsd-qt6.yml + - /gitlab-templates/windows-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdcraw-23.08.4/CMakeLists.txt new/libkdcraw-24.02.0/CMakeLists.txt --- old/libkdcraw-23.08.4/CMakeLists.txt 2023-06-21 02:10:04.000000000 +0200 +++ new/libkdcraw-24.02.0/CMakeLists.txt 2023-11-23 07:31:03.000000000 +0100 @@ -4,8 +4,8 @@ # SPDX-License-Identifier: BSD-3-Clause # -set(CMAKE_MIN_VERSION "3.5.0") -set(ECM_MIN_VERSION "5.80.0") +set(CMAKE_MIN_VERSION "3.16.0") +set(ECM_MIN_VERSION "5.91.0") set(QT_MIN_VERSION "5.15.0") set(LIBRAW_MIN_VERSION "0.18") @@ -66,10 +66,15 @@ include(CMakePackageConfigHelpers) include(ECMQtDeclareLoggingCategory) include(ECMGenerateExportHeader) +include(ECMDeprecationSettings) include(FeatureSummary) ############## Find Packages ################### +if (QT_MAJOR_VERSION STREQUAL "6") + set(QT_MIN_VERSION "6.5.0") +endif() + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core @@ -86,18 +91,15 @@ ############## Targets ######################### -add_definitions( - -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00 - -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 - -DQT_NO_KEYWORDS - -DQT_NO_FOREACH - -DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_URL_CAST_FROM_STRING - -DQT_NO_CAST_FROM_BYTEARRAY - -DQT_USE_QSTRINGBUILDER - -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -) +if (QT_MAJOR_VERSION STREQUAL "6") + ecm_set_disabled_deprecation_versions( + QT 6.5 + ) +else() + ecm_set_disabled_deprecation_versions( + QT 5.15 + ) +endif() add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdcraw-23.08.4/cmake/templates/KDcrawConfig.cmake.in new/libkdcraw-24.02.0/cmake/templates/KDcrawConfig.cmake.in --- old/libkdcraw-23.08.4/cmake/templates/KDcrawConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libkdcraw-24.02.0/cmake/templates/KDcrawConfig.cmake.in 2023-11-23 07:31:03.000000000 +0100 @@ -0,0 +1,7 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(Qt@QT_MAJOR_VERSION@Core @QT_MIN_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Gui @QT_MIN_VERSION@) + +include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdcraw-23.08.4/cmake/templates/KF5KDcrawConfig.cmake.in new/libkdcraw-24.02.0/cmake/templates/KF5KDcrawConfig.cmake.in --- old/libkdcraw-23.08.4/cmake/templates/KF5KDcrawConfig.cmake.in 2023-06-21 02:10:04.000000000 +0200 +++ new/libkdcraw-24.02.0/cmake/templates/KF5KDcrawConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# KDcrawConfig.cmake provides information about the installed KDcraw library. -# It can be used directly from CMake via find_package(KDcraw NO_MODULE) -# -# The following CMake variables are provided: -# KDcraw_VERSION_MAJOR - the major version number of KDcraw -# KDcraw_VERSION_MINOR - the minor version number of KDcraw -# KDcraw_VERSION_PATCH - the patch version number of KDcraw -# KDcraw_INCLUDE_DIRS - the include directories to use -# -# Additionally, the following imported library targets are created, which may be used directly -# with target_link_libraries(): -# KF5::KDcraw - the kdcraw library - -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @QT_MIN_VERSION@) -find_dependency(Qt5Gui @QT_MIN_VERSION@) - -include("${CMAKE_CURRENT_LIST_DIR}/KF5KDcrawTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdcraw-23.08.4/cmake/templates/KF6KDcrawConfig.cmake.in new/libkdcraw-24.02.0/cmake/templates/KF6KDcrawConfig.cmake.in --- old/libkdcraw-23.08.4/cmake/templates/KF6KDcrawConfig.cmake.in 2023-06-21 02:10:04.000000000 +0200 +++ new/libkdcraw-24.02.0/cmake/templates/KF6KDcrawConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# KDcrawConfig.cmake provides information about the installed KDcraw library. -# It can be used directly from CMake via find_package(KDcraw NO_MODULE) -# -# The following CMake variables are provided: -# KDcraw_VERSION_MAJOR - the major version number of KDcraw -# KDcraw_VERSION_MINOR - the minor version number of KDcraw -# KDcraw_VERSION_PATCH - the patch version number of KDcraw -# KDcraw_INCLUDE_DIRS - the include directories to use -# -# Additionally, the following imported library targets are created, which may be used directly -# with target_link_libraries(): -# KF6::KDcraw - the kdcraw library - -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) -find_dependency(Qt6Core @QT_MIN_VERSION@) -find_dependency(Qt6Gui @QT_MIN_VERSION@) - -include("${CMAKE_CURRENT_LIST_DIR}/KF6KDcrawTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdcraw-23.08.4/src/CMakeLists.txt new/libkdcraw-24.02.0/src/CMakeLists.txt --- old/libkdcraw-23.08.4/src/CMakeLists.txt 2023-06-21 02:10:04.000000000 +0200 +++ new/libkdcraw-24.02.0/src/CMakeLists.txt 2023-11-23 07:31:03.000000000 +0100 @@ -4,8 +4,19 @@ # SPDX-License-Identifier: BSD-3-Clause # -set(KDCRAW_INSTALL_INCLUDEDIR "${KDE_INSTALL_INCLUDEDIR_KF}/KDCRAW") -set(KDCRAW_CMAKECONFIG_NAME "KF${QT_MAJOR_VERSION}KDcraw") +if (QT_MAJOR_VERSION STREQUAL "5") + set(KDCRAW_INSTALL_INCLUDEDIR "${KDE_INSTALL_INCLUDEDIR_KF}/KDCRAW") + set(KDCRAW_CMAKECONFIG_NAME "KF5KDcraw") + set(LIBRARYFILE_NAME "KF5KDcraw") + set(TARGET_EXPORT_NAME "KDcraw") + set(NAMESPACE_NAME "KF5::") +else() + set(KDCRAW_INSTALL_INCLUDEDIR "${KDE_INSTALL_INCLUDEDIR}/KDcrawQt6") + set(KDCRAW_CMAKECONFIG_NAME "KDcrawQt6") + set(LIBRARYFILE_NAME "KDcrawQt6") + set(TARGET_EXPORT_NAME "KDcrawQt6") + set(NAMESPACE_NAME "") +endif() ecm_setup_version(${LIBKDCRAW_LIB_VERSION} VARIABLE_PREFIX KDCRAW @@ -18,6 +29,13 @@ add_library(KDcraw SHARED) +set_target_properties(KDcraw PROPERTIES + VERSION ${KDCRAW_VERSION} + SOVERSION ${KDCRAW_SOVERSION} + OUTPUT_NAME ${LIBRARYFILE_NAME} + EXPORT_NAME ${TARGET_EXPORT_NAME} +) + target_sources(KDcraw PRIVATE kdcraw.cpp kdcraw_p.cpp @@ -74,12 +92,6 @@ LibRaw::LibRaw ) -set_target_properties(KDcraw PROPERTIES - OUTPUT_NAME KF${QT_MAJOR_VERSION}KDcraw - VERSION ${KDCRAW_VERSION} - SOVERSION ${KDCRAW_SOVERSION} -) - install(TARGETS KDcraw EXPORT KDcrawTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS} ) @@ -115,7 +127,7 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/${KDCRAW_CMAKECONFIG_NAME}") configure_package_config_file( - "${CMAKE_SOURCE_DIR}/cmake/templates/${KDCRAW_CMAKECONFIG_NAME}Config.cmake.in" + "${CMAKE_SOURCE_DIR}/cmake/templates/KDcrawConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${KDCRAW_CMAKECONFIG_NAME}Config.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) @@ -130,5 +142,5 @@ install(EXPORT KDcrawTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE ${KDCRAW_CMAKECONFIG_NAME}Targets.cmake - NAMESPACE KF${QT_MAJOR_VERSION}:: + NAMESPACE ${NAMESPACE_NAME} )
