Hello community, here is the log from the commit of package kdoctools for openSUSE:Factory checked in at 2014-03-10 12:17:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdoctools (Old) and /work/SRC/openSUSE:Factory/.kdoctools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdoctools" Changes: -------- --- /work/SRC/openSUSE:Factory/kdoctools/kdoctools.changes 2014-02-24 06:53:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdoctools.new/kdoctools.changes 2014-03-10 12:17:45.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:38:49 UTC 2014 - [email protected] + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- kdoctools-4.96.0.tar.xz New: ---- kdoctools-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdoctools.spec ++++++ --- /var/tmp/diff_new_pack.rgtxzM/_old 2014-03-10 12:17:45.000000000 +0100 +++ /var/tmp/diff_new_pack.rgtxzM/_new 2014-03-10 12:17:45.000000000 +0100 @@ -17,14 +17,16 @@ Name: kdoctools -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: docbook-xsl-stylesheets -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: docbook_4 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: karchive-devel >= %{_kf5_version} BuildRequires: kf5-filesystem +BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 Summary: Create documentation from DocBook @@ -66,7 +68,7 @@ %files %defattr(-,root,root) %doc COPYING* README* LICENSE -%{_kf5_appsdir}/ksgmltools2/ +%{_kf5_appsdir}/kdoctools5/ %files devel %defattr(-,root,root) ++++++ kdoctools-4.96.0.tar.xz -> kdoctools-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/CMakeLists.txt new/kdoctools-4.97.0/CMakeLists.txt --- old/kdoctools-4.96.0/CMakeLists.txt 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/CMakeLists.txt 2014-03-01 15:42:39.000000000 +0100 @@ -3,16 +3,19 @@ project(KDocTools) # ECM setup -find_package(ECM 0.0.10 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) include(ECMSetupVersion) +include(ECMMarkNonGuiExecutable) +include(ECMPackageConfigHelpers) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDOCTOOLS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdoctools_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DocToolsConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DocToolsConfigVersion.cmake" + SOVERSION 5) # Dependencies set(REQUIRED_QT_VERSION 5.2.0) @@ -21,10 +24,8 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") - # KF5 frameworks - find_package(KF5Archive REQUIRED) -endif() +# KF5 frameworks +find_package(KF5Archive REQUIRED) find_package(LibXslt) set_package_properties(LibXslt PROPERTIES @@ -41,17 +42,15 @@ ) -find_package(DocBookXML) +find_package(DocBookXML4 "4.2") -set_package_properties(DocBookXML PROPERTIES DESCRIPTION "DocBook XML" - URL "http://www.oasis-open.org/docbook/xml/${DOCBOOKXML_CURRENTDTD_VERSION}"; +set_package_properties(DocBookXML4 PROPERTIES TYPE REQUIRED PURPOSE "Required by the KDE help system to process DocBook XML" ) find_package(DocBookXSL) -set_package_properties(DocBookXSL PROPERTIES DESCRIPTION "DocBook XSL" - URL "http://docbook.sourceforge.net/release/xsl/current/"; +set_package_properties(DocBookXSL PROPERTIES TYPE REQUIRED PURPOSE "Required by the KDE help system to process DocBook XML" ) @@ -72,7 +71,7 @@ add_subdirectory(src) install(EXPORT KF5DocToolsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5DocToolsTargets.cmake NAMESPACE KF5:: ) -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5DocToolsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5DocToolsConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/KF5DocToolsConfig.cmake.in new/kdoctools-4.97.0/KF5DocToolsConfig.cmake.in --- old/kdoctools-4.96.0/KF5DocToolsConfig.cmake.in 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/KF5DocToolsConfig.cmake.in 2014-03-01 15:42:39.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ set(KDOCTOOLS_DATA_INSTALL_DIR "${PACKAGE_PREFIX_DIR}/@DATA_INSTALL_DIR@") -set(KDOCTOOLS_CUSTOMIZATION_DIR "${KDOCTOOLS_DATA_INSTALL_DIR}/ksgmltools2/customization") +set(KDOCTOOLS_CUSTOMIZATION_DIR "${KDOCTOOLS_DATA_INSTALL_DIR}/kdoctools5/customization") include("${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/cmake/FindDocBookXML4.cmake new/kdoctools-4.97.0/cmake/FindDocBookXML4.cmake --- old/kdoctools-4.96.0/cmake/FindDocBookXML4.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/kdoctools-4.97.0/cmake/FindDocBookXML4.cmake 2014-03-01 15:42:39.000000000 +0100 @@ -0,0 +1,81 @@ +# Try to find DocBook XML 4.x DTD. +# By default it will find version 4.2. A different version can be specified +# as parameter for find_package(). +# Once done, it will define: +# +# DocBookXML4_FOUND - system has the requested DocBook4 XML DTDs +# DocBookXML4_DTD_VERSION - the version of requested DocBook4 +# XML DTD +# DocBookXML4_DTD_DIR - the directory containing the definition of +# the DocBook4 XML + +# Copyright (c) 2010, 2014 Luigi Toscano, <[email protected]> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +if (NOT DocBookXML_FIND_VERSION) + set(DocBookXML_FIND_VERSION "4.2") +endif () + +set (DocBookXML4_DTD_VERSION ${DocBookXML_FIND_VERSION} + CACHE INTERNAL "Required version of DocBook4 XML DTDs") + +include(FeatureSummary) +set_package_properties(DocBookXML4 PROPERTIES DESCRIPTION "DocBook XML 4" + URL "http://www.oasis-open.org/docbook/xml/${DocBookXML4_DTD_VERSION}"; + ) + +function (locate_version version found_dir) + + set (DTD_PATH_LIST + share/xml/docbook/schema/dtd/${version} + share/xml/docbook/xml-dtd-${version} + share/sgml/docbook/xml-dtd-${version} + share/xml/docbook/${version} + ) + + find_path (searched_dir docbookx.dtd + PATHS ${CMAKE_SYSTEM_PREFIX_PATH} + PATH_SUFFIXES ${DTD_PATH_LIST} + ) + + if (NOT searched_dir) + # hacks for systems that use the package version in the DTD dirs, + # e.g. Fedora, OpenSolaris + set (DTD_PATH_LIST) + foreach (DTD_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH}) + file(GLOB DTD_SUFFIX_ITER RELATIVE ${DTD_PREFIX_ITER} + ${DTD_PREFIX_ITER}/share/sgml/docbook/xml-dtd-${version}-* + ) + if (DTD_SUFFIX_ITER) + list (APPEND DTD_PATH_LIST ${DTD_SUFFIX_ITER}) + endif () + endforeach () + + find_path (searched_dir docbookx.dtd + PATHS ${CMAKE_SYSTEM_PREFIX_PATH} + PATH_SUFFIXES ${DTD_PATH_LIST} + ) + endif () + set (${found_dir} ${searched_dir} PARENT_SCOPE) +endfunction() + + +locate_version (${DocBookXML4_DTD_VERSION} DocBookXML4_DTD_DIR) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args (DocBookXML4 + REQUIRED_VARS DocBookXML4_DTD_DIR DocBookXML4_DTD_VERSION + FOUND_VAR DocBookXML4_FOUND) + +#maintain backwards compatibility +# legacy version +locate_version ("4.2" DOCBOOKXML_CURRENTDTD_DIR) +if (DOCBOOKXML_CURRENTDTD_DIR) + set(DOCBOOKXML_FOUND "TRUE") + set(DOCBOOKXML_CURRENTDTD_VERSION "4.2") +endif () + +mark_as_advanced (DocBookXML4_DTD_DIR DocBookXML4_DTD_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/cmake/FindDocBookXSL.cmake new/kdoctools-4.97.0/cmake/FindDocBookXSL.cmake --- old/kdoctools-4.96.0/cmake/FindDocBookXSL.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/kdoctools-4.97.0/cmake/FindDocBookXSL.cmake 2014-03-01 15:42:39.000000000 +0100 @@ -0,0 +1,61 @@ +# Try to find DocBook XSL stylesheet +# Once done, it will define: +# +# DocBookXSL_FOUND - system has the required DocBook XML DTDs +# DocBookXSL_DIR - the directory containing the stylesheets +# used to process DocBook XML + +# Copyright (c) 2010, Luigi Toscano, <[email protected]> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +include(FeatureSummary) +set_package_properties(DocBookXSL PROPERTIES DESCRIPTION "DocBook XSL" + URL "http://docbook.sourceforge.net/release/xsl/current/"; + ) + +set (STYLESHEET_PATH_LIST + share/xml/docbook/stylesheet/docbook-xsl + share/xml/docbook/xsl-stylesheets + share/sgml/docbook/xsl-stylesheets + share/xml/docbook/stylesheet/nwalsh/current + share/xml/docbook/stylesheet/nwalsh + share/xsl/docbook + share/xsl/docbook-xsl +) + +find_path (DocBookXSL_DIR lib/lib.xsl + PATHS ${CMAKE_SYSTEM_PREFIX_PATH} + PATH_SUFFIXES ${STYLESHEET_PATH_LIST} +) + +if (NOT DocBookXSL_DIR) + # hacks for systems that put the version in the stylesheet dirs + set (STYLESHEET_PATH_LIST) + foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH}) + file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER} + ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-* + ) + if (STYLESHEET_SUFFIX_ITER) + list (APPEND STYLESHEET_PATH_LIST ${STYLESHEET_SUFFIX_ITER}) + endif () + endforeach () + + find_path (DocBookXSL_DIR VERSION + PATHS ${CMAKE_SYSTEM_PREFIX_PATH} + PATH_SUFFIXES ${STYLESHEET_PATH_LIST} + ) +endif () + + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args (DocBookXSL + REQUIRED_VARS DocBookXSL_DIR + FOUND_VAR DocBookXSL_FOUND) + +#maintain backwards compatibility +set(DOCBOOKXSL_FOUND ${DocBookXSL_FOUND}) +set(DOCBOOKXSL_DIR ${DocBookXSL_DIR}) + +mark_as_advanced (DocBookXSL_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/config-kdoctools.h.cmake new/kdoctools-4.97.0/config-kdoctools.h.cmake --- old/kdoctools-4.96.0/config-kdoctools.h.cmake 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/config-kdoctools.h.cmake 2014-03-01 15:42:39.000000000 +0100 @@ -1,6 +1,6 @@ #define XMLLINT "${LIBXML2_XMLLINT_EXECUTABLE}" -#define DOCBOOK_XML_CURRDTD "@DOCBOOKXML_CURRENTDTD_DIR@" +#define DOCBOOK_XML_CURRDTD "@DocBookXML4_DTD_DIR@" /* Define to 1 if you have stdio.h */ #cmakedefine01 HAVE_STDIO_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/src/CMakeLists.txt new/kdoctools-4.97.0/src/CMakeLists.txt --- old/kdoctools-4.96.0/src/CMakeLists.txt 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/src/CMakeLists.txt 2014-03-01 15:42:39.000000000 +0100 @@ -6,14 +6,18 @@ # see the .xsl.cmake files for a more verbose explanation below if(NOT WIN32) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} - DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/dtd ) + DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/customization/dtd ) else() + # 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) install(CODE - "FILE(RELATIVE_PATH DOCBOOKXML_CURRENTDTD_DIR \${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/ksgmltools2/customization/dtd ${DOCBOOKXML_CURRENTDTD_DIR}) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}.install)" + "get_filename_component(NORMALIZED_INSTALL_PATH \"${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/kdoctools5/customization/dtd\" ABSOLUTE) + file(RELATIVE_PATH DocBookXML4_DTD_DIR \"${NORMALIZED_INSTALL_PATH}\" \"${DocBookXML4_DTD_DIR}\") + 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 ${DATA_INSTALL_DIR}/ksgmltools2/customization/dtd RENAME ${_custom_dtd_kdex_name}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}.install DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/customization/dtd RENAME ${_custom_dtd_kdex_name}) endif() # needed by KIO, need to export it @@ -49,6 +53,7 @@ endif() add_executable(meinproc5 meinproc.cpp meinproc_common.cpp xslt.cpp ${meinproc_additional_SRCS}) + ecm_mark_nongui_executable(meinproc5) target_link_libraries(meinproc5 Qt5::Core ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} ${meinproc_additional_LIBS}) install(TARGETS meinproc5 EXPORT KF5DocToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) @@ -73,12 +78,12 @@ configure_file( ${_kdeincludexslt} ${_kdeincludexslt_binarypath} ) if(NOT WIN32) install(FILES ${_kdeincludexslt_binarypath} - DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization ) + DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/customization ) else() install(CODE - "FILE(RELATIVE_PATH DOCBOOKXSL_DIR \${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/ksgmltools2/customization ${DOCBOOKXSL_DIR}) + "FILE(RELATIVE_PATH DOCBOOKXSL_DIR \${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/kdoctools5/customization ${DOCBOOKXSL_DIR}) CONFIGURE_FILE( ${_kdeincludexslt} ${_kdeincludexslt_binarypath}.install )") - install(FILES ${_kdeincludexslt_binarypath}.install DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization RENAME ${_kdeincludexslt_out}) + install(FILES ${_kdeincludexslt_binarypath}.install DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/customization RENAME ${_kdeincludexslt_out}) endif() endforeach( _kdeincludexslt ${_kdeincludexslt_ALL} ) @@ -88,7 +93,7 @@ macro(INSTALL_CUSTOMIZE_DIR _expr _directory) FILE(GLOB _file_CUST "${_expr}" ) foreach(_curentfile ${_file_CUST}) - install(FILES ${_curentfile} DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/${_directory} ) + install(FILES ${_curentfile} DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/${_directory} ) endforeach(_curentfile ${_file_CUST}) endmacro(INSTALL_CUSTOMIZE_DIR _expr _directory) @@ -103,7 +108,7 @@ configure_file(${_curentfile} ${_currentfile_binary_path} COPYONLY) install(FILES ${_currentfile_binary_path} - DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/${_directory} ) + DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/${_directory} ) endforeach(_curentfile ${_file_CUST}) endmacro(INSTALL_CUSTOMIZE_L_DIR _expr _directory) @@ -143,14 +148,16 @@ set( docbookl10nhelper_SRCS docbookl10nhelper.cpp ) add_executable( docbookl10nhelper ${docbookl10nhelper_SRCS} ) +ecm_mark_nongui_executable( docbookl10nhelper ) target_link_libraries( docbookl10nhelper Qt5::Core ) add_custom_command( TARGET docbookl10nhelper POST_BUILD - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/docbookl10nhelper - ${DOCBOOKXSL_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/customization/xsl - ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl + COMMAND $<TARGET_FILE:docbookl10nhelper> + "${DOCBOOKXSL_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/customization/xsl" + "${CMAKE_CURRENT_BINARY_DIR}/customization/xsl" ) + # all-l10n.xml is generated by docbookl10nhelper install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/all-l10n.xml - DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/xsl/ ) + DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/customization/xsl/ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/src/customization/dtd/kdex.dtd.cmake new/kdoctools-4.97.0/src/customization/dtd/kdex.dtd.cmake --- old/kdoctools-4.96.0/src/customization/dtd/kdex.dtd.cmake 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/src/customization/dtd/kdex.dtd.cmake 2014-03-01 15:42:39.000000000 +0100 @@ -97,7 +97,7 @@ <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "@DOCBOOKXML_CURRENTDTD_DIR@/docbookx.dtd" > + "@DocBookXML4_DTD_DIR@/docbookx.dtd" > %DocBookDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/src/customization/entities/general.entities new/kdoctools-4.97.0/src/customization/entities/general.entities --- old/kdoctools-4.96.0/src/customization/entities/general.entities 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/src/customization/entities/general.entities 2014-03-01 15:42:39.000000000 +0100 @@ -178,6 +178,7 @@ <!ENTITY karbon14 "<application>Karbon14</application>"> <!ENTITY kasteroids "<application>KAsteroids</application>"> <!ENTITY kate "<application>Kate</application>"> +<!ENTITY katepart "<application>KatePart</application>"> <!ENTITY katomic "<application>KAtomic</application>"> <!ENTITY kbabel "<application>KBabel</application>"> <!ENTITY kbabeldict "<application>KBabelDict</application>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/src/meinproc.cpp new/kdoctools-4.97.0/src/meinproc.cpp --- old/kdoctools-4.96.0/src/meinproc.cpp 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/src/meinproc.cpp 2014-03-01 15:42:39.000000000 +0100 @@ -26,10 +26,8 @@ #include <libxslt/xsltutils.h> #include <libexslt/exslt.h> -#include <stdlib.h> #include <string.h> -#include <sys/time.h> -#include <unistd.h> +#include <qplatformdefs.h> #include <qcommandlineparser.h> #include <qcommandlineoption.h> @@ -147,8 +145,7 @@ if (parser.isSet(QStringLiteral("check"))) { QByteArray catalogs; - catalogs += QUrl::fromLocalFile(locateFileInDtdResource(QStringLiteral("customization/catalog.xml"))).toEncoded(); - + catalogs += getKDocToolsCatalogs().join(" ").toLocal8Bit(); QString exe; #if defined( XMLLINT ) exe = QStringLiteral(XMLLINT); @@ -173,7 +170,7 @@ #ifndef Q_OS_WIN // libxslt parses the path given to outputFile as XPath expression which fails // see libxslt/xsltEvalUserParams - // this parameter is used only by share/apps/ksgmltools2/docbook/xsl/html/math.xsl + // this parameter is used only by share/kdoctools5/docbook/xsl/html/math.xsl // and is not supported on windows yet if (parser.isSet(QStringLiteral("output"))) { params.append(qstrdup("outputFile")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/src/meinproc_common.cpp new/kdoctools-4.97.0/src/meinproc_common.cpp --- old/kdoctools-4.96.0/src/meinproc_common.cpp 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/src/meinproc_common.cpp 2014-03-01 15:42:39.000000000 +0100 @@ -8,6 +8,18 @@ #include <cstdlib> +#ifdef Q_OS_WIN +static inline FILE *popen(const char *command, const char *mode) +{ + return _popen(command, mode); +} + +static inline int pclose(FILE* file) +{ + return _pclose(file); +} +#endif + CheckFileResult checkFile(const QString &checkFilename) { const QFileInfo checkFile(checkFilename); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/src/xslt.cpp new/kdoctools-4.97.0/src/xslt.cpp --- old/kdoctools-4.96.0/src/xslt.cpp 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/src/xslt.cpp 2014-03-01 15:42:39.000000000 +0100 @@ -1,5 +1,12 @@ #include "xslt.h" +#ifdef Q_OS_WIN +//one of the xslt/xml headers pulls in windows.h and breaks <limits> +#define NOMINMAX +#include "../config-kdoctools.h" +#include <QtCore/QHash> +#endif + #include <libxslt/xsltconfig.h> #include <libxslt/xsltInternals.h> #include <libxslt/transform.h> @@ -17,11 +24,6 @@ #include <QtCore/QUrl> #include <QtCore/QDebug> -#ifdef Q_OS_WIN -#include <config-kdoctools.h> -#include <QtCore/QHash> -#endif - #if !defined( SIMPLE_XSLT ) extern HelpProtocol *slave; #define INFO( x ) if (slave) slave->infoMessage(x); @@ -359,17 +361,17 @@ QByteArray catalogs; if (srcdir.isEmpty()) { - catalogs += QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("ksgmltools2/customization/catalog.xml"))).toEncoded(); + catalogs += getKDocToolsCatalogs().join(" ").toLocal8Bit(); } else { catalogs += QUrl::fromLocalFile(srcdir + QStringLiteral("/customization/catalog.xml")).toEncoded(); s_dtdDirs()->srcdir = srcdir; } - + //qDebug() << "XML_CATALOG_FILES: " << catalogs; qputenv("XML_CATALOG_FILES", catalogs); xmlInitializeCatalog(); } -QString locateFileInDtdResource(const QString &file) +QString locateFileInDtdResource(const QString &file, const QStandardPaths::LocateOptions option) { QFileInfo info(file); if (info.exists() && info.isAbsolute()) { @@ -382,7 +384,44 @@ if (QFile::exists(test)) { return test; } + qDebug() << "Could not locate file:" << file; return QString(); } - return QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("ksgmltools2/") + file); + const QString result = QStandardPaths::locate(QStandardPaths::GenericDataLocation, + QStringLiteral("kdoctools5/") + file, option); + if (result.isEmpty()) { + qDebug() << "Could not locate file:" << file; + } + return result; +} + +QStringList getKDocToolsCatalogs() +{ + // find all catalogs as catalog*.xml, and add them to the list, + // starting from catalog.xml (the main one). + const QString customizationDirName = locateFileInDtdResource(QStringLiteral("customization"), + QStandardPaths::LocateDirectory); + if (customizationDirName.isEmpty()) { + return QStringList(); + } + QDir customizationDir = QDir(customizationDirName); + const QStringList catalogFileFilters(QStringLiteral("catalog*.xml")); + const QFileInfoList catalogInfoFiles = customizationDir.entryInfoList(catalogFileFilters, + QDir::Files | QDir::NoSymLinks, QDir::Name); + QStringList catalogFiles; + foreach (const QFileInfo &fileInfo, catalogInfoFiles) { + const QString fullFileName = QUrl::fromLocalFile(fileInfo.absoluteFilePath()).toEncoded(); + if (fileInfo.fileName() == QStringLiteral("catalog.xml")) { + catalogFiles.prepend(fullFileName); + } else { + catalogFiles.append(fullFileName); + } + } + + QStringList catalogs; + foreach (const QString &aCatalog, catalogFiles) { + catalogs << aCatalog; + } + //qDebug() << "Found catalogs: " << catalogs; + return catalogs; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.96.0/src/xslt.h new/kdoctools-4.97.0/src/xslt.h --- old/kdoctools-4.96.0/src/xslt.h 2014-02-05 21:11:09.000000000 +0100 +++ new/kdoctools-4.97.0/src/xslt.h 2014-03-01 15:42:39.000000000 +0100 @@ -2,6 +2,7 @@ #define _MEIN_XSLT_H_ #include <libxml/parser.h> +#include <QtCore/QStandardPaths> #include <QtCore/QString> #include <QtCore/QVector> @@ -16,6 +17,7 @@ bool saveToCache(const QString &contents, const QString &filename); void setupStandardDirs(const QString &srcdir = QString()); -QString locateFileInDtdResource(const QString &file); +QString locateFileInDtdResource(const QString &file, const QStandardPaths::LocateOptions option=QStandardPaths::LocateFile); +QStringList getKDocToolsCatalogs(); #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
