Hello community, here is the log from the commit of package kdoctools for openSUSE:Factory checked in at 2018-11-14 14:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdoctools (Old) and /work/SRC/openSUSE:Factory/.kdoctools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdoctools" Wed Nov 14 14:34:09 2018 rev:61 rq:648511 version:5.52.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdoctools/kdoctools.changes 2018-10-22 11:11:23.751872273 +0200 +++ /work/SRC/openSUSE:Factory/.kdoctools.new/kdoctools.changes 2018-11-14 14:34:12.179278763 +0100 @@ -1,0 +2,15 @@ +Sun Nov 11 19:48:04 UTC 2018 - lbeltr...@kde.org + +- Update to 5.52.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.52.0.php +- Changes since 5.51.0: + * Fix autotests with -DBUILD_QCH:BOOL=TRUE + * API dox: fix typo + * API dox: add minimal docs to KDocTools namespace, so doxygen covers it + * Create a QCH file with the API dox, optionally, using ECMAddQCH + * Wait for docbookl10nhelper to be built before building our own manpages + * Use specified Perl interpreter instead of relying on PATH + +------------------------------------------------------------------- Old: ---- kdoctools-5.51.0.tar.xz New: ---- kdoctools-5.52.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdoctools.spec ++++++ --- /var/tmp/diff_new_pack.oRQKgg/_old 2018-11-14 14:34:12.647278306 +0100 +++ /var/tmp/diff_new_pack.oRQKgg/_new 2018-11-14 14:34:12.647278306 +0100 @@ -17,14 +17,14 @@ %define lname libKF5DocTools5 -%define _tar_path 5.51 +%define _tar_path 5.52 # 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 Name: kdoctools -Version: 5.51.0 +Version: 5.52.0 Release: 0 Summary: Create documentation from DocBook License: LGPL-2.1-or-later AND MIT ++++++ kdoctools-5.51.0.tar.xz -> kdoctools-5.52.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.51.0/CMakeLists.txt new/kdoctools-5.52.0/CMakeLists.txt --- old/kdoctools-5.51.0/CMakeLists.txt 2018-10-08 10:13:57.000000000 +0200 +++ new/kdoctools-5.52.0/CMakeLists.txt 2018-11-03 19:00:38.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.51.0") # handled by release scripts -set(KF5_DEP_VERSION "5.51.0") # handled by release scripts +set(KF5_VERSION "5.52.0") # handled by release scripts +set(KF5_DEP_VERSION "5.52.0") # handled by release scripts project(KDocTools VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.51.0 NO_MODULE) +find_package(ECM 5.52.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -18,6 +18,7 @@ include(ECMQtDeclareLoggingCategory) include(CMakePackageConfigHelpers) include(GenerateExportHeader) +include(ECMAddQch) ecm_setup_version(PROJECT VARIABLE_PREFIX KDOCTOOLS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdoctools_version.h" @@ -26,6 +27,8 @@ option(MEINPROC_NO_KARCHIVE "Compile meinproc without KArchive dependency. Only for internal usage on KDE infrastructure." OFF) option(INSTALL_INTERNAL_TOOLS "Install internal tools too." OFF) +option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) +add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") # Dependencies set(REQUIRED_QT_VERSION 5.8.0) @@ -104,6 +107,16 @@ install(EXPORT KF5DocToolsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DocToolsTargets.cmake NAMESPACE KF5:: ) +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5DocTools_QCH + FILE "${CMAKE_BINARY_DIR}/cmake/KF5DocToolsQchTargets.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsQchTargets.cmake\")") +endif() + configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5DocToolsConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/KF5DocToolsConfig.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.51.0/KF5DocToolsConfig.cmake.in new/kdoctools-5.52.0/KF5DocToolsConfig.cmake.in --- old/kdoctools-5.51.0/KF5DocToolsConfig.cmake.in 2018-10-08 10:13:57.000000000 +0200 +++ new/kdoctools-5.52.0/KF5DocToolsConfig.cmake.in 2018-11-03 19:00:38.000000000 +0100 @@ -27,3 +27,5 @@ # find_dependency must be called *after* including the macros or PACKAGE_PREFIX_DIR will be altered include(CMakeFindDependencyMacro) find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.51.0/KF5DocToolsMacros.cmake new/kdoctools-5.52.0/KF5DocToolsMacros.cmake --- old/kdoctools-5.51.0/KF5DocToolsMacros.cmake 2018-10-08 10:13:57.000000000 +0200 +++ new/kdoctools-5.52.0/KF5DocToolsMacros.cmake 2018-11-03 19:00:38.000000000 +0100 @@ -202,16 +202,19 @@ #Bootstrap if (_kdoctoolsBootStrapping) set(_bootstrapOption "--srcdir=${KDocTools_BINARY_DIR}/src") + set(_extraDependency "docbookl10nhelper") elseif (CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_NAME STREQUAL "Windows") set(_bootstrapOption "--srcdir=${KDOCTOOLS_DATA_INSTALL_DIR}/kdoctools") + set(_extraDependency) else () set(_bootstrapOption) + set(_extraDependency) endif () set(_ssheet "${KDOCTOOLS_CUSTOMIZATION_DIR}/kde-include-man.xsl") add_custom_command(OUTPUT ${build_doc} COMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --stylesheet ${_ssheet} --check ${_bootstrapOption} ${CMAKE_CURRENT_SOURCE_DIR}/${src_doc} - DEPENDS ${src_doc} ${_ssheet} + DEPENDS ${src_doc} ${_ssheet} ${_extraDependency} WORKING_DIRECTORY ${build_dir} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.51.0/cmake/uriencode.cmake new/kdoctools-5.52.0/cmake/uriencode.cmake --- old/kdoctools-5.51.0/cmake/uriencode.cmake 2018-10-08 10:13:57.000000000 +0200 +++ new/kdoctools-5.52.0/cmake/uriencode.cmake 2018-11-03 19:00:38.000000000 +0100 @@ -34,7 +34,7 @@ find_package(PerlModules COMPONENTS URI::Escape REQUIRED) # properly encode the URI string(REPLACE "\"" "\\\"" escaped_uri "${${_original_uri}}") - execute_process(COMMAND perl -MURI::Escape -e "print uri_escape_utf8(\"${escaped_uri}\", \"^A-Za-z0-9\\-\\._~\\/:\");" + execute_process(COMMAND ${PERL_EXECUTABLE} -MURI::Escape -e "print uri_escape_utf8(\"${escaped_uri}\", \"^A-Za-z0-9\\-\\._~\\/:\");" OUTPUT_VARIABLE encoded_uri RESULT_VARIABLE res_encoding OUTPUT_STRIP_TRAILING_WHITESPACE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.51.0/po/ast/kdoctools5.po new/kdoctools-5.52.0/po/ast/kdoctools5.po --- old/kdoctools-5.51.0/po/ast/kdoctools5.po 2018-10-08 10:13:57.000000000 +0200 +++ new/kdoctools-5.52.0/po/ast/kdoctools5.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# enolp <en...@softastur.org>, 2016. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2016-12-20 21:16+0100\n" -"Last-Translator: enolp <en...@softastur.org>\n" -"Language-Team: Asturian <alministrado...@softastur.org>\n" -"Language: ast\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" - -#: xslt.cpp:140 -#, kde-format -msgid "Parsing stylesheet" -msgstr "Analizando fueya de cálculu" - -#: xslt.cpp:164 -#, kde-format -msgid "Parsing document" -msgstr "Analizando documentu" - -#: xslt.cpp:190 -#, kde-format -msgid "Applying stylesheet" -msgstr "Aplicando fueya de cálculu" - -#: xslt.cpp:198 -#, kde-format -msgid "Writing document" -msgstr "Escribiendo documentu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.51.0/po/zh_CN/kdoctools5.po new/kdoctools-5.52.0/po/zh_CN/kdoctools5.po --- old/kdoctools-5.51.0/po/zh_CN/kdoctools5.po 2018-10-08 10:13:57.000000000 +0200 +++ new/kdoctools-5.52.0/po/zh_CN/kdoctools5.po 2018-11-03 19:00:38.000000000 +0100 @@ -8,8 +8,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2018-09-28 19:47\n" -"Last-Translator: guoyunhe <yunhe....@protonmail.com>\n" +"PO-Revision-Date: 2018-10-09 18:38\n" +"Last-Translator: guoyunhe <i...@guoyunhe.me>\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/kdoctools-5.51.0/src/CMakeLists.txt new/kdoctools-5.52.0/src/CMakeLists.txt --- old/kdoctools-5.51.0/src/CMakeLists.txt 2018-10-08 10:13:57.000000000 +0200 +++ new/kdoctools-5.52.0/src/CMakeLists.txt 2018-11-03 19:00:38.000000000 +0100 @@ -16,6 +16,7 @@ # removed using get_filename_component(... ABSOLUTE) install(CODE "file(RELATIVE_PATH DocBookXML4_DTD_DIR \"${NORMALIZED_DTD_INSTALL_PATH}\" \"${DocBookXML4_DTD_DIR}\") + set(PERL_EXECUTABLE \"${PERL_EXECUTABLE}\") include(\"${CMAKE_SOURCE_DIR}/cmake/uriencode.cmake\") set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\") kdoctools_encode_uri(DocBookXML4_DTD_DIR) @@ -54,8 +55,12 @@ target_include_directories(KF5DocTools INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KDocTools>") -install(FILES +set(KDocTools_HEADERS docbookxslt.h +) + +install(FILES + ${KDocTools_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/kdoctools_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDocTools COMPONENT Devel @@ -68,6 +73,26 @@ install(TARGETS KF5DocTools EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +if(BUILD_QCH) + ecm_add_qch( + KF5DocTools_QCH + NAME KDocTools + BASE_NAME KF5DocTools + VERSION ${KF5_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${KDocTools_HEADERS} + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + LINK_QCHS + Qt5Core_QCH + BLANK_MACROS + KDOCTOOLS_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + ########### next target ############### set_source_files_properties(xslt.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSLT ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.51.0/src/docbookxslt.h new/kdoctools-5.52.0/src/docbookxslt.h --- old/kdoctools-5.51.0/src/docbookxslt.h 2018-10-08 10:13:57.000000000 +0200 +++ new/kdoctools-5.52.0/src/docbookxslt.h 2018-11-03 19:00:38.000000000 +0100 @@ -32,10 +32,14 @@ class QByteArray; class QString; +/** + * @namespace KDocTools + * Utility methods to generate documentation in various format from DocBook files + */ namespace KDocTools { /** - * Tranform and return the content of file with the specified XSLT stylesheet + * Transform and return the content of file with the specified XSLT stylesheet * (both already in memory) using the optional parameters. */ KDOCTOOLS_EXPORT QString transform(const QString &file, const QString &stylesheet,
