Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdoctools for openSUSE:Factory checked in at 2022-01-11 21:16:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdoctools (Old) and /work/SRC/openSUSE:Factory/.kdoctools.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdoctools" Tue Jan 11 21:16:16 2022 rev:100 rq:945052 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdoctools/kdoctools.changes 2021-12-13 20:44:05.652482858 +0100 +++ /work/SRC/openSUSE:Factory/.kdoctools.new.1892/kdoctools.changes 2022-01-11 21:18:46.268937791 +0100 @@ -1,0 +2,12 @@ +Mon Jan 3 12:47:30 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: + * Remove the usage of QTextCodec (and thus Qt6Core5Compat) for Qt6 + * Don't compare signed with unsigned int + * Change the build system to enable building with Qt 6 + +------------------------------------------------------------------- Old: ---- kdoctools-5.89.0.tar.xz kdoctools-5.89.0.tar.xz.sig New: ---- kdoctools-5.90.0.tar.xz kdoctools-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdoctools.spec ++++++ --- /var/tmp/diff_new_pack.ifO5rI/_old 2022-01-11 21:18:46.844938197 +0100 +++ /var/tmp/diff_new_pack.ifO5rI/_new 2022-01-11 21:18:46.848938199 +0100 @@ -17,21 +17,21 @@ %define lname libKF5DocTools5 -%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: kdoctools -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Tools to create documentation from DocBook License: LGPL-2.1-or-later AND MIT 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 @@ -92,14 +92,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name} --with-man --all-name %endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files lang -f %{name}.lang %endif ++++++ kdoctools-5.89.0.tar.xz -> kdoctools-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.89.0/CMakeLists.txt new/kdoctools-5.90.0/CMakeLists.txt --- old/kdoctools-5.89.0/CMakeLists.txt 2021-12-04 19:35:50.000000000 +0100 +++ new/kdoctools-5.90.0/CMakeLists.txt 2022-01-01 13:29:55.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project(KDocTools VERSION ${KF_VERSION}) # ECM setup 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) @@ -32,7 +32,8 @@ # Dependencies 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) + include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) @@ -124,7 +125,7 @@ "${CMAKE_CURRENT_SOURCE_DIR}/KF5DocToolsConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/KF5DocToolsConfig.cmake" PATH_VARS - KDE_INSTALL_DATADIR_KF5 + KDE_INSTALL_DATADIR_KF INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/KF5DocToolsMacros.cmake ${CMAKE_BINARY_DIR}/cmake/KF5DocToolsMacros.cmake COPYONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.89.0/KF5DocToolsConfig.cmake.in new/kdoctools-5.90.0/KF5DocToolsConfig.cmake.in --- old/kdoctools-5.89.0/KF5DocToolsConfig.cmake.in 2021-12-04 19:35:50.000000000 +0100 +++ new/kdoctools-5.90.0/KF5DocToolsConfig.cmake.in 2022-01-01 13:29:55.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ if (NOT KDOCTOOLS_CUSTOMIZATION_DIR) - set(KDOCTOOLS_DATA_INSTALL_DIR "@PACKAGE_KDE_INSTALL_DATADIR_KF5@") + set(KDOCTOOLS_DATA_INSTALL_DIR "@PACKAGE_KDE_INSTALL_DATADIR_KF@") set(KDOCTOOLS_CUSTOMIZATION_DIR "${KDOCTOOLS_DATA_INSTALL_DIR}/kdoctools/customization") endif() @@ -34,6 +34,12 @@ # find_dependency must be called *after* including the macros or PACKAGE_PREFIX_DIR will be altered 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() @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.89.0/config-kdoctools.h.cmake new/kdoctools-5.90.0/config-kdoctools.h.cmake --- old/kdoctools-5.89.0/config-kdoctools.h.cmake 2021-12-04 19:35:50.000000000 +0100 +++ new/kdoctools-5.90.0/config-kdoctools.h.cmake 2022-01-01 13:29:55.000000000 +0100 @@ -2,4 +2,4 @@ #define DOCBOOK_XML_CURRDTD "@DocBookXML4_DTD_DIR@" -#define KDOCTOOLS_INSTALL_DATADIR_KF5 "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}" +#define KDOCTOOLS_INSTALL_DATADIR_KF "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.89.0/po/ca@valencia/kdoctools5.po new/kdoctools-5.90.0/po/ca@valencia/kdoctools5.po --- old/kdoctools-5.89.0/po/ca@valencia/kdoctools5.po 2021-12-04 19:35:50.000000000 +0100 +++ new/kdoctools-5.90.0/po/ca@valencia/kdoctools5.po 2022-01-01 13:29:55.000000000 +0100 @@ -5,14 +5,14 @@ # # Sebasti?? Pla i Sanz <[email protected]>, 2000, 2004, 2005, 2006. # Antoni Bella P??rez <[email protected]>, 2003. -# Josep Ma. Ferrer <[email protected]>, 2007. +# Josep M. Ferrer <[email protected]>, 2007. msgid "" msgstr "" "Project-Id-Version: kdoctools\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-02-25 02:22+0100\n" "PO-Revision-Date: 2007-08-29 19:21+0200\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"Last-Translator: Josep M. Ferrer <[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/kdoctools-5.89.0/po/zh_CN/kdoctools5.po new/kdoctools-5.90.0/po/zh_CN/kdoctools5.po --- old/kdoctools-5.89.0/po/zh_CN/kdoctools5.po 2021-12-04 19:35:50.000000000 +0100 +++ new/kdoctools-5.90.0/po/zh_CN/kdoctools5.po 2022-01-01 13:29:55.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-02-25 02:22+0100\n" -"PO-Revision-Date: 2021-11-30 15:21\n" +"PO-Revision-Date: 2021-12-22 14:05\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.89.0/src/CMakeLists.txt new/kdoctools-5.90.0/src/CMakeLists.txt --- old/kdoctools-5.89.0/src/CMakeLists.txt 2021-12-04 19:35:50.000000000 +0100 +++ new/kdoctools-5.90.0/src/CMakeLists.txt 2022-01-01 13:29:55.000000000 +0100 @@ -8,9 +8,9 @@ # see the .xsl.cmake files for a more verbose explanation below if(NOT WIN32) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} - DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization/dtd ) + DESTINATION ${KDE_INSTALL_DATADIR_KF}/kdoctools/customization/dtd ) else() - get_filename_component(NORMALIZED_DTD_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization/dtd" ABSOLUTE) + get_filename_component(NORMALIZED_DTD_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF}/kdoctools/customization/dtd" ABSOLUTE) # file(RELATIVE_PATH ...) returns wrong values for paths containing /../ (it doesn't normalize the path) # To work around this we make sure the variable passed has all /../ elements # removed using get_filename_component(... ABSOLUTE) @@ -23,7 +23,7 @@ configure_file(\"${CMAKE_CURRENT_SOURCE_DIR}/${_custom_dtd_kdex}.cmake\" \"${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}.install\")" ) get_filename_component(_custom_dtd_kdex_name ${_custom_dtd_kdex} NAME) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}.install" DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization/dtd RENAME ${_custom_dtd_kdex_name}) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}.install" DESTINATION ${KDE_INSTALL_DATADIR_KF}/kdoctools/customization/dtd RENAME ${_custom_dtd_kdex_name}) endif() ecm_qt_declare_logging_category(kdoctoolslog_core_SRCS @@ -42,18 +42,23 @@ else() set (_private_link_karchive "") endif() + target_link_libraries(KF5DocTools PUBLIC - Qt5::Core + Qt${QT_MAJOR_VERSION}::Core PRIVATE - ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} ${_private_link_karchive} + ${LIBXML2_LIBRARIES} + ${LIBXSLT_LIBRARIES} + ${LIBXSLT_EXSLT_LIBRARIES} + ${_private_link_karchive} ) + set_target_properties(KF5DocTools PROPERTIES POSITION_INDEPENDENT_CODE TRUE EXPORT_NAME KDocTools ) -target_include_directories(KF5DocTools INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KDocTools>") +target_include_directories(KF5DocTools INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KDocTools>") set(KDocTools_HEADERS docbookxslt.h @@ -62,7 +67,7 @@ install(FILES ${KDocTools_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/kdoctools_export.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDocTools + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KDocTools COMPONENT Devel ) @@ -108,7 +113,16 @@ add_executable(meinproc5 meinproc.cpp meinproc_common.cpp xslt.cpp ${meinproc_additional_SRCS} ${kdoctoolslog_core_SRCS}) ecm_mark_nongui_executable(meinproc5) -target_link_libraries(meinproc5 Qt5::Core ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} ${meinproc_additional_LIBS}) +target_link_libraries(meinproc5 + PRIVATE + Qt${QT_MAJOR_VERSION}::Core + ${LIBXML2_LIBRARIES} + ${LIBXSLT_LIBRARIES} + ${LIBXSLT_EXSLT_LIBRARIES} + ${meinproc_additional_LIBS} + ${_qt5_compat_lib} +) + target_compile_definitions(meinproc5 PRIVATE -DKDOCTOOLS_EXPORT=) install(TARGETS meinproc5 EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) @@ -134,12 +148,12 @@ configure_file( ${_kdeincludexslt} ${_kdeincludexslt_binarypath} ) if(NOT WIN32) install(FILES ${_kdeincludexslt_binarypath} - DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization ) + DESTINATION ${KDE_INSTALL_DATADIR_KF}/kdoctools/customization ) else() install(CODE - "FILE(RELATIVE_PATH DOCBOOKXSL_DIR \${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization ${DOCBOOKXSL_DIR}) + "FILE(RELATIVE_PATH DOCBOOKXSL_DIR \${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF}/kdoctools/customization ${DOCBOOKXSL_DIR}) CONFIGURE_FILE( \"${_kdeincludexslt}\" \"${_kdeincludexslt_binarypath}.install\" )") - install(FILES "${_kdeincludexslt_binarypath}.install" DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization RENAME ${_kdeincludexslt_out}) + install(FILES "${_kdeincludexslt_binarypath}.install" DESTINATION ${KDE_INSTALL_DATADIR_KF}/kdoctools/customization RENAME ${_kdeincludexslt_out}) endif() endforeach( _kdeincludexslt ${_kdeincludexslt_ALL} ) @@ -149,7 +163,7 @@ macro(INSTALL_CUSTOMIZE_DIR _expr _directory) FILE(GLOB _file_CUST "${_expr}" ) foreach(_curentfile ${_file_CUST}) - install(FILES ${_curentfile} DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdoctools/${_directory} ) + install(FILES ${_curentfile} DESTINATION ${KDE_INSTALL_DATADIR_KF}/kdoctools/${_directory} ) endforeach(_curentfile ${_file_CUST}) endmacro(INSTALL_CUSTOMIZE_DIR _expr _directory) @@ -164,7 +178,7 @@ configure_file(${_curentfile} ${_currentfile_binary_path} COPYONLY) install(FILES ${_currentfile_binary_path} - DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdoctools/${_directory} ) + DESTINATION ${KDE_INSTALL_DATADIR_KF}/kdoctools/${_directory} ) endforeach(_curentfile ${_file_CUST}) endmacro(INSTALL_CUSTOMIZE_L_DIR _expr _directory) @@ -205,7 +219,7 @@ set( docbookl10nhelper_SRCS docbookl10nhelper.cpp ${kdoctoolslog_core_SRCS}) add_executable( docbookl10nhelper ${docbookl10nhelper_SRCS} ) ecm_mark_nongui_executable( docbookl10nhelper ) -target_link_libraries( docbookl10nhelper Qt5::Core ) +target_link_libraries( docbookl10nhelper Qt${QT_MAJOR_VERSION}::Core ) if(INSTALL_INTERNAL_TOOLS) install(TARGETS docbookl10nhelper EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) endif() @@ -225,14 +239,14 @@ # all-l10n.xml is generated by docbookl10nhelper install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/all-l10n.xml - DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdoctools/customization/xsl/ ) + DESTINATION ${KDE_INSTALL_DATADIR_KF}/kdoctools/customization/xsl/ ) ########### checkxml5 helper ############### set( checkXML5_SRCS checkXML5.cpp ${kdoctoolslog_core_SRCS}) add_executable( checkXML5 ${checkXML5_SRCS} ) ecm_mark_nongui_executable( checkXML5 ) -target_link_libraries( checkXML5 Qt5::Core ) +target_link_libraries( checkXML5 Qt${QT_MAJOR_VERSION}::Core ) install(TARGETS checkXML5 EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.89.0/src/xslt.cpp new/kdoctools-5.90.0/src/xslt.cpp --- old/kdoctools-5.89.0/src/xslt.cpp 2021-12-04 19:35:50.000000000 +0100 +++ new/kdoctools-5.90.0/src/xslt.cpp 2022-01-01 13:29:55.000000000 +0100 @@ -24,7 +24,9 @@ #include <QFile> #include <QStandardPaths> #include <QString> +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QTextCodec> +#endif #include <QUrl> #include <QVector> @@ -293,12 +295,13 @@ QByteArray fromUnicode(const QString &data) { -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return data.toUtf8(); #else QTextCodec *locale = QTextCodec::codecForLocale(); QByteArray result; - char buffer[30000]; + constexpr int bufferSize = 30000; + char buffer[bufferSize]; uint buffer_len = 0; uint len = 0; int offset = 0; @@ -319,7 +322,7 @@ for (uint i = 0; i < len; i++) { QByteArray test = locale->fromUnicode(part.mid(i, 1)); if (locale->toUnicode(test) == part.mid(i, 1)) { - if (buffer_len + test.length() + 1 > sizeof(buffer)) { + if (buffer_len + test.length() + 1 > bufferSize) { break; } strcpy(buffer + buffer_len, test.data()); @@ -327,7 +330,7 @@ } else { QString res = QStringLiteral("&#%1;").arg(part.at(i).unicode()); test = locale->fromUnicode(res); - if (buffer_len + test.length() + 1 > sizeof(buffer)) { + if (buffer_len + test.length() + 1 > bufferSize) { break; } strcpy(buffer + buffer_len, test.data()); @@ -344,7 +347,7 @@ void replaceCharsetHeader(QString &output) { QString name; -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) name = "utf-8"; // may be required for all xml output if (output.contains("<table-of-contents>")) @@ -434,7 +437,7 @@ QStringList result = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, fileName, option); // fallback to stuff installed with KDocTools - const QFileInfo fileInInstallDataDir(QStringLiteral(KDOCTOOLS_INSTALL_DATADIR_KF5) + QStringLiteral("/kdoctools/") + file); + const QFileInfo fileInInstallDataDir(QStringLiteral(KDOCTOOLS_INSTALL_DATADIR_KF) + QStringLiteral("/kdoctools/") + file); if (fileInInstallDataDir.exists()) { if ((option == QStandardPaths::LocateFile) && fileInInstallDataDir.isFile()) { result.append(fileInInstallDataDir.absoluteFilePath());
