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-07-11 19:08:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdoctools (Old) and /work/SRC/openSUSE:Factory/.kdoctools.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdoctools" Mon Jul 11 19:08:40 2022 rev:106 rq:988134 version:5.96.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdoctools/kdoctools.changes 2022-06-17 21:21:02.866725702 +0200 +++ /work/SRC/openSUSE:Factory/.kdoctools.new.1523/kdoctools.changes 2022-07-11 19:09:53.515651814 +0200 @@ -1,0 +2,15 @@ +Sun Jul 3 11:55:55 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.96.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.96.0 +- Changes since 5.95.0: + * catalog: Avoid needlessly copying a list to be returned. + * meinproc: Simplify loop building param list for libxml. + * meinproc: Fix usage of QString reference to temporary. + * meinproc: Remove old comment from porting. + * meinproc: Remove dead entry parsing code. + * allow build with nix package manager + +------------------------------------------------------------------- Old: ---- kdoctools-5.95.0.tar.xz kdoctools-5.95.0.tar.xz.sig New: ---- kdoctools-5.96.0.tar.xz kdoctools-5.96.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdoctools.spec ++++++ --- /var/tmp/diff_new_pack.iDQZog/_old 2022-07-11 19:09:54.539653299 +0200 +++ /var/tmp/diff_new_pack.iDQZog/_new 2022-07-11 19:09:54.539653299 +0200 @@ -17,14 +17,14 @@ %define lname libKF5DocTools5 -%define _tar_path 5.95 +%define _tar_path 5.96 # 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 released Name: kdoctools -Version: 5.95.0 +Version: 5.96.0 Release: 0 Summary: Tools to create documentation from DocBook License: LGPL-2.1-or-later AND MIT ++++++ kdoctools-5.95.0.tar.xz -> kdoctools-5.96.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.95.0/CMakeLists.txt new/kdoctools-5.96.0/CMakeLists.txt --- old/kdoctools-5.95.0/CMakeLists.txt 2022-06-09 23:18:54.000000000 +0200 +++ new/kdoctools-5.96.0/CMakeLists.txt 2022-07-02 17:51:31.000000000 +0200 @@ -1,21 +1,26 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.95.0") # handled by release scripts -set(KF_DEP_VERSION "5.95.0") # handled by release scripts +set(KF_VERSION "5.96.0") # handled by release scripts +set(KF_DEP_VERSION "5.96.0") # handled by release scripts project(KDocTools VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.95.0 NO_MODULE) +find_package(ECM 5.96.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) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(KDEGitCommitHooks) include(ECMSetupVersion) include(ECMMarkNonGuiExecutable) include(ECMQtDeclareLoggingCategory) +include(ECMDeprecationSettings) include(CMakePackageConfigHelpers) include(GenerateExportHeader) include(ECMAddQch) @@ -34,11 +39,6 @@ set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt${QT_MAJOR_VERSION}Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(KDECMakeSettings) -include(KDEGitCommitHooks) - # KF5 frameworks if (NOT MEINPROC_NO_KARCHIVE) find_package(KF5Archive ${KF_DEP_VERSION} REQUIRED) @@ -95,8 +95,11 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DocTools") add_definitions(-DTRANSLATION_DOMAIN=\"kdoctools5\") -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) +ecm_set_disabled_deprecation_versions( + QT 5.15.2 + KF 5.95 +) + if (KF5I18n_FOUND) ki18n_install(po) kdoctools_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.95.0/cmake/FindDocBookXML4.cmake new/kdoctools-5.96.0/cmake/FindDocBookXML4.cmake --- old/kdoctools-5.95.0/cmake/FindDocBookXML4.cmake 2022-06-09 23:18:54.000000000 +0200 +++ new/kdoctools-5.96.0/cmake/FindDocBookXML4.cmake 2022-07-02 17:51:31.000000000 +0200 @@ -32,8 +32,10 @@ ${CMAKE_INSTALL_DATAROOTDIR}/xml/docbook/xml-dtd-${version} ${CMAKE_INSTALL_DATAROOTDIR}/sgml/docbook/xml-dtd-${version} ${CMAKE_INSTALL_DATAROOTDIR}/xml/docbook/${version} - #for building on Mac with docbook installed by homebrew + # for building on Mac with docbook installed by homebrew opt/docbook/docbook/xml/${version} + # for building with Nix package manager + xml/dtd/docbook ) find_path (searched_dir docbookx.dtd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.95.0/cmake/FindDocBookXSL.cmake new/kdoctools-5.96.0/cmake/FindDocBookXSL.cmake --- old/kdoctools-5.95.0/cmake/FindDocBookXSL.cmake 2022-06-09 23:18:54.000000000 +0200 +++ new/kdoctools-5.96.0/cmake/FindDocBookXSL.cmake 2022-07-02 17:51:31.000000000 +0200 @@ -22,8 +22,10 @@ ${CMAKE_INSTALL_DATAROOTDIR}/xml/docbook/stylesheet/nwalsh ${CMAKE_INSTALL_DATAROOTDIR}/xsl/docbook ${CMAKE_INSTALL_DATAROOTDIR}/xsl/docbook-xsl - #for building on Mac with docbook-xsl installed by homebrew + # for building on Mac with docbook-xsl installed by homebrew opt/docbook-xsl/docbook-xsl + # for building with Nix package manager + xml/xsl/docbook ) find_path (DocBookXSL_DIR lib/lib.xsl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.95.0/po/zh_CN/kdoctools5.po new/kdoctools-5.96.0/po/zh_CN/kdoctools5.po --- old/kdoctools-5.95.0/po/zh_CN/kdoctools5.po 2022-06-09 23:18:54.000000000 +0200 +++ new/kdoctools-5.96.0/po/zh_CN/kdoctools5.po 2022-07-02 17:51:31.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-01-02 00:42+0000\n" -"PO-Revision-Date: 2022-06-05 04:17\n" +"PO-Revision-Date: 2022-07-02 10:59\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.95.0/src/meinproc.cpp new/kdoctools-5.96.0/src/meinproc.cpp --- old/kdoctools-5.95.0/src/meinproc.cpp 2022-06-09 23:18:54.000000000 +0200 +++ new/kdoctools-5.96.0/src/meinproc.cpp 2022-07-02 17:51:31.000000000 +0200 @@ -38,67 +38,16 @@ extern "C" int xmlLoadExtDtdDefaultValue; #endif -class MyPair -{ -public: - QString word; - int base; -}; - -typedef QList<MyPair> PairList; - #define DIE(x) \ do { \ qCCritical(KDocToolsLog) << "Error:" << x; \ exit(1); \ } while (0) -void parseEntry(PairList &list, xmlNodePtr cur, int base) -{ - if (!cur) { - return; - } - - base += atoi((const char *)xmlGetProp(cur, (const xmlChar *)"header")); - if (base > 10) { // 10 is the maximum - base = 10; - } - - /* We don't care what the top level element name is */ - cur = cur->xmlChildrenNode; - while (cur != nullptr) { - if (cur->type == XML_TEXT_NODE) { - QString words = QString::fromUtf8((char *)cur->content); - const QStringList wlist = words.simplified().split(QLatin1Char(' '), Qt::SkipEmptyParts); - for (QStringList::ConstIterator it = wlist.begin(); it != wlist.end(); ++it) { - MyPair m; - m.word = *it; - m.base = base; - list.append(m); - } - } else if (!xmlStrcmp(cur->name, (const xmlChar *)"entry")) { - parseEntry(list, cur, base); - } - - cur = cur->next; - } -} - int main(int argc, char **argv) { // xsltSetGenericDebugFunc(stderr, NULL); - /*options.add("stylesheet <xsl>", ki18n("Stylesheet to use")); - options.add("stdout", ki18n("Output whole document to stdout")); - options.add("o"); - options.add("output <file>", ki18n("Output whole document to file")); - options.add("htdig", ki18n("Create a ht://dig compatible index")); - options.add("check", ki18n("Check the document for validity")); - options.add("cache <file>", ki18n("Create a cache file for the document")); - options.add("srcdir <dir>", ki18n("Set the srcdir, for kdelibs")); - options.add("param <key>=<value>", ki18n("Parameters to pass to the stylesheet")); - options.add("+xml", ki18n("The file to transform"));*/ - QCoreApplication app(argc, argv); app.setApplicationName(QStringLiteral("meinproc")); app.setApplicationVersion(QStringLiteral("5.0")); @@ -126,7 +75,8 @@ parser.addPositionalArgument(QStringLiteral("xml"), QCoreApplication::translate("main", "The file to transform")); parser.process(app); - if (parser.positionalArguments().count() != 1) { + const QStringList filesToRead = parser.positionalArguments(); + if (filesToRead.count() != 1) { parser.showHelp(); return (1); } @@ -142,7 +92,7 @@ LIBXML_TEST_VERSION - const QString checkFilename = parser.positionalArguments().first(); + const QString checkFilename(filesToRead.first()); CheckFileResult ckr = checkFile(checkFilename); switch (ckr) { case CheckFileSuccess: @@ -183,10 +133,7 @@ QVector<const char *> params; { const QStringList paramList = parser.values(QStringLiteral("param")); - QStringList::ConstIterator it = paramList.constBegin(); - QStringList::ConstIterator end = paramList.constEnd(); - for (; it != end; ++it) { - const QString tuple = *it; + for (const QString &tuple : paramList) { const int ch = tuple.indexOf(QLatin1Char('=')); if (ch == -1) { DIE("Key-Value tuple" << tuple << "lacks a '='!"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.95.0/src/xslt.cpp new/kdoctools-5.96.0/src/xslt.cpp --- old/kdoctools-5.95.0/src/xslt.cpp 2022-06-09 23:18:54.000000000 +0200 +++ new/kdoctools-5.96.0/src/xslt.cpp 2022-07-02 17:51:31.000000000 +0200 @@ -476,12 +476,7 @@ } } - QStringList catalogs; - for (const QString &aCatalog : std::as_const(catalogFiles)) { - catalogs << aCatalog; - } - // qCDebug(KDocToolsLog) << "Found catalogs: " << catalogs; - return catalogs; + return catalogFiles; } QStringList KDocTools::documentationDirs()
