diff -pruN 5.94.0-1/cmake/FindDocBookXML4.cmake 5.96.0-1/cmake/FindDocBookXML4.cmake --- 5.94.0-1/cmake/FindDocBookXML4.cmake 2022-05-07 21:20:59.000000000 +0000 +++ 5.96.0-1/cmake/FindDocBookXML4.cmake 2022-07-02 15:51:31.000000000 +0000 @@ -32,8 +32,10 @@ function (locate_version version found_d ${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 -pruN 5.94.0-1/cmake/FindDocBookXSL.cmake 5.96.0-1/cmake/FindDocBookXSL.cmake --- 5.94.0-1/cmake/FindDocBookXSL.cmake 2022-05-07 21:20:59.000000000 +0000 +++ 5.96.0-1/cmake/FindDocBookXSL.cmake 2022-07-02 15:51:31.000000000 +0000 @@ -22,8 +22,10 @@ set (STYLESHEET_PATH_LIST ${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 -pruN 5.94.0-1/CMakeLists.txt 5.96.0-1/CMakeLists.txt --- 5.94.0-1/CMakeLists.txt 2022-05-07 21:20:59.000000000 +0000 +++ 5.96.0-1/CMakeLists.txt 2022-07-02 15:51:31.000000000 +0000 @@ -1,21 +1,26 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.94.0") # handled by release scripts -set(KF_DEP_VERSION "5.93.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.93.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 @@ add_feature_info(QCH ${BUILD_QCH} "API d 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(KDOCTOOLS_LANGUAGES_LIST af bg ca ca 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 -pruN 5.94.0-1/debian/changelog 5.96.0-1/debian/changelog --- 5.94.0-1/debian/changelog 2022-05-19 21:59:04.000000000 +0000 +++ 5.96.0-1/debian/changelog 2022-07-31 11:33:01.000000000 +0000 @@ -1,3 +1,13 @@ +kdoctools (5.96.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (5.96.0). + * Bump Standards-Version to 4.6.1, no change required. + * Add lintian overrides to confirm some HTML files are really the + sources. + + -- Aurélien COUDERC Sun, 31 Jul 2022 13:33:01 +0200 + kdoctools (5.94.0-1) unstable; urgency=medium [ Aurélien COUDERC ] diff -pruN 5.94.0-1/debian/control 5.96.0-1/debian/control --- 5.94.0-1/debian/control 2022-05-18 05:53:39.000000000 +0000 +++ 5.96.0-1/debian/control 2022-07-31 11:33:01.000000000 +0000 @@ -8,17 +8,17 @@ Build-Depends: cmake (>= 3.16~), debhelper-compat (= 13), docbook-xml (>= 4.5), docbook-xsl, - extra-cmake-modules (>= 5.93.0~), + extra-cmake-modules (>= 5.96.0~), kdoctools5 , - libkf5archive-dev (>= 5.93.0~), - libkf5i18n-dev (>= 5.93.0~), + libkf5archive-dev (>= 5.96.0~), + libkf5i18n-dev (>= 5.96.0~), liburi-perl, libxml2-dev, libxml2-utils, libxslt1-dev, pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.15.2~), -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Homepage: https://invent.kde.org/frameworks/kdoctools Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdoctools Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdoctools.git @@ -44,7 +44,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: kdoctools5 (= ${binary:Version}), - libkf5archive-dev (>= 5.93.0~), + libkf5archive-dev (>= 5.96.0~), libkf5doctools5 (= ${binary:Version}), qtbase5-dev (>= 5.15.2~), ${misc:Depends}, diff -pruN 5.94.0-1/debian/source/lintian-overrides 5.96.0-1/debian/source/lintian-overrides --- 5.94.0-1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 5.96.0-1/debian/source/lintian-overrides 2022-07-31 11:33:01.000000000 +0000 @@ -0,0 +1,5 @@ +# These HTML files have long lines but they’re modifiable sources as they are +kdoctools source: source-is-missing [common/de/fdl-translated.html] +kdoctools source: source-is-missing [common/en/ccbysa4-license.html] +kdoctools source: source-is-missing [common/zh_TW/gpl-translated.html] +kdoctools source: source-is-missing [common/zh_TW/lgpl-translated.html] diff -pruN 5.94.0-1/po/ka/kdoctools5.po 5.96.0-1/po/ka/kdoctools5.po --- 5.94.0-1/po/ka/kdoctools5.po 1970-01-01 00:00:00.000000000 +0000 +++ 5.96.0-1/po/ka/kdoctools5.po 2022-07-02 15:51:31.000000000 +0000 @@ -0,0 +1,39 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the kdoctools package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: kdoctools\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2022-01-02 00:42+0000\n" +"PO-Revision-Date: 2022-05-15 05:07+0200\n" +"Last-Translator: Temuri Doghonadze \n" +"Language-Team: Georgian \n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.0.1\n" + +#: xslt.cpp:140 +#, kde-format +msgid "Parsing stylesheet" +msgstr "კასკადური ცხრილების დამუშავება" + +#: xslt.cpp:163 +#, kde-format +msgid "Parsing document" +msgstr "დოკუმენტის დამუშავება" + +#: xslt.cpp:188 +#, kde-format +msgid "Applying stylesheet" +msgstr "კასკადური ცხრილის გადატარება" + +#: xslt.cpp:196 +#, kde-format +msgid "Writing document" +msgstr "დოკუმენტის ჩაწერა" diff -pruN 5.94.0-1/po/zh_CN/kdoctools5.po 5.96.0-1/po/zh_CN/kdoctools5.po --- 5.94.0-1/po/zh_CN/kdoctools5.po 2022-05-07 21:20:59.000000000 +0000 +++ 5.96.0-1/po/zh_CN/kdoctools5.po 2022-07-02 15:51:31.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "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-04-26 15:18\n" +"PO-Revision-Date: 2022-07-02 10:59\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -pruN 5.94.0-1/src/customization/fr/user.entities 5.96.0-1/src/customization/fr/user.entities --- 5.94.0-1/src/customization/fr/user.entities 2022-05-07 21:20:59.000000000 +0000 +++ 5.96.0-1/src/customization/fr/user.entities 2022-07-02 15:51:31.000000000 +0000 @@ -280,141 +280,164 @@ -'> -ti_orion@hotmail.fr'> -pierre.auckenthaler@polytechnique.org'> -kydeza@yahoo.fr'> -ktranslator31@yahoo.fr'> -e.bischoff@noos.fr'> -01246774@brookes.ac.uk'> -bieuzent@gmail.com'> -ybrenner@chez.com'> -bec.bunsen@laposte.net'> -daniel.bourrion@free.fr'> -pierre.buard@gmail.com'> -d.cartron@senat.fr'> -caulier.gilles@free.fr'> -alvise.cavallari@kdemail.net'> -pachavas@sun.cpe.fr'> -keelize@yahoo.fr'> -jcorn@free.fr'> -cosandier.benoit@bluewin.ch'> -cousin@in2p3.fr'> -gerard@delafond.org'> -ines@delafond.org'> -cecile@delafond.org'> -nicolas_delannoy@hotmail.fr'> -olivier.delaune@wanadoo.fr'> -charles@demartigny.com'> -2df@tuxfamily.org'> -kde@yvesd.net'> -chdioux@club-internet.fr'> -philip.ducharme@hermes.usherb.ca'> -ndupuis@tiscali.be'> -ddurand42@gmail.com'> -helened@herbalife.com'> -gduwelz-rebert.cs@clearstream.com'> -Admin@SecurityHack.Org'> -sami.fantar@laposte.net'> -nilsfernandez@yahoo.fr'> -jj.finazzi@club.fr'> -contact@floury.org'> -frederic.foiry@wanadoo.fr'> -jaaf.forums@zoraldia.com'> -jeanjacques.freulon@free.fr'> -sylvain.garsault@freesbee.fr'> -grossard@kde.org'> -stephane@22decembre.fr.nf'> -jguelluy@chez.com'> -yv_guil@club-internet.fr'> -robin.guitton@sud-ouest.org'> -guilbertph@wanadoo.fr'> -greg@coolkeums.org'> -yohann_hamon@yahoo.fr'> -kant_120@hotmail.fr'> -phecart@gmail.com'> -rjacolin@ifrance.com'> -doc@kde-france.org'> -goneri@gnuart.org'> -nlouveton@gmail.com'> -clefebvre@netcourrier.com'> -annemarie.mahfouf@free.fr'> -patrick.michelon@free.fr'> -julien@momonux.org'> -bmathus@free.fr'> -pem@levillage.org'> -paul.nana@tic.unilim.fr'> -gmarfjan@gmail.com'> -yneveu@gmail.common'> -cedric.pasteur@free.fr'> -patrice.pawlak@free.fr'> -belaran@gmail.com'> -bpinaud@ifrance.com'> -peter017@gmail.com'> -poulain.gilles@gmail.com'> -rquidet@yahoo.com'> -lrathle@kde-france.org'> -drazzib@drazzib.com'> -o.renaud@laposte.net'> -Sebastien.Renard@digitalfox.homeip.net'> -jrchcell@gmail.com'> -crolland@freesurf.fr'> -brice.rothschild@gmail.com'> -kimael@gmail.com'> -arno.muchembled@orange.fr'> -mat.schopfer@bluewin.ch'> -goneri@free.fr'> -nicolast@libertysurf.fr'> -zhovirax@wanadoo.fr'> -mathias.viallon@wanadoo.fr'> -thomas.vergnaud@laposte.net'> -yann.verley@free.fr'> -uncensored.assault@gmail.com'> +'> +ti_orion@hotmail.fr'> +pierre.auckenthaler@polytechnique.org'> +kydeza@yahoo.fr'> +ktranslator31@yahoo.fr'> +e.bischoff@noos.fr'> +01246774@brookes.ac.uk'> +bieuzent@gmail.com'> +ybrenner@chez.com'> +bec.bunsen@laposte.net'> +daniel.bourrion@free.fr'> +pierre.buard@gmail.com'> +d.cartron@senat.fr'> +caulier.gilles@free.fr'> +alvise.cavallari@kdemail.net'> +pachavas@sun.cpe.fr'> +keelize@yahoo.fr'> +jcorn@free.fr'> +cosandier.benoit@bluewin.ch'> +cousin@in2p3.fr'> +gerard@delafond.org'> +ines@delafond.org'> +cecile@delafond.org'> +nicolas_delannoy@hotmail.fr'> +olivier.delaune@wanadoo.fr'> +charles@demartigny.com'> +2df@tuxfamily.org'> +kde@yvesd.net'> +chdioux@club-internet.fr'> +philip.ducharme@hermes.usherb.ca'> +ndupuis@tiscali.be'> +ddurand42@gmail.com'> +helened@herbalife.com'> +gduwelz-rebert.cs@clearstream.com'> +Admin@SecurityHack.Org'> +sami.fantar@laposte.net'> +nilsfernandez@yahoo.fr'> +jj.finazzi@club.fr'> +contact@floury.org'> +frederic.foiry@wanadoo.fr'> +jaaf.forums@zoraldia.com'> +jeanjacques.freulon@free.fr'> +sylvain.garsault@freesbee.fr'> +grossard@kde.org'> +stephane@22decembre.fr.nf'> +jguelluy@chez.com'> +yv_guil@club-internet.fr'> +robin.guitton@sud-ouest.org'> +guilbertph@wanadoo.fr'> +greg@coolkeums.org'> +yohann_hamon@yahoo.fr'> +kant_120@hotmail.fr'> +phecart@gmail.com'> +rjacolin@ifrance.com'> +doc@kde-france.org'> +goneri@gnuart.org'> +nlouveton@gmail.com'> +clefebvre@netcourrier.com'> +annemarie.mahfouf@free.fr'> +patrick.michelon@free.fr'> +julien@momonux.org'> +bmathus@free.fr'> +pem@levillage.org'> +paul.nana@tic.unilim.fr'> +gmarfjan@gmail.com'> +yneveu@gmail.common'> +cedric.pasteur@free.fr'> +patrice.pawlak@free.fr'> +belaran@gmail.com'> +bpinaud@ifrance.com'> +peter017@gmail.com'> +poulain.gilles@gmail.com'> +rquidet@yahoo.com'> +lrathle@kde-france.org'> +drazzib@drazzib.com'> +o.renaud@laposte.net'> +Sebastien.Renard@digitalfox.homeip.net'> +jrchcell@gmail.com'> +crolland@freesurf.fr'> +brice.rothschild@gmail.com'> +kimael@gmail.com'> +arno.muchembled@orange.fr'> +mat.schopfer@bluewin.ch'> +goneri@free.fr'> +nicolast@libertysurf.fr'> +zhovirax@wanadoo.fr'> +mathias.viallon@wanadoo.fr'> +thomas.vergnaud@laposte.net'> +yann.verley@free.fr'> +uncensored.assault@gmail.com'> -Alt"> -Correction"> -gauche de la souris"> -central de la souris"> -droit de la souris"> - -lecteur de CD-ROM'> -Centre d'aide de &kde;"> +Applications"> +Retour arrière"> +Retour arrière"> +Del"> +Bas"> +p. ex."> +End"> +Esc"> +Home"> +c'est-à-dire"> +Ins"> +Left"> +Meta"> +&kde; Plasma Mobile"> +&kde; Plasma Pulseaudio"> +PgUp"> +PgDn"> +Droite"> +Shift"> +Espace"> +Réglages du système"> +Tab"> +Up"> + + +Alt"> +gauche de la souris"> +central de la souris"> +droit de la souris"> +lecteur de CD-ROM'> +Centre d'aide de &kde;"> Centre de configuration de &kde;'> -configuration du système'> -Centre d'information de &kde;"> -Ctrl"> -dpi'> -Échap'> -Entrée'> -Entrée'> -etc."> -FAQ'> - -Centre de Configuration de &kde;'> -Centre de Configuration de &kde;'> -&kde; Frameworks"> -SC"> -&kde; Software Compilation"> -KF5"> -5"> -Aide centralisée de &kde;'> -gestionnaire de partitions de KDE"> - -Maj'> - -Tab"> - -K"> - -&kde; Plasma Active"> -&kde; Plasma Media Center"> -&kde; Plasma Netbook"> -&kde; Plasma Desktop"> -&kde; Plasma Workspaces"> - -Configuration du système"> +configuration du système'> +Centre d'information de &kde;"> +Ctrl"> +dpi'> +Échap'> +Entrée'> +Entrée'> +etc."> +FAQ'> + +Centre de Configuration de &kde;'> +Centre de Configuration de &kde;'> +&kde; Frameworks"> +SC"> +&kde; Software Compilation"> +KF5"> +5"> +Aide centralisée de &kde;'> +gestionnaire de partitions de KDE"> + +Maj'> + +Tab"> + +K"> + +&kde; Plasma Active"> +&kde; Plasma Media Center"> +&kde; Plasma Netbook"> +&kde; Plasma Desktop"> +&kde; Plasma Workspaces"> + +Configuration du système"> - - + + diff -pruN 5.94.0-1/src/meinproc.cpp 5.96.0-1/src/meinproc.cpp --- 5.94.0-1/src/meinproc.cpp 2022-05-07 21:20:59.000000000 +0000 +++ 5.96.0-1/src/meinproc.cpp 2022-07-02 15:51:31.000000000 +0000 @@ -38,67 +38,16 @@ using namespace KDocTools; extern "C" int xmlLoadExtDtdDefaultValue; #endif -class MyPair -{ -public: - QString word; - int base; -}; - -typedef QList 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 ", ki18n("Stylesheet to use")); - options.add("stdout", ki18n("Output whole document to stdout")); - options.add("o"); - options.add("output ", 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 ", ki18n("Create a cache file for the document")); - options.add("srcdir ", ki18n("Set the srcdir, for kdelibs")); - options.add("param =", 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 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) QVector 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 -pruN 5.94.0-1/src/xslt.cpp 5.96.0-1/src/xslt.cpp --- 5.94.0-1/src/xslt.cpp 2022-05-07 21:20:59.000000000 +0000 +++ 5.96.0-1/src/xslt.cpp 2022-07-02 15:51:31.000000000 +0000 @@ -476,12 +476,7 @@ QStringList getKDocToolsCatalogs() } } - QStringList catalogs; - for (const QString &aCatalog : std::as_const(catalogFiles)) { - catalogs << aCatalog; - } - // qCDebug(KDocToolsLog) << "Found catalogs: " << catalogs; - return catalogs; + return catalogFiles; } QStringList KDocTools::documentationDirs()