Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ktnef for openSUSE:Factory checked in at 2023-04-23 22:45:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktnef (Old) and /work/SRC/openSUSE:Factory/.ktnef.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktnef" Sun Apr 23 22:45:20 2023 rev:91 rq:1082142 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ktnef/ktnef.changes 2023-03-03 22:26:43.822994863 +0100 +++ /work/SRC/openSUSE:Factory/.ktnef.new.1533/ktnef.changes 2023-04-23 22:47:16.682648560 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:46:20 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.04.0/ + +------------------------------------------------------------------- +Fri Mar 31 16:42:28 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:44:08 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- ktnef-22.12.3.tar.xz ktnef-22.12.3.tar.xz.sig New: ---- ktnef-23.04.0.tar.xz ktnef-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktnef.spec ++++++ --- /var/tmp/diff_new_pack.tw1COS/_old 2023-04-23 22:47:17.194651453 +0200 +++ /var/tmp/diff_new_pack.tw1COS/_new 2023-04-23 22:47:17.202651498 +0200 @@ -16,14 +16,13 @@ # -%define kf5_version 5.99.0 -# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%define kf5_version 5.103.0 +%define libname libKPim5Tnef5 %bcond_without released Name: ktnef -Version: 22.12.3 +Version: 23.04.0 Release: 0 -Summary: KDE PIM Libraries: TNEF support +Summary: TNEF support License: LGPL-2.1-or-later URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz @@ -34,29 +33,39 @@ BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: cmake(KF5CalendarCore) -BuildRequires: cmake(KF5CalendarUtils) BuildRequires: cmake(KF5Contacts) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KPim5CalendarUtils) BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Widgets) %description This package contains additional libraries for KDE PIM applications. -%package -n libKF5Tnef5 -Summary: KDE PIM Libraries: TNEF Support +%package common +Summary: Files requires by libKPim5Tnef5 +Conflicts: libKF5Tnef5 < %{version} + +%description common +Files that can't be in the libKPim5Tnef5 package anymore. + +%package -n %{libname} +Summary: TNEF Support +%requires_eq ktnef-common -%description -n libKF5Tnef5 +%description -n %{libname} This package contains the TNEF support library for KDE PIM applications %package devel -Summary: KDE PIM Libraries: Build Environment -Requires: libKF5Tnef5 = %{version} +Summary: Development files for libKPim5Tnef5 +Requires: %{libname} = %{version} Requires: cmake(KF5CalendarCore) %description devel This package contains necessary include files and libraries needed to develop KDE PIM applications. -%lang_package +%lang_package -n %{libname} %prep %autosetup -p1 -n ktnef-%{version} @@ -68,22 +77,26 @@ %install %kf5_makeinstall -C build -%find_lang %{name} --with-man --all-name +%find_lang %{libname} --with-man --all-name -%ldconfig_scriptlets -n libKF5Tnef5 +%ldconfig_scriptlets -n %{libname} -%files -n libKF5Tnef5 +%files common %license LICENSES/* -%{_kf5_libdir}/libKF5Tnef.so.* %{_kf5_debugdir}/*.categories %{_kf5_debugdir}/*.renamecategories +%files -n %{libname} +%{_kf5_libdir}/libKPim5Tnef.so.* + %files devel +%dir %{_includedir}/KPim5 +%{_includedir}/KPim5/KTNEF/ %{_kf5_cmakedir}/KF5Tnef/ -%{_kf5_includedir}/KTNEF/ -%{_kf5_libdir}/libKF5Tnef.so +%{_kf5_cmakedir}/KPim5Tnef/ +%{_kf5_libdir}/libKPim5Tnef.so %{_kf5_mkspecsdir}/qt_KTNef.pri -%files lang -f %{name}.lang +%files -n %{libname}-lang -f %{libname}.lang %changelog ++++++ ktnef-22.12.3.tar.xz -> ktnef-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/.gitlab-ci.yml new/ktnef-23.04.0/.gitlab-ci.yml --- old/ktnef-22.12.3/.gitlab-ci.yml 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/.gitlab-ci.yml 2023-04-11 06:38:19.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2020-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 include: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/.kde-ci.yml new/ktnef-23.04.0/.kde-ci.yml --- old/ktnef-22.12.3/.kde-ci.yml 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/.kde-ci.yml 2023-04-11 06:38:19.000000000 +0200 @@ -2,9 +2,19 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'frameworks/kcontacts' : '@latest' 'frameworks/kcalendarcore' : '@latest' 'pim/kcalutils' : '@same' + +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/kcontacts' : '@latest-kf6' + 'frameworks/kcalendarcore' : '@latest-kf6' + 'pim/kcalutils' : '@latest-kf6' + +Options: + require-passing-tests-on: [ 'Linux', 'FreeBSD' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/CMakeLists.txt new/ktnef-23.04.0/CMakeLists.txt --- old/ktnef-22.12.3/CMakeLists.txt 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/CMakeLists.txt 2023-04-11 06:38:19.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.22.3") +set(PIM_VERSION "5.23.0") project(KTnef VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.99.0") +set(KF_MIN_VERSION "5.103.0") -find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) @@ -29,55 +29,93 @@ set(KTNEF_LIB_VERSION ${PIM_VERSION}) -set(CALENDARUTILS_LIB_VERSION "5.22.3") +set(CALENDARUTILS_LIB_VERSION "5.23.0") set(QT_REQUIRED_VERSION "5.15.2") if (QT_MAJOR_VERSION STREQUAL "6") set(QT_REQUIRED_VERSION "6.4.0") + set(KF_MIN_VERSION "5.240.0") + set(KF_MAJOR_VERSION "6") +else() + set(KF_MIN_VERSION "5.100.0") + set(KF_MAJOR_VERSION "5") endif() ecm_setup_version(PROJECT VARIABLE_PREFIX KTNEF VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ktnef_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5TnefConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}TnefConfigVersion.cmake" SOVERSION 5 ) ########### Find packages ########### -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Tnef") - +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Tnef") +set(KTNEF_KF5_COMPAT FALSE) find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) -find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}CalendarCore ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KPim${KF_MAJOR_VERSION}CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}Contacts ${KF_MIN_VERSION} CONFIG REQUIRED) +find_package(KF${KF_MAJOR_VERSION}I18n ${KF_MIN_VERSION} CONFIG REQUIRED) -ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.99.0) +ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.104.0) configure_package_config_file( - "${KTnef_SOURCE_DIR}/KF5TnefConfig.cmake.in" - "${KTnef_BINARY_DIR}/KF5TnefConfig.cmake" + "${KTnef_SOURCE_DIR}/KPimTnefConfig.cmake.in" + "${KTnef_BINARY_DIR}/KPim${KF_MAJOR_VERSION}TnefConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${KTnef_BINARY_DIR}/KF5TnefConfig.cmake" - "${KTnef_BINARY_DIR}/KF5TnefConfigVersion.cmake" + "${KTnef_BINARY_DIR}/KPim${KF_MAJOR_VERSION}TnefConfig.cmake" + "${KTnef_BINARY_DIR}/KPim${KF_MAJOR_VERSION}TnefConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT KF5TnefTargets +install(EXPORT KPim${KF_MAJOR_VERSION}TnefTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - FILE KF5TnefTargets.cmake - NAMESPACE KF5:: + FILE KPim${KF_MAJOR_VERSION}TnefTargets.cmake + NAMESPACE KPim${KF_MAJOR_VERSION}:: ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ktnef_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KTNEF/ + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KTNEF/ COMPONENT Devel ) +option(BUILD_WITH_COMPAT_LIBS "Generate compat cmake file (Set at false will allow to co-install lib)" ON) + +if (BUILD_WITH_COMPAT_LIBS) +if (QT_MAJOR_VERSION STREQUAL "5") +## +# TODO: Backwards compatiblity. Remove in next major version +## +set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Tnef") +set(KTNEF_KF5_COMPAT TRUE) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimTnefConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5TnefConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5TnefConfig.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}TnefConfigVersion.cmake" + RENAME "KF5TnefConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel +) +install(EXPORT KPim${KF_MAJOR_VERSION}TnefTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + FILE KPim${KF_MAJOR_VERSION}TnefTargets.cmake + NAMESPACE KF5:: +) +endif() +endif() add_definitions(-DTRANSLATION_DOMAIN=\"libktnef5\") option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/CMakePresets.json new/ktnef-23.04.0/CMakePresets.json --- old/ktnef-22.12.3/CMakePresets.json 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/CMakePresets.json 2023-04-11 06:38:19.000000000 +0200 @@ -5,28 +5,35 @@ "name": "base", "displayName": "base preset", "generator": "Ninja", - "binaryDir": "${sourceDir}/build-${presetName}", - "installDir": "$env{KF5}", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF5}", "hidden": true }, { - "name": "dev", - "displayName": "Build as debug", + "name": "base-qt6", + "displayName": "base preset", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF6}", + "hidden": true + }, + { + "name": "dev-mold", + "displayName": "Build as debug + using mold linker", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold" }, "inherits": [ "base" ] - }, { - "name": "coverage", + "name": "dev", "displayName": "Build as debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "BUILD_COVERAGE": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, "inherits": [ @@ -43,19 +50,7 @@ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, "inherits": [ - "base" - ] - }, - { - "name": "dev-disable-deprecated", - "displayName": "Build as without deprecated methods", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", - "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" - }, - "inherits": [ - "base" + "base-qt6" ] }, { @@ -63,20 +58,7 @@ "displayName": "Build with Asan support.", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "ECM_ENABLE_SANITIZERS" : "'address;undefined'", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - }, - "inherits": [ - "base" - ] - }, - { - "name": "pch", - "displayName": "Build with PCH support.", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "ECM_ENABLE_SANITIZERS" : "'address;undefined'" }, "inherits": [ "base" @@ -102,8 +84,7 @@ "displayName": "Build with CMake unity support.", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "USE_UNITY_CMAKE_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "USE_UNITY_CMAKE_SUPPORT": "ON" }, "inherits": [ "base" @@ -123,8 +104,19 @@ "name": "profile", "displayName": "profile", "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + }, + "inherits": [ + "base" + ] + }, + { + "name": "coverage", + "displayName": "coverage", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_UNITY_CMAKE_SUPPORT": "OFF", + "BUILD_COVERAGE": "ON" }, "inherits": [ "base" @@ -143,21 +135,36 @@ "inherits": [ "base" ] + }, + { + "name": "pch", + "displayName": "pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_PRECOMPILED_HEADERS": "ON", + "BUILD_COVERAGE": "ON" + }, + "inherits": [ + "base" + ] } - ], "buildPresets": [ { "name": "dev", "configurePreset": "dev" }, + { + "name": "dev-mold", + "configurePreset": "dev-mold" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, { - "name": "dev-disable-deprecated", - "configurePreset": "dev-disable-deprecated" + "name": "dev-clang", + "configurePreset": "dev-clang" }, { "name": "pch", @@ -168,22 +175,18 @@ "configurePreset": "release" }, { - "name": "coverage", - "configurePreset": "coverage" + "name": "unity", + "configurePreset": "unity" }, { - "name": "dev-clang", - "configurePreset": "dev-clang" + "name": "coverage", + "configurePreset": "coverage" }, - { + { "name": "asan", "configurePreset": "asan" }, { - "name": "unity", - "configurePreset": "unity" - }, - { "name": "clazy", "configurePreset": "clazy", "environment": { @@ -193,17 +196,29 @@ } ], "testPresets": [ - { + { "name": "dev", "configurePreset": "dev", "output": {"outputOnFailure": true}, "execution": {"noTestsAction": "error", "stopOnFailure": false} }, - { + { "name": "asan", "configurePreset": "asan", "output": {"outputOnFailure": true}, "execution": {"noTestsAction": "error", "stopOnFailure": true} + }, + { + "name": "unity", + "configurePreset": "unity", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + }, + { + "name": "coverage", + "configurePreset": "coverage", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} } - ] + ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/CMakePresets.json.license new/ktnef-23.04.0/CMakePresets.json.license --- old/ktnef-22.12.3/CMakePresets.json.license 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/CMakePresets.json.license 2023-04-11 06:38:19.000000000 +0200 @@ -1,2 +1,2 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: BSD-3-Clause diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/KF5TnefConfig.cmake.in new/ktnef-23.04.0/KF5TnefConfig.cmake.in --- old/ktnef-22.12.3/KF5TnefConfig.cmake.in 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/KF5TnefConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -@PACKAGE_INIT@ -include(CMakeFindDependencyMacro) -find_dependency(KF5CalendarCore "@KF5_MIN_VERSION@") - -include("${CMAKE_CURRENT_LIST_DIR}/KF5TnefTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/KPimTnefConfig.cmake.in new/ktnef-23.04.0/KPimTnefConfig.cmake.in --- old/ktnef-22.12.3/KPimTnefConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ktnef-23.04.0/KPimTnefConfig.cmake.in 2023-04-11 06:38:19.000000000 +0200 @@ -0,0 +1,15 @@ +@PACKAGE_INIT@ +include(CMakeFindDependencyMacro) +find_dependency(KF@KF_MAJOR_VERSION@CalendarCore "@KF_MIN_VERSION@") + +if (@KTNEF_KF5_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KF5Tnef) and KF5::Tnef targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@Tnef) and KPim@KF_MAJOR_VERSION@::Tnef instead. This backwards " + "compatibility will be removed in the next major version.\n" + "***********************************************\n") +endif() + + +include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/autotests/CMakeLists.txt new/ktnef-23.04.0/autotests/CMakeLists.txt --- old/ktnef-22.12.3/autotests/CMakeLists.txt 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/autotests/CMakeLists.txt 2023-04-11 06:38:19.000000000 +0200 @@ -6,4 +6,4 @@ configure_file(config-ktnef-tests.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ktnef-tests.h) -ecm_add_tests( parsertest.cpp NAME_PREFIX "ktnetf-" LINK_LIBRARIES KF5Tnef Qt::Test) +ecm_add_tests( parsertest.cpp NAME_PREFIX "ktnetf-" LINK_LIBRARIES KPim${KF_MAJOR_VERSION}Tnef Qt::Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/po/ka/libktnef5.po new/ktnef-23.04.0/po/ka/libktnef5.po --- old/ktnef-22.12.3/po/ka/libktnef5.po 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/po/ka/libktnef5.po 2023-04-11 06:38:19.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: ktnef\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-01-12 00:46+0000\n" -"PO-Revision-Date: 2022-12-27 09:50+0100\n" +"PO-Revision-Date: 2022-12-27 03:13+0100\n" "Last-Translator: Temuri Doghonadze <[email protected]>\n" "Language-Team: Georgian <[email protected]>\n" "Language: ka\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/po/tr/libktnef5.po new/ktnef-23.04.0/po/tr/libktnef5.po --- old/ktnef-22.12.3/po/tr/libktnef5.po 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/po/tr/libktnef5.po 2023-04-11 06:38:19.000000000 +0200 @@ -7,13 +7,13 @@ # Serhat Demirkol <[email protected]>, 2009. # Volkan Gezer <[email protected]>, 2013-2014. # Kaan Ozdincer <[email protected]>, 2014. -# Emir SARI <[email protected]>, 2022. +# Emir SARI <[email protected]>, 2022, 2023. msgid "" msgstr "" "Project-Id-Version: kdepimlibs-kde4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-01-12 00:46+0000\n" -"PO-Revision-Date: 2022-12-10 18:09+0300\n" +"PO-Revision-Date: 2023-04-02 17:28+0300\n" "Last-Translator: Emir SARI <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" "Language: tr\n" @@ -21,7 +21,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 22.08.3\n" +"X-Generator: Lokalize 22.12.3\n" "(http: //www.transifex.com/projects/p/kdepimlibs-k-tr/language/tr/)\n" #: formatter.cpp:298 @@ -467,7 +467,7 @@ #: mapi.cpp:144 msgid "Attachment Transport File Name" -msgstr "Eklenti Aktarımı Dosya Adı" +msgstr "Eklenti TaÅıması Dosya Adı" #: mapi.cpp:145 msgid "Attachment Rendering Data" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/po/zh_CN/libktnef5.po new/ktnef-23.04.0/po/zh_CN/libktnef5.po --- old/ktnef-22.12.3/po/zh_CN/libktnef5.po 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/po/zh_CN/libktnef5.po 2023-04-11 06:38:19.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-01-12 00:46+0000\n" -"PO-Revision-Date: 2023-02-24 12:58\n" +"PO-Revision-Date: 2023-04-10 14:12\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/sanitizers.supp new/ktnef-23.04.0/sanitizers.supp --- old/ktnef-22.12.3/sanitizers.supp 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/sanitizers.supp 2023-04-11 06:38:19.000000000 +0200 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]> +# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]> # SPDX-License-Identifier: CC0-1.0 # Suppression file for ASAN/LSAN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/src/CMakeLists.txt new/ktnef-23.04.0/src/CMakeLists.txt --- old/ktnef-22.12.3/src/CMakeLists.txt 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/src/CMakeLists.txt 2023-04-11 06:38:19.000000000 +0200 @@ -1,7 +1,8 @@ -add_library(KF5Tnef) -add_library(KF5::Tnef ALIAS KF5Tnef) +add_library(KPim${KF_MAJOR_VERSION}Tnef) +add_library(KPim${KF_MAJOR_VERSION}::Tnef ALIAS KPim${KF_MAJOR_VERSION}Tnef) +add_library(KF5::Tnef ALIAS KPim${KF_MAJOR_VERSION}Tnef) -target_sources(KF5Tnef PRIVATE +target_sources(KPim${KF_MAJOR_VERSION}Tnef PRIVATE ktnefparser.cpp ktnefproperty.cpp ktnefattach.cpp @@ -23,36 +24,36 @@ ktnefproperty.h ) -ecm_qt_declare_logging_category(KF5Tnef HEADER ktnef_debug.h IDENTIFIER KTNEF_LOG CATEGORY_NAME org.kde.pim.ktnef +ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}Tnef HEADER ktnef_debug.h IDENTIFIER KTNEF_LOG CATEGORY_NAME org.kde.pim.ktnef OLD_CATEGORY_NAMES log_ktnef DESCRIPTION "ktnef (pim lib)" EXPORT KTNEF) if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) - set_target_properties(KF5Tnef PROPERTIES UNITY_BUILD ON) + set_target_properties(KPim${KF_MAJOR_VERSION}Tnef PROPERTIES UNITY_BUILD ON) endif() -generate_export_header(KF5Tnef BASE_NAME ktnef) +generate_export_header(KPim${KF_MAJOR_VERSION}Tnef BASE_NAME ktnef) -target_include_directories(KF5Tnef INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KTNEF>") -target_include_directories(KF5Tnef PUBLIC "$<BUILD_INTERFACE:${KTnef_SOURCE_DIR}/src;${KTnef_BINARY_DIR}/src>") +target_include_directories(KPim${KF_MAJOR_VERSION}Tnef INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KTNEF>") +target_include_directories(KPim${KF_MAJOR_VERSION}Tnef PUBLIC "$<BUILD_INTERFACE:${KTnef_SOURCE_DIR}/src;${KTnef_BINARY_DIR}/src>") -target_link_libraries(KF5Tnef +target_link_libraries(KPim${KF_MAJOR_VERSION}Tnef PUBLIC - KF5::CalendarCore + KF${KF_MAJOR_VERSION}::CalendarCore PRIVATE - KF5::CalendarUtils - KF5::Contacts - KF5::I18n + KPim${KF_MAJOR_VERSION}::CalendarUtils + KF${KF_MAJOR_VERSION}::Contacts + KF${KF_MAJOR_VERSION}::I18n ) -set_target_properties(KF5Tnef PROPERTIES +set_target_properties(KPim${KF_MAJOR_VERSION}Tnef PROPERTIES VERSION ${KTNEF_VERSION} SOVERSION ${KTNEF_SOVERSION} EXPORT_NAME Tnef ) -install(TARGETS KF5Tnef EXPORT KF5TnefTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KPim${KF_MAJOR_VERSION}Tnef EXPORT KPim${KF_MAJOR_VERSION}TnefTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) ecm_generate_headers(KTnef_CamelCase_HEADERS HEADER_NAMES @@ -68,15 +69,16 @@ REQUIRED_HEADERS KTnef_HEADERS ) -install(FILES ${KTnef_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KTNEF/KTNEF/ COMPONENT Devel) +install(FILES ${KTnef_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KTNEF/KTNEF/ COMPONENT Devel) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ktnef_export.h ${KTnef_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KTNEF/ktnef + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KTNEF/ktnef COMPONENT Devel ) -ecm_generate_pri_file(BASE_NAME KTNef LIB_NAME KF5Tnef DEPS "KCalendarCore" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KTNEF) +ecm_generate_pri_file(BASE_NAME KTNef LIB_NAME KPim${KF_MAJOR_VERSION}Tnef DEPS "KCalendarCore" + FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KTNEF) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) ecm_qt_install_logging_categories(EXPORT KTNEF FILE ktnef.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/src/ktnefmessage.cpp new/ktnef-23.04.0/src/ktnefmessage.cpp --- old/ktnef-22.12.3/src/ktnefmessage.cpp 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/src/ktnefmessage.cpp 2023-04-11 06:38:19.000000000 +0200 @@ -90,7 +90,12 @@ QString KTNEFMessage::rtfString() const { QVariant prop = property(0x1009); - if (prop.isNull() || prop.type() != QVariant::ByteArray) { + if (prop.isNull() +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + || prop.type() != QVariant::ByteArray) { +#else + || prop.metaType().id() != QMetaType::QByteArray) { +#endif return {}; } else { QByteArray rtf; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/src/ktnefparser.cpp new/ktnef-23.04.0/src/ktnefparser.cpp --- old/ktnef-22.12.3/src/ktnefparser.cpp 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/src/ktnefparser.cpp 2023-04-11 06:38:19.000000000 +0200 @@ -752,7 +752,11 @@ } QString res; if (isUnicode) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) res = QString::fromUtf16((const unsigned short *)buf); +#else + res = QString::fromUtf16((const char16_t *)buf); +#endif } else { res = QString::fromLatin1(buf); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/src/ktnefproperty.cpp new/ktnef-23.04.0/src/ktnefproperty.cpp --- old/ktnef-22.12.3/src/ktnefproperty.cpp 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/src/ktnefproperty.cpp 2023-04-11 06:38:19.000000000 +0200 @@ -65,7 +65,11 @@ QString KTNEFProperty::keyString() const { if (d->_name.isValid()) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if (d->_name.type() == QVariant::String) { +#else + if (d->_name.metaType().id() == QMetaType::QString) { +#endif return d->_name.toString(); } else { return mapiNamedTagString(d->_name.toUInt(), d->_key); @@ -77,7 +81,11 @@ QString KTNEFProperty::formatValue(const QVariant &value, bool beautify) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if (value.type() == QVariant::ByteArray) { +#else + if (value.metaType().id() == QMetaType::QByteArray) { +#endif // check the first bytes (up to 8) if they are // printable characters QByteArray arr = value.toByteArray(); @@ -133,5 +141,9 @@ bool KTNEFProperty::isVector() const { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) return d->_value.type() == QVariant::List; +#else + return d->_value.metaType().id() == QMetaType::QVariantList; +#endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-22.12.3/src/ktnefpropertyset.cpp new/ktnef-23.04.0/src/ktnefpropertyset.cpp --- old/ktnef-22.12.3/src/ktnefpropertyset.cpp 2023-02-25 06:15:13.000000000 +0100 +++ new/ktnef-23.04.0/src/ktnefpropertyset.cpp 2023-04-11 06:38:19.000000000 +0200 @@ -68,7 +68,11 @@ for (QMap<int, KTNEFProperty *>::Iterator it = d->properties_.begin(), protEnd = d->properties_.end(); it != protEnd; ++it) { if ((*it)->name().isValid()) { QString s; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if ((*it)->name().type() == QVariant::String) { +#else + if ((*it)->name().metaType().id() == QMetaType::QString) { +#endif s = (*it)->name().toString(); } else { s = QString::asprintf("0X%04X", (*it)->name().toUInt()); @@ -76,7 +80,11 @@ if (s.toUpper() == name.toUpper()) { QVariant value = (*it)->value(); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if (value.type() == QVariant::List) { +#else + if (value.metaType().id() == QMetaType::QVariantList) { +#endif QList<QVariant> l = value.toList(); s.clear(); for (QList<QVariant>::ConstIterator lit = l.constBegin(), litEnd = l.constEnd(); lit != litEnd; ++lit) { @@ -139,7 +147,7 @@ return; } } - auto *p = new KTNEFProperty(key, type, value, QVariant()); + auto p = new KTNEFProperty(key, type, value, QVariant()); d->attributes_[p->key()] = p; }
