Hello community, here is the log from the commit of package ktnef for openSUSE:Leap:15.2 checked in at 2020-05-12 11:35:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ktnef (Old) and /work/SRC/openSUSE:Leap:15.2/.ktnef.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktnef" Tue May 12 11:35:25 2020 rev:58 rq:797457 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ktnef/ktnef.changes 2020-03-15 07:11:06.336954176 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ktnef.new.2738/ktnef.changes 2020-05-12 11:35:26.728128165 +0200 @@ -1,0 +2,33 @@ +Thu Apr 23 12:22:55 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +------------------------------------------------------------------- +Sun Apr 5 20:30:28 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- No code change since 20.03.80 + +------------------------------------------------------------------- +Sun Mar 22 09:17:25 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * Autogenerate categories file + * Fix another typo causing errors with ECM + * Don't try to parse file when it doesn't exist + * Make it compiles against qt5.15 (endl other other use Qt:: namespace now) + * remove <QtTest> which includes all of <QtCore> (scripted) + * Use camelcase header (scripted) + +------------------------------------------------------------------- Old: ---- ktnef-19.12.3.tar.xz ktnef-19.12.3.tar.xz.sig New: ---- ktnef-20.04.0.tar.xz ktnef-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktnef.spec ++++++ --- /var/tmp/diff_new_pack.ut8SEN/_old 2020-05-12 11:35:27.080128905 +0200 +++ /var/tmp/diff_new_pack.ut8SEN/_new 2020-05-12 11:35:27.084128913 +0200 @@ -21,17 +21,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: ktnef -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: KDE PIM Libraries: TNEF support License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: cmake(KF5CalendarCore) @@ -39,6 +35,10 @@ BuildRequires: cmake(KF5Contacts) BuildRequires: cmake(Qt5Test) Recommends: %{name}-lang +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %description This package contains additional libraries for KDE PIM applications. ++++++ ktnef-19.12.3.tar.xz -> ktnef-20.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/.gitignore new/ktnef-20.04.0/.gitignore --- old/ktnef-19.12.3/.gitignore 2020-02-16 09:58:31.000000000 +0100 +++ new/ktnef-20.04.0/.gitignore 2020-04-06 06:55:59.000000000 +0200 @@ -14,8 +14,7 @@ .swp.* Doxyfile Makefile -avail -random_seed /build*/ +.cmake/ CMakeLists.txt.user* *.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/CMakeLists.txt new/ktnef-20.04.0/CMakeLists.txt --- old/ktnef-19.12.3/CMakeLists.txt 2020-03-03 01:32:46.000000000 +0100 +++ new/ktnef-20.04.0/CMakeLists.txt 2020-04-17 02:38:13.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.13.3") +set(PIM_VERSION "5.14.0") project(KTnef VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.63.0") +set(KF5_MIN_VERSION "5.68.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -24,8 +24,8 @@ set(KTNEF_LIB_VERSION ${PIM_VERSION}) -set(CALENDARUTILS_LIB_VERSION "5.13.3") -set(QT_REQUIRED_VERSION "5.11.0") +set(CALENDARUTILS_LIB_VERSION "5.14.0") +set(QT_REQUIRED_VERSION "5.12.0") 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" @@ -43,7 +43,7 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) endif() add_definitions(-DQT_NO_FOREACH) @@ -82,7 +82,5 @@ add_subdirectory(autotests) endif() -install(FILES ktnef.renamecategories ktnef.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/autotests/parsertest.cpp new/ktnef-20.04.0/autotests/parsertest.cpp --- old/ktnef-19.12.3/autotests/parsertest.cpp 2020-02-16 09:58:31.000000000 +0100 +++ new/ktnef-20.04.0/autotests/parsertest.cpp 2020-04-06 06:55:59.000000000 +0200 @@ -27,7 +27,7 @@ #include <ktnef/ktnefattach.h> #include <QString> -#include <QtTest> +#include <QTest> using namespace KTnef; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/ktnef.categories new/ktnef-20.04.0/ktnef.categories --- old/ktnef-19.12.3/ktnef.categories 2020-02-16 09:58:31.000000000 +0100 +++ new/ktnef-20.04.0/ktnef.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.pim.ktnef ktnef (pim lib) IDENTIFIER [KTNEF_LOG] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/ktnef.renamecategories new/ktnef-20.04.0/ktnef.renamecategories --- old/ktnef-19.12.3/ktnef.renamecategories 2020-02-16 09:58:31.000000000 +0100 +++ new/ktnef-20.04.0/ktnef.renamecategories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -log_ktnef org.kde.pim.ktnef diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/po/en_GB/libktnef5.po new/ktnef-20.04.0/po/en_GB/libktnef5.po --- old/ktnef-19.12.3/po/en_GB/libktnef5.po 2020-03-03 01:32:44.000000000 +0100 +++ new/ktnef-20.04.0/po/en_GB/libktnef5.po 2020-04-17 02:38:12.000000000 +0200 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2019-10-24 03:25+0200\n" "PO-Revision-Date: 2019-11-03 11:54+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" -"Language-Team: British English <kde-i18n-...@kde.org>\n" +"Language-Team: British English <kde-l10n-en...@kde.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/po/et/libktnef5.po new/ktnef-20.04.0/po/et/libktnef5.po --- old/ktnef-19.12.3/po/et/libktnef5.po 2020-03-03 01:32:44.000000000 +0100 +++ new/ktnef-20.04.0/po/et/libktnef5.po 2020-04-17 02:38:12.000000000 +0200 @@ -2,20 +2,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Marek Laane <b...@smail.ee>, 2007, 2010. +# Marek Laane <b...@smail.ee>, 2007, 2010, 2019. msgid "" msgstr "" "Project-Id-Version: libktnef\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-24 03:25+0200\n" -"PO-Revision-Date: 2010-07-05 05:46+0300\n" -"Last-Translator: Marek Laane <b...@smail.ee>\n" -"Language-Team: Estonian <kde...@linux.ee>\n" +"PO-Revision-Date: 2019-11-17 00:52+0200\n" +"Last-Translator: Marek Laane <qiila...@gmail.com>\n" +"Language-Team: Estonian <kde...@lists.linux.ee>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 19.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: formatter.cpp:322 @@ -74,9 +74,7 @@ msgstr "Tundlikkus" #: mapi.cpp:49 mapi.cpp:141 -#, fuzzy, kde-format -#| msgctxt "@label The subject of an email" -#| msgid "Subject" +#, kde-format msgid "Subject" msgstr "Teema" @@ -476,9 +474,7 @@ msgstr "Firma nimi" #: mapi.cpp:129 -#, fuzzy, kde-format -#| msgctxt "@label The title of a person" -#| msgid "Title" +#, kde-format msgid "Title" msgstr "Tiitel" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/po/ia/libktnef5.po new/ktnef-20.04.0/po/ia/libktnef5.po --- old/ktnef-19.12.3/po/ia/libktnef5.po 2020-03-03 01:32:44.000000000 +0100 +++ new/ktnef-20.04.0/po/ia/libktnef5.po 2020-04-17 02:38:12.000000000 +0200 @@ -7,14 +7,14 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-24 03:25+0200\n" -"PO-Revision-Date: 2020-02-08 22:23+0100\n" -"Last-Translator: Giovanni Sora <g.s...@tiscali.it>\n" -"Language-Team: Interlingua <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2020-02-12 13:06+0100\n" +"Last-Translator: giovanni <g.s...@tiscali.it>\n" +"Language-Team: Interlingua <kde-i18n...@kde.org>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: formatter.cpp:322 @@ -370,7 +370,7 @@ #: mapi.cpp:108 #, kde-format msgid "Last Modification Time" -msgstr "Ultime tempore de modification" +msgstr "Ultime tempore de mofidication" #: mapi.cpp:109 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/po/nb/libktnef5.po new/ktnef-20.04.0/po/nb/libktnef5.po --- old/ktnef-19.12.3/po/nb/libktnef5.po 2020-03-03 01:32:45.000000000 +0100 +++ new/ktnef-20.04.0/po/nb/libktnef5.po 2020-04-17 02:38:13.000000000 +0200 @@ -8,7 +8,7 @@ "POT-Creation-Date: 2019-10-24 03:25+0200\n" "PO-Revision-Date: 2010-06-10 09:50+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" -"Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" +"Language-Team: Norwegian Bokmål <l10n...@lister.huftis.org>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/po/nn/libktnef5.po new/ktnef-20.04.0/po/nn/libktnef5.po --- old/ktnef-19.12.3/po/nn/libktnef5.po 2020-03-03 01:32:45.000000000 +0100 +++ new/ktnef-20.04.0/po/nn/libktnef5.po 2020-04-17 02:38:13.000000000 +0200 @@ -11,7 +11,7 @@ "POT-Creation-Date: 2019-10-24 03:25+0200\n" "PO-Revision-Date: 2008-08-03 19:24+0200\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" -"Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" +"Language-Team: Norwegian Nynorsk <l10n...@lister.huftis.org>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/po/sk/libktnef5.po new/ktnef-20.04.0/po/sk/libktnef5.po --- old/ktnef-19.12.3/po/sk/libktnef5.po 2020-03-03 01:32:46.000000000 +0100 +++ new/ktnef-20.04.0/po/sk/libktnef5.po 2020-04-17 02:38:13.000000000 +0200 @@ -1,18 +1,18 @@ # translation of libktnef5.po to Slovak -# Roman Paholík <wizzar...@gmail.com>, 2014, 2019. +# Roman Paholík <wizzar...@gmail.com>, 2014. msgid "" msgstr "" "Project-Id-Version: libktnef5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-24 03:25+0200\n" -"PO-Revision-Date: 2019-11-12 20:20+0100\n" +"PO-Revision-Date: 2014-08-14 14:18+0200\n" "Last-Translator: Roman Paholik <wizzar...@gmail.com>\n" "Language-Team: Slovak <kde...@linux.sk>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: formatter.cpp:322 @@ -71,7 +71,9 @@ msgstr "Citlivosť" #: mapi.cpp:49 mapi.cpp:141 -#, kde-format +#, fuzzy, kde-format +#| msgctxt "@label The subject of an email" +#| msgid "Subject" msgid "Subject" msgstr "Predmet" @@ -471,7 +473,9 @@ msgstr "Názov spoločnosti" #: mapi.cpp:129 -#, kde-format +#, fuzzy, kde-format +#| msgctxt "@label The title of a person" +#| msgid "Title" msgid "Title" msgstr "Názov" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/po/uk/libktnef5.po new/ktnef-20.04.0/po/uk/libktnef5.po --- old/ktnef-19.12.3/po/uk/libktnef5.po 2020-03-03 01:32:46.000000000 +0100 +++ new/ktnef-20.04.0/po/uk/libktnef5.po 2020-04-17 02:38:13.000000000 +0200 @@ -1,5 +1,5 @@ # Translation of libktnef5.po to Ukrainian -# Copyright (C) 2014-2019 This_file_is_part_of_KDE +# Copyright (C) 2018-2019 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/po/zh_CN/libktnef5.po new/ktnef-20.04.0/po/zh_CN/libktnef5.po --- old/ktnef-19.12.3/po/zh_CN/libktnef5.po 2020-03-03 01:32:46.000000000 +0100 +++ new/ktnef-20.04.0/po/zh_CN/libktnef5.po 2020-04-17 02:38:13.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-10-24 03:25+0200\n" -"PO-Revision-Date: 2020-01-20 21:56\n" +"PO-Revision-Date: 2020-03-25 19:56\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/src/CMakeLists.txt new/ktnef-20.04.0/src/CMakeLists.txt --- old/ktnef-19.12.3/src/CMakeLists.txt 2020-02-16 09:58:31.000000000 +0100 +++ new/ktnef-20.04.0/src/CMakeLists.txt 2020-04-06 06:55:59.000000000 +0200 @@ -11,7 +11,9 @@ formatter.cpp ) -ecm_qt_declare_logging_category(ktnef_SRCS HEADER ktnef_debug.h IDENTIFIER KTNEF_LOG CATEGORY_NAME org.kde.pim.ktnef) +ecm_qt_declare_logging_category(ktnef_SRCS HEADER ktnef_debug.h IDENTIFIER KTNEF_LOG CATEGORY_NAME org.kde.pim.ktnef + OLD_CATEGORY_NAMES log_ktnef + DESCRIPTION "ktnef (pim lib)" EXPORT KTNEF) add_library(KF5Tnef ${ktnef_SRCS}) @@ -64,3 +66,4 @@ ecm_generate_pri_file(BASE_NAME KTNef LIB_NAME KF5Tnef DEPS "CalendarCore" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/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-19.12.3/src/formatter.cpp new/ktnef-20.04.0/src/formatter.cpp --- old/ktnef-19.12.3/src/formatter.cpp 2020-02-16 09:58:31.000000000 +0100 +++ new/ktnef-20.04.0/src/formatter.cpp 2020-04-06 06:55:59.000000000 +0200 @@ -44,7 +44,7 @@ #include <kcalendarcore/icalformat.h> #include <kcalutils/incidenceformatter.h> -#include <klocalizedstring.h> +#include <KLocalizedString> #include <QBuffer> #include <QTimeZone> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/src/ktnefparser.cpp new/ktnef-20.04.0/src/ktnefparser.cpp --- old/ktnef-19.12.3/src/ktnefparser.cpp 2020-02-16 09:58:31.000000000 +0100 +++ new/ktnef-20.04.0/src/ktnefparser.cpp 2020-04-06 06:55:59.000000000 +0200 @@ -364,7 +364,18 @@ default: value = readTNEFAttribute(stream_, type, i); qCDebug(KTNEF_LOG) << "Attachment unknown field: tag=" - << hex << tag << ", length=" << dec << i; + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << tag << ", length=" + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << dec + #else + << Qt::dec + #endif + << i; break; } stream_ >> u; // u <- checksum @@ -407,7 +418,12 @@ if (i == TNEF_SIGNATURE) { stream_ >> u; qCDebug(KTNEF_LOG).nospace() << "Attachment cross reference key: 0x" - << hex << qSetFieldWidth(4) << qSetPadChar(QLatin1Char('0')) << u; + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << qSetFieldWidth(4) << qSetPadChar(QLatin1Char('0')) << u; //qCDebug(KTNEF_LOG) << "stream:" << device_->pos(); while (!stream_.atEnd()) { stream_ >> c; @@ -538,8 +554,12 @@ d->deleteDevice(); delete d->message_; d->message_ = new KTNEFMessage(); - d->device_ = new QFile(filename); + QFile *file = new QFile(filename); + d->device_ = file; d->deleteDevice_ = true; + if (!file->exists()) { + return false; + } return d->parseDevice(); } @@ -627,7 +647,12 @@ dt = QDateTime::fromSecsSinceEpoch((unsigned int)u64); } else { qCWarning(KTNEF_LOG).nospace() << "Invalid date: low byte=" - << showbase << qSetFieldWidth(8) << qSetPadChar(QLatin1Char('0')) + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << showbase + #else + << Qt::showbase + #endif + << qSetFieldWidth(8) << qSetPadChar(QLatin1Char('0')) << lowB << ", high byte=" << highB; } return dt; @@ -888,7 +913,12 @@ readMAPIValue(stream_, mapi); if (mapi.type == MAPI_TYPE_NONE) { qCDebug(KTNEF_LOG).nospace() << "MAPI unsupported: tag=" - << hex << mapi.tag << ", type=" << mapi.type; + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.tag << ", type=" << mapi.type; clearMAPIValue(mapi); return false; } @@ -936,39 +966,81 @@ switch (mapi.type & 0x0FFF) { case MAPI_TYPE_UINT16: qCDebug(KTNEF_LOG).nospace() << "(tag=" - << hex << mapi.tag + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.tag << ") MAPI short" << mapiname.toLatin1().data() - << ":" << hex << mapi.value.toUInt(); + << ":" + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.value.toUInt(); break; case MAPI_TYPE_ULONG: qCDebug(KTNEF_LOG).nospace() << "(tag=" - << hex << mapi.tag + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.tag << ") MAPI long" << mapiname.toLatin1().data() - << ":" << hex << mapi.value.toUInt(); + << ":" + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.value.toUInt(); break; case MAPI_TYPE_BOOLEAN: qCDebug(KTNEF_LOG).nospace() << "(tag=" - << hex << mapi.tag + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.tag << ") MAPI boolean" << mapiname.toLatin1().data() << ":" << mapi.value.toBool(); break; case MAPI_TYPE_TIME: qCDebug(KTNEF_LOG).nospace() << "(tag=" - << hex << mapi.tag + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.tag << ") MAPI time" << mapiname.toLatin1().data() << ":" << mapi.value.toString().toLatin1().data(); break; case MAPI_TYPE_USTRING: case MAPI_TYPE_STRING8: qCDebug(KTNEF_LOG).nospace() << "(tag=" - << hex << mapi.tag + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.tag << ") MAPI string" << mapiname.toLatin1().data() << ":size=" << mapi.value.toByteArray().size() << mapi.value.toString(); break; case MAPI_TYPE_BINARY: qCDebug(KTNEF_LOG).nospace() << "(tag=" - << hex << mapi.tag + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << hex + #else + << Qt::hex + #endif + << mapi.tag << ") MAPI binary" << mapiname.toLatin1().data() << ":size=" << mapi.value.toByteArray().size(); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-19.12.3/src/mapi.cpp new/ktnef-20.04.0/src/mapi.cpp --- old/ktnef-19.12.3/src/mapi.cpp 2020-02-16 09:58:31.000000000 +0100 +++ new/ktnef-20.04.0/src/mapi.cpp 2020-04-06 06:55:59.000000000 +0200 @@ -30,7 +30,7 @@ #include "mapi.h" #include <QMap> -#include <klocalizedstring.h> +#include <KLocalizedString> //@cond IGNORE static const struct { int tag;
