Hello community,
here is the log from the commit of package kdoctools for openSUSE:Factory checked in at 2015-03-16 09:30:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-02-16 17:30:59.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdoctools.new/kdoctools.changes 2015-03-16 09:30:48.000000000 +0100
@@ -1,0 +2,12 @@
+Sat Mar 7 16:58:44 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.8.0
+ * Fix the build on MacOSX when using Homebrew
+ * Better styling of media objects (images, ...) in documentation
+ * Encode invalid chars in paths used in XML DTDs, avoiding errors
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.8.0.php
+- Drop karchive-devel from devel package requires
+- Added perl-URI buildrequires
+
+-------------------------------------------------------------------
Old:
----
kdoctools-5.7.0.tar.xz
New:
----
kdoctools-5.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdoctools.spec ++++++
--- /var/tmp/diff_new_pack.0P5gOF/_old 2015-03-16 09:30:48.000000000 +0100
+++ /var/tmp/diff_new_pack.0P5gOF/_new 2015-03-16 09:30:48.000000000 +0100
@@ -16,7 +16,7 @@
#
-%define _tar_path 5.7
+%define _tar_path 5.8
Name: kdoctools
Version: %{_tar_path}.0
Release: 0
@@ -24,13 +24,14 @@
BuildRequires: cmake >= 2.8.12
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook_4
-BuildRequires: extra-cmake-modules >= 1.7.0
+BuildRequires: extra-cmake-modules >= 1.8.0
BuildRequires: fdupes
BuildRequires: karchive-devel >= %{kf5_version}
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel >= %{kf5_version}
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
+BuildRequires: perl-URI
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
Recommends: %{name}-lang = %{version}
Summary: Create documentation from DocBook
@@ -48,8 +49,7 @@
Group: Development/Libraries/KDE
Requires: %{name} = %{version}
Requires: docbook-xsl-stylesheets
-Requires: extra-cmake-modules
-Requires: karchive-devel >= %{kf5_version}
+Requires: extra-cmake-modules >= 1.8.0
Requires: libxslt-devel
Requires: pkgconfig(Qt5Core) >= 5.2.0
Provides: %{name}-devel-static = %{version}
++++++ kdoctools-5.7.0.tar.xz -> kdoctools-5.8.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/CMakeLists.txt new/kdoctools-5.8.0/CMakeLists.txt
--- old/kdoctools-5.7.0/CMakeLists.txt 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/CMakeLists.txt 2015-03-07 15:42:36.000000000 +0100
@@ -3,7 +3,7 @@
project(KDocTools)
# ECM setup
-find_package(ECM 1.7.0 REQUIRED NO_MODULE)
+find_package(ECM 1.8.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(FeatureSummary)
@@ -11,8 +11,8 @@
include(ECMMarkNonGuiExecutable)
include(ECMPackageConfigHelpers)
-set(KF5_VERSION "5.7.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.7.0") # handled by release scripts
+set(KF5_VERSION "5.8.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.8.0") # handled by release scripts
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"
@@ -87,6 +87,8 @@
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5DocToolsConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5DocToolsConfig.cmake"
+ PATH_VARS
+ KDE_INSTALL_DATADIR_KF5
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/KF5DocToolsConfig.cmake.in new/kdoctools-5.8.0/KF5DocToolsConfig.cmake.in
--- old/kdoctools-5.7.0/KF5DocToolsConfig.cmake.in 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/KF5DocToolsConfig.cmake.in 2015-03-07 15:42:36.000000000 +0100
@@ -1,6 +1,6 @@
@PACKAGE_INIT@
-set(KDOCTOOLS_DATA_INSTALL_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@")
+set(KDOCTOOLS_DATA_INSTALL_DIR "@PACKAGE_KDE_INSTALL_DATADIR_KF5@")
set(KDOCTOOLS_CUSTOMIZATION_DIR "${KDOCTOOLS_DATA_INSTALL_DIR}/kdoctools/customization")
include("${CMAKE_CURRENT_LIST_DIR}/KF5DocToolsTargets.cmake")
@@ -9,4 +9,3 @@
# find_dependency must be called *after* including the macros or PACKAGE_PREFIX_DIR will be altered
find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
-find_dependency(KF5Archive "@KF5_DEP_VERSION@")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/cmake/uriencode.cmake new/kdoctools-5.8.0/cmake/uriencode.cmake
--- old/kdoctools-5.7.0/cmake/uriencode.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/kdoctools-5.8.0/cmake/uriencode.cmake 2015-03-07 15:42:36.000000000 +0100
@@ -0,0 +1,23 @@
+# Encode an URI according to RFC 2396
+# kdoctools_encode_uri takes a variable name and it encodes
+# its value according to RFC 2396 (minus few reserved characters)
+# overwriting the original value.
+#
+# Copyright (c) 2014 Luigi Toscano,
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+function(kdoctools_encode_uri _original_uri)
+ find_package(Perl 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\\-\\._~\\/\");"
+ OUTPUT_VARIABLE encoded_uri
+ RESULT_VARIABLE res_encoding
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if (NOT ${res_encoding} EQUAL 0)
+ message(FATAL_ERROR "Problem while encoding the URI ${${_original_uri}}")
+ endif()
+ set(${_original_uri} "${encoded_uri}" PARENT_SCOPE)
+endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/common/en/kde-default.css new/kdoctools-5.8.0/common/en/kde-default.css
--- old/kdoctools-5.7.0/common/en/kde-default.css 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/common/en/kde-default.css 2015-03-07 15:42:36.000000000 +0100
@@ -303,7 +303,7 @@
}
.caption {
- margin: 0em 2em 3em 2em;
+ margin: 0em 2em 0em 2em;
text-align: center;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/common/en/kde-docs.css new/kdoctools-5.8.0/common/en/kde-docs.css
--- old/kdoctools-5.7.0/common/en/kde-docs.css 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/common/en/kde-docs.css 2015-03-07 15:42:36.000000000 +0100
@@ -254,6 +254,18 @@
margin-left: 0cm;
}
+.screenshot, .informalfigure {
+ border: 1px solid gray;
+ background-color: rgb(240,240,240);
+}
+
+/* We no longer render <hr>s around <mediaobject>s, but this hides them in case
+ * old generated HTML is displayed with the new style.
+ */
+.mediaobject hr, .mediaobjectco hr {
+ display: none;
+}
+
/*
* This gives us the styling for the header and footer.
* See customization/kde-navig.xsl for where it's used.
Files old/kdoctools-5.7.0/common/en/part_of_the_kde_family_horizontal_190.png and new/kdoctools-5.8.0/common/en/part_of_the_kde_family_horizontal_190.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/src/CMakeLists.txt new/kdoctools-5.8.0/src/CMakeLists.txt
--- old/kdoctools-5.7.0/src/CMakeLists.txt 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/src/CMakeLists.txt 2015-03-07 15:42:36.000000000 +0100
@@ -1,5 +1,7 @@
include_directories( ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} )
+include(uriencode)
+kdoctools_encode_uri(DocBookXML4_DTD_DIR)
set (_custom_dtd_kdex "customization/dtd/kdedbx45.dtd")
configure_file(${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} )
# WARNING: this is due to severe limitations on the windows platform to keep the dtd relocateable
@@ -14,6 +16,8 @@
# removed using get_filename_component(... ABSOLUTE)
install(CODE
"file(RELATIVE_PATH DocBookXML4_DTD_DIR \"${NORMALIZED_DTD_INSTALL_PATH}\" \"${DocBookXML4_DTD_DIR}\")
+ include(${CMAKE_SOURCE_DIR}/cmake/uriencode.cmake)
+ kdoctools_encode_uri(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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/src/customization/kde-style.xsl new/kdoctools-5.8.0/src/customization/kde-style.xsl
--- old/kdoctools-5.7.0/src/customization/kde-style.xsl 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/src/customization/kde-style.xsl 2015-03-07 15:42:36.000000000 +0100
@@ -54,10 +54,8 @@
<a name="{@id}"/>
- <hr/>
- <hr/>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/src/customization/kde-web-navig.xsl new/kdoctools-5.8.0/src/customization/kde-web-navig.xsl
--- old/kdoctools-5.7.0/src/customization/kde-web-navig.xsl 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/src/customization/kde-web-navig.xsl 2015-03-07 15:42:36.000000000 +0100
@@ -14,8 +14,8 @@
</tr>
<tr id="logo">
<td valign="top">
- <img src="{$kde.common}kde_logo.png" alt="KDE -
- The K Desktop Environment" width="296" height="79" border="0" />
+
</td>
<td valign="middle" align="center" id="location">
<h1><!-- Why was this used in fact: could the text not just be copied?-->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/src/docbookl10nhelper.cpp new/kdoctools-5.8.0/src/docbookl10nhelper.cpp
--- old/kdoctools-5.7.0/src/docbookl10nhelper.cpp 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/src/docbookl10nhelper.cpp 2015-03-07 15:42:36.000000000 +0100
@@ -206,7 +206,7 @@
QStringList dirFileFilters;
dirFileFilters << QStringLiteral("*.xml");
QStringList customLangFiles = outDir.entryList(dirFileFilters,
- QDir::Files | QDir::NoSymLinks, QDir::Name);
+ QDir::Files, QDir::Name);
/* the following two calls to removeOne should not be needed, as
* the customization directory from the sources should not contain
* those files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.7.0/src/xslt.cpp new/kdoctools-5.8.0/src/xslt.cpp
--- old/kdoctools-5.7.0/src/xslt.cpp 2015-02-08 16:16:55.000000000 +0100
+++ new/kdoctools-5.8.0/src/xslt.cpp 2015-03-07 15:42:36.000000000 +0100
@@ -440,7 +440,7 @@
QDir customizationDir = QDir(customizationDirName);
const QStringList catalogFileFilters(QStringLiteral("catalog*.xml"));
const QFileInfoList catalogInfoFiles = customizationDir.entryInfoList(catalogFileFilters,
- QDir::Files | QDir::NoSymLinks, QDir::Name);
+ QDir::Files, QDir::Name);
foreach (const QFileInfo &fileInfo, catalogInfoFiles) {
const QString fullFileName = QUrl::fromLocalFile(fileInfo.absoluteFilePath()).toEncoded();
if (fileInfo.fileName() == QStringLiteral("catalog.xml")) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org