Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcodecs for openSUSE:Factory checked in at 2022-01-11 21:16:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcodecs (Old) and /work/SRC/openSUSE:Factory/.kcodecs.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcodecs" Tue Jan 11 21:16:02 2022 rev:99 rq:945037 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcodecs/kcodecs.changes 2021-12-13 20:43:44.584480277 +0100 +++ /work/SRC/openSUSE:Factory/.kcodecs.new.1892/kcodecs.changes 2022-01-11 21:18:24.984922820 +0100 @@ -1,0 +2,11 @@ +Mon Jan 3 12:47:18 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: + * QTBUG-83081 seems to be fixed with Qt6 + * Change the build system to enable building with Qt 6 + +------------------------------------------------------------------- Old: ---- kcodecs-5.89.0.tar.xz kcodecs-5.89.0.tar.xz.sig New: ---- kcodecs-5.90.0.tar.xz kcodecs-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcodecs.spec ++++++ --- /var/tmp/diff_new_pack.GwtcRz/_old 2022-01-11 21:18:25.604923257 +0100 +++ /var/tmp/diff_new_pack.GwtcRz/_new 2022-01-11 21:18:25.608923260 +0100 @@ -17,21 +17,21 @@ %define lname libKF5Codecs5 -%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}')} -%bcond_without lang +%bcond_without released Name: kcodecs -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Method collection to manipulate strings using various encodings 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 @@ -40,7 +40,7 @@ BuildRequires: gperf BuildRequires: kf5-filesystem BuildRequires: cmake(Qt5Core) >= 5.15.0 -%if %{with lang} +%if %{with released} BuildRequires: cmake(Qt5LinguistTools) >= 5.15.0 %endif @@ -52,9 +52,6 @@ Summary: Method collection to manipulate strings using various encodings Group: System/GUI/KDE %requires_ge libQt5Core5 -%if %{with lang} -Recommends: %{lname}-lang = %{version} -%endif %description -n %{lname} KCodecs provides a collection of methods to manipulate strings using various @@ -84,14 +81,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name}5 --with-qt --without-mo %endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files -n %{lname}-lang -f %{name}5.lang %endif ++++++ kcodecs-5.89.0.tar.xz -> kcodecs-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/CMakeLists.txt new/kcodecs-5.90.0/CMakeLists.txt --- old/kcodecs-5.89.0/CMakeLists.txt 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/CMakeLists.txt 2022-01-01 13:26:32.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts project(KCodecs 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) @@ -18,7 +18,11 @@ include(ECMQtDeclareLoggingCategory) set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) + +if (QT_MAJOR_VERSION STREQUAL "6") + find_package(Qt6Core5Compat ${REQUIRED_QT_VERSION} REQUIRED CONFIG) # QTextCodec +endif() find_package(Gperf REQUIRED) @@ -75,7 +79,7 @@ install(EXPORT KF5CodecsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5CodecsTargets.cmake NAMESPACE KF5:: ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcodecs_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/kcodecs-5.89.0/KF5CodecsConfig.cmake.in new/kcodecs-5.90.0/KF5CodecsConfig.cmake.in --- old/kcodecs-5.89.0/KF5CodecsConfig.cmake.in 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/KF5CodecsConfig.cmake.in 2022-01-01 13:26:32.000000000 +0100 @@ -1,7 +1,12 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) + +# Cannot use Qt6::Core5Compat as it won't be defined at the time this file is used +if(TARGET Qt6::Core) + find_dependency(Qt6Core5Compat @REQUIRED_QT_VERSION@) +endif() include("${CMAKE_CURRENT_LIST_DIR}/KF5CodecsTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/autotests/CMakeLists.txt new/kcodecs-5.90.0/autotests/CMakeLists.txt --- old/kcodecs-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:26:32.000000000 +0100 @@ -1,27 +1,35 @@ include(ECMAddTests) -find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) +find_package(Qt${QT_MAJOR_VERSION}Test ${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() ecm_add_tests( - kcharsetstest.cpp kencodingprobertest.cpp rfc2047test.cpp base45test.cpp codectest.cpp kemailaddresstest.cpp - LINK_LIBRARIES KF5::Codecs Qt5::Test + LINK_LIBRARIES KF5::Codecs Qt${QT_MAJOR_VERSION}::Test +) + +if (TARGET Qt6::Core5Compat) + set(_qt5_compat_libs Qt6::Core5Compat) # QTextCodec +endif() + +ecm_add_test( + kcharsetstest.cpp + LINK_LIBRARIES KF5::Codecs Qt${QT_MAJOR_VERSION}::Test ${_qt5_compat_libs} ) ecm_add_test( ${CMAKE_SOURCE_DIR}/src/kusasciitextcodec.cpp kusasciitextcodectest.cpp TEST_NAME kusasciitextcodectest - LINK_LIBRARIES Qt5::Test + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test ${_qt5_compat_libs} ) target_include_directories(kusasciitextcodectest PRIVATE "${CMAKE_SOURCE_DIR}/src" @@ -29,4 +37,4 @@ # Benchmark, compiled, but not run automatically with ctest add_executable(base64benchmark base64benchmark.cpp) -target_link_libraries(base64benchmark KF5::Codecs Qt5::Test) +target_link_libraries(base64benchmark KF5::Codecs Qt${QT_MAJOR_VERSION}::Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/autotests/kusasciitextcodectest.cpp new/kcodecs-5.90.0/autotests/kusasciitextcodectest.cpp --- old/kcodecs-5.89.0/autotests/kusasciitextcodectest.cpp 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/autotests/kusasciitextcodectest.cpp 2022-01-01 13:26:32.000000000 +0100 @@ -7,7 +7,6 @@ #include <kusasciitextcodec.h> // Qt #include <QTest> -#include <QTextCodec> class KUsAsciiTextCodecTest : public QObject { @@ -47,9 +46,13 @@ QTextCodec::ConverterState failConverterState; const QByteArray failEncoded8Bit = qtCodec->fromUnicode(failUnicodeText.constData(), failUnicodeText.length(), &failConverterState); - + // Bug seems fixed in Qt6 +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QCOMPARE(failConverterState.invalidChars, 1); +#else // confirm the broken result 0, which rather should be 1 QCOMPARE(failConverterState.invalidChars, 0); +#endif } void KUsAsciiTextCodecTest::testEncoding() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/po/ca@valencia/kcodecs5_qt.po new/kcodecs-5.90.0/po/ca@valencia/kcodecs5_qt.po --- old/kcodecs-5.89.0/po/ca@valencia/kcodecs5_qt.po 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/po/ca@valencia/kcodecs5_qt.po 2022-01-01 13:26:32.000000000 +0100 @@ -6,17 +6,17 @@ # Sebasti?? Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella P??rez <[email protected]>, 2003, 2006, 2011, 2012, 2013. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. +# Josep M. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. -# Empar <[email protected]>, 2019. +# Empar Montoro Mart??n <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: kcodecs\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2019-06-17 12:32+0200\n" -"Last-Translator: Empar <[email protected]>\n" +"Last-Translator: Empar Montoro Mart??n <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/po/zh_CN/kcodecs5_qt.po new/kcodecs-5.90.0/po/zh_CN/kcodecs5_qt.po --- old/kcodecs-5.89.0/po/zh_CN/kcodecs5_qt.po 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/po/zh_CN/kcodecs5_qt.po 2022-01-01 13:26:32.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-11-30 15:20\n" +"PO-Revision-Date: 2021-12-22 14:05\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/src/CMakeLists.txt new/kcodecs-5.90.0/src/CMakeLists.txt --- old/kcodecs-5.89.0/src/CMakeLists.txt 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/src/CMakeLists.txt 2022-01-01 13:26:32.000000000 +0100 @@ -102,9 +102,12 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5Codecs INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KCodecs>") +target_include_directories(KF5Codecs INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KCodecs>") -target_link_libraries(KF5Codecs PUBLIC Qt5::Core) +target_link_libraries(KF5Codecs PUBLIC Qt${QT_MAJOR_VERSION}::Core) +if (TARGET Qt6::Core5Compat) + target_link_libraries(KF5Codecs PUBLIC Qt6::Core5Compat) # QTextCodec +endif() set_target_properties(KF5Codecs PROPERTIES VERSION ${KCODECS_VERSION} SOVERSION ${KCODECS_SOVERSION} @@ -143,7 +146,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcodecs_export.h ${KCodecs_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KCodecs COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KCodecs COMPONENT Devel ) ecm_qt_install_logging_categories( @@ -178,5 +181,5 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KCodecs LIB_NAME KF5Codecs DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KCodecs) +ecm_generate_pri_file(BASE_NAME KCodecs LIB_NAME KF5Codecs DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KCodecs) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/src/kcharsets.cpp new/kcodecs-5.90.0/src/kcharsets.cpp --- old/kcodecs-5.89.0/src/kcharsets.cpp 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/src/kcharsets.cpp 2022-01-01 13:26:32.000000000 +0100 @@ -539,11 +539,11 @@ pos++; // '�', hexadecimal character reference const QString tmp(str.mid(pos)); - res = tmp.toInt(&ok, 16); + res = QChar(tmp.toInt(&ok, 16)); } else { // '�', decimal character reference const QString tmp(str.mid(pos)); - res = tmp.toInt(&ok, 10); + res = QChar(tmp.toInt(&ok, 10)); } if (ok) { return res; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/src/kcharsets.h new/kcodecs-5.90.0/src/kcharsets.h --- old/kcodecs-5.89.0/src/kcharsets.h 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/src/kcharsets.h 2022-01-01 13:26:32.000000000 +0100 @@ -11,6 +11,7 @@ #include <QCoreApplication> #include <QList> +#include <QStringList> #include <memory> class KCharsets; @@ -18,7 +19,6 @@ class QChar; class QString; -class QStringList; class QTextCodec; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/src/kcodecs.cpp new/kcodecs-5.90.0/src/kcodecs.cpp --- old/kcodecs-5.89.0/src/kcodecs.cpp 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/src/kcodecs.cpp 2022-01-01 13:26:32.000000000 +0100 @@ -425,7 +425,7 @@ // If there are any chars that couldn't be decoded in UTF-8, // fallback to local codec const QString tryUtf8 = QString::fromUtf8(result); - if (tryUtf8.contains(0xFFFD)) { + if (tryUtf8.contains(QChar(0xFFFD))) { QTextCodec *codec = QTextCodec::codecForLocale(); if (usedCS) { *usedCS = updateEncodingCharset(*usedCS, cachedCharset(codec->name())); @@ -590,7 +590,7 @@ KCodecs::Codec *KCodecs::Codec::codecForName(const QByteArray &name) { - QMutexLocker locker(dictLock); // protect "allCodecs" + QMutexLocker locker(dictLock()); // protect "allCodecs" if (!allCodecs) { allCodecs = new QHash<QByteArray, Codec *>(); qAddPostRoutine(cleanupCodecs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/src/kemailaddress.cpp new/kcodecs-5.90.0/src/kemailaddress.cpp --- old/kcodecs-5.89.0/src/kemailaddress.cpp 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/src/kemailaddress.cpp 2022-01-01 13:26:32.000000000 +0100 @@ -925,10 +925,10 @@ // Used internally by normalizedAddress() QString removeBidiControlChars(const QString &input) { - const int LRO = 0x202D; - const int RLO = 0x202E; - const int LRE = 0x202A; - const int RLE = 0x202B; + constexpr QChar LRO(0x202D); + constexpr QChar RLO(0x202E); + constexpr QChar LRE(0x202A); + constexpr QChar RLE(0x202B); QString result = input; result.remove(LRO); result.remove(RLO); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcodecs-5.89.0/src/kusasciitextcodec.h new/kcodecs-5.90.0/src/kusasciitextcodec.h --- old/kcodecs-5.89.0/src/kusasciitextcodec.h 2021-12-04 19:32:21.000000000 +0100 +++ new/kcodecs-5.90.0/src/kusasciitextcodec.h 2022-01-01 13:26:32.000000000 +0100 @@ -9,6 +9,8 @@ #include <QTextCodec> +// TODO KF6, remove this class, bug seems to be fixed in Qt6 + // Custom variant due to Qt-built-in not reporting encoding errors, see QTBUG-83081 // Bug seems present since Qt 5.0 when ICU-based codecs were added // in 88d2e92b39ffd4a6ea9446498ad5a1cb208022a6 to the qtbase repo.
