Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2018-03-20 21:35:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Tue Mar 20 21:35:43 2018 rev:41 rq:585490 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2018-02-12 09:58:14.962192595 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2018-03-20 21:35:47.706744021 +0100 @@ -1,0 +2,12 @@ +Thu Mar 08 23:50:55 CET 2018 - [email protected] + +- Update to 17.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.3.php +- Changes since 17.12.2: + * Properly workaround xsltproc not handling spaces in filepaths on Windows + * Add warning in case an invalid mimetype is requested here. + * Restart DataStore's keep-alive query when opening connection + +------------------------------------------------------------------- Old: ---- akonadi-17.12.2.tar.xz New: ---- akonadi-17.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.d5sfHg/_old 2018-03-20 21:35:48.634710618 +0100 +++ /var/tmp/diff_new_pack.d5sfHg/_new 2018-03-20 21:35:48.634710618 +0100 @@ -20,13 +20,13 @@ %define rname akonadi Name: akonadi-server -Version: 17.12.2 +Version: 17.12.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: PIM Storage Service -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE Url: http://akonadi-project.org Source: %{rname}-%{version}.tar.xz ++++++ akonadi-17.12.2.tar.xz -> akonadi-17.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/CMakeLists.txt new/akonadi-17.12.3/CMakeLists.txt --- old/akonadi-17.12.2/CMakeLists.txt 2018-02-06 01:37:37.000000000 +0100 +++ new/akonadi-17.12.3/CMakeLists.txt 2018-03-06 01:26:54.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.2") +set(PIM_VERSION "5.7.3") project(Akonadi VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/KF5AkonadiMacros.cmake new/akonadi-17.12.3/KF5AkonadiMacros.cmake --- old/akonadi-17.12.2/KF5AkonadiMacros.cmake 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/KF5AkonadiMacros.cmake 2018-03-05 11:14:26.000000000 +0100 @@ -95,3 +95,34 @@ LINK_LIBRARIES "${link_libraries}" ) endfunction() + +function(kcfg_generate_dbus_interface _kcfg _name) + if (NOT XSLTPROC_EXECUTABLE) + message(FATAL_ERROR "xsltproc executable not found but needed by KCFG_GENERATE_DBUS_INTERFACE()") + endif() + + # When using this macro inside Akonadi, we need to refer to the file in the + # repo + if (Akonadi_SOURCE_DIR) + set(xsl_path ${Akonadi_SOURCE_DIR}/src/core/kcfg2dbus.xsl) + else() + set(xsl_path ${KF5Akonadi_DATA_DIR}/kcfg2dbus.xsl) + endif() + file(RELATIVE_PATH xsl_relpath ${CMAKE_CURRENT_BINARY_DIR} ${xsl_path}) + if (IS_ABSOLUTE ${_kcfg}) + file(RELATIVE_PATH kcfg_relpath ${CMAKE_CURRENT_BINARY_DIR} ${_kcfg}) + else() + file(RELATIVE_PATH kcfg_relpath ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg}) + endif() + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml + COMMAND ${XSLTPROC_EXECUTABLE} + --output ${_name}.xml + --stringparam interfaceName ${_name} + ${xsl_relpath} + ${kcfg_relpath} + DEPENDS + ${xsl_path} + ${_kcfg} + ) +endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/autotests/libs/testresource/CMakeLists.txt new/akonadi-17.12.3/autotests/libs/testresource/CMakeLists.txt --- old/akonadi-17.12.2/autotests/libs/testresource/CMakeLists.txt 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/autotests/libs/testresource/CMakeLists.txt 2018-03-05 11:14:26.000000000 +0100 @@ -2,29 +2,13 @@ ${Boost_INCLUDE_DIR} ) +include(${CMAKE_SOURCE_DIR}/KF5AkonadiMacros.cmake) + kde_enable_exceptions() remove_definitions(-DTRANSLATION_DOMAIN=\"libakonadi5\") add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_knut_resource\") -find_package(LibXslt) -set_package_properties(LibXslt PROPERTIES DESCRIPTION "xsltproc" URL "http://xmlsoft.org/XSLT/"; TYPE REQUIRED PURPOSE "Needed to generate D-Bus interface specifications") - -find_program(XSLTPROC_EXECUTABLE xsltproc DOC "Path to the xsltproc executable") - -# generates a D-Bus interface description from a KConfigXT file -macro(kcfg_generate_dbus_interface _kcfg _name) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml - COMMAND ${XSLTPROC_EXECUTABLE} --stringparam interfaceName ${_name} - ${Akonadi_SOURCE_DIR}/src/core/kcfg2dbus.xsl - ${_kcfg} - > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml - DEPENDS ${Akonadi_SOURCE_DIR}/src/core/kcfg2dbus.xsl - ${_kcfg} - ) -endmacro() - # Disabled for now, resourcetester remained in kdepim-runtime #add_subdirectory( tests ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/autotests/server/CMakeLists.txt new/akonadi-17.12.3/autotests/server/CMakeLists.txt --- old/akonadi-17.12.2/autotests/server/CMakeLists.txt 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/autotests/server/CMakeLists.txt 2018-03-05 11:14:26.000000000 +0100 @@ -9,18 +9,16 @@ ${CMAKE_BINARY_DIR}/src/server ${Akonadi_SOURCE_DIR}/src/server) -akonadi_generate_schema(${CMAKE_CURRENT_SOURCE_DIR}/dbtest_data/unittest_schema.xml UnitTestSchema unittestschema) - -set(AKONADI_DB_DATA ${CMAKE_CURRENT_SOURCE_DIR}/dbtest_data/dbdata.xml) - -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dbpopulator.cpp - COMMAND ${XSLTPROC_EXECUTABLE} - --output ${CMAKE_CURRENT_BINARY_DIR}/dbpopulator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dbpopulator.xsl - ${AKONADI_DB_DATA} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dbpopulator.xsl - ${AKONADI_DB_DATA} +akonadi_run_xsltproc( + XSL ${Akonadi_SOURCE_DIR}/src/server/storage/schema.xsl + XML ${CMAKE_CURRENT_SOURCE_DIR}/dbtest_data/unittest_schema.xml + BASENAME unittestschema + CLASSNAME UnitTestSchema +) +akonadi_run_xsltproc( + XSL ${CMAKE_CURRENT_SOURCE_DIR}/dbpopulator.xsl + XML ${CMAKE_CURRENT_SOURCE_DIR}/dbtest_data/dbdata.xml + BASENAME dbpopulator ) set(common_SRCS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/autotests/server/dbpopulator.h new/akonadi-17.12.3/autotests/server/dbpopulator.h --- old/akonadi-17.12.2/autotests/server/dbpopulator.h 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/autotests/server/dbpopulator.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2014 Daniel Vrátil <[email protected]> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifndef AKONADI_SERVER_DBPOPULATOR_H -#define AKONADI_SERVER_DBPOPULATOR_H - - -namespace Akonadi { -namespace Server { - -class DbPopulator -{ -public: - DbPopulator(); - ~DbPopulator(); - - bool run(); - -}; - -} -} - -#endif // AKONADI_SERVER_DBPOPULATOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/autotests/server/dbpopulator.xsl new/akonadi-17.12.3/autotests/server/dbpopulator.xsl --- old/akonadi-17.12.2/autotests/server/dbpopulator.xsl 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/autotests/server/dbpopulator.xsl 2018-03-05 11:14:26.000000000 +0100 @@ -315,8 +315,36 @@ <xsl:template match="/"> +<!-- Header generation //--> +<xsl:if test="$code='header'"> +/* + * This is an auto-generated file. + * Do not edit! All changes made to it will be lost. + */ + +#ifndef AKONADI_SERVER_DBPOPULATOR_H +#define AKONADI_SERVER_DBPOPULATOR_H + +namespace Akonadi { +namespace Server { +class DbPopulator +{ +public: + DbPopulator(); + ~DbPopulator(); + + bool run(); + +}; + +} +} +#endif +</xsl:if> +<!-- Source generation //--> +<xsl:if test="$code='source'"> /* * This is an auto-generated file. * Do not edit! All changes made to it will be lost. @@ -394,6 +422,7 @@ qDebug() << "Database successfully populated"; return true; } +</xsl:if> </xsl:template> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/cmake/modules/AkonadiMacros.cmake new/akonadi-17.12.3/cmake/modules/AkonadiMacros.cmake --- old/akonadi-17.12.2/cmake/modules/AkonadiMacros.cmake 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/cmake/modules/AkonadiMacros.cmake 2018-03-05 11:14:26.000000000 +0100 @@ -21,27 +21,87 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Internal server macros +function(akonadi_run_xsltproc) + if (NOT XSLTPROC_EXECUTABLE) + message(FATAL_ERROR "xsltproc executable not found but needed by AKONADI_RUN_XSLTPROC()") + endif() + + set(options ) + set(oneValueArgs XSL XML CLASSNAME BASENAME) + set(multiValueArgs ) + cmake_parse_arguments(XSLT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + if (NOT XSLT_XSL) + message(FATAL_ERROR "Required argument XSL missing in AKONADI_RUN_XSLTPROC() call") + endif() + if (NOT XSLT_XML) + message(FATAL_ERROR "Required argument XML missing in AKONADI_RUN_XSLTPROC() call") + endif() + if (NOT XSLT_BASENAME) + message(FATAL_ERROR "Required argument BASENAME missing in AKONADI_RUN_XSLTPROC() call") + endif() + + # Workaround xsltproc struggling with spaces in filepaths on Windows + file(RELATIVE_PATH xsl_relpath ${CMAKE_CURRENT_BINARY_DIR} ${XSLT_XSL}) + file(RELATIVE_PATH xml_relpath ${CMAKE_CURRENT_BINARY_DIR} ${XSLT_XML}) + + set(extra_params ) + if (XSLT_CLASSNAME) + set(extra_params --stringparam className ${XSLT_CLASSNAME}) + endif() + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${XSLT_BASENAME}.h + ${CMAKE_CURRENT_BINARY_DIR}/${XSLT_BASENAME}.cpp + COMMAND ${XSLTPROC_EXECUTABLE} + --output ${XSLT_BASENAME}.h + --stringparam code header + --stringparam fileName ${XSLT_BASENAME} + ${extra_params} + ${xsl_relpath} + ${xml_relpath} + COMMAND ${XSLTPROC_EXECUTABLE} + --output ${XSLT_BASENAME}.cpp + --stringparam code source + --stringparam fileName ${XSLT_BASENAME} + ${extra_params} + ${xsl_relpath} + ${xml_relpath} + DEPENDS ${XSLT_XSL} + ${XSLT_XML} + ) + + set_property(SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/${XSLT_BASENAME}.cpp + ${CMAKE_CURRENT_BINARY_DIR}/${XSLT_BASENAME}.h + PROPERTY SKIP_AUTOMOC TRUE + ) +endfunction() + macro(akonadi_generate_schema _schemaXml _className _fileBaseName) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_fileBaseName}.h - ${CMAKE_CURRENT_BINARY_DIR}/${_fileBaseName}.cpp - COMMAND ${XSLTPROC_EXECUTABLE} - --output ${CMAKE_CURRENT_BINARY_DIR}/${_fileBaseName}.h - --stringparam code header - --stringparam className ${_className} - --stringparam fileName ${_fileBaseName} - ${Akonadi_SOURCE_DIR}/src/server/storage/schema.xsl - ${_schemaXml} - COMMAND ${XSLTPROC_EXECUTABLE} - --output ${CMAKE_CURRENT_BINARY_DIR}/${_fileBaseName}.cpp - --stringparam code source - --stringparam className ${_className} - --stringparam fileName ${_fileBaseName} - ${Akonadi_SOURCE_DIR}/src/server/storage/schema.xsl - ${_schemaXml} - DEPENDS ${Akonadi_SOURCE_DIR}/src/server/storage/schema.xsl - ${Akonadi_SOURCE_DIR}/src/server/storage/schema-header.xsl - ${Akonadi_SOURCE_DIR}/src/server/storage/schema-source.xsl - ${_schemaXml} -) + if (NOT XSLTPROC_EXECUTABLE) + message(FATAL_ERROR "xsltproc executable not found but needed by AKONADI_GENERATE_SCHEMA()") + endif() + + akonadi_run_xsltproc( + XSL ${Akonadi_SOURCE_DIR}/src/server/storage/schema.xsl + XML ${_schemaXml} + CLASSNAME ${_className} + BASENAME ${_fileBaseName} + ) endmacro() + +function(akonadi_add_xmllint_test) + if (NOT XMLLINT_EXECUTABLE) + message(FATAL_ERROR "xmllint executable not found but needed by AKONADI_ADD_XMLLINT_SCHEMA()") + endif() + + set(options ) + set(oneValueArgs XML XSD) + set(multiValueArgs ) + cmake_parse_arguments(TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + file(RELATIVE_PATH xsd_relpath ${CMAKE_CURRENT_BINARY_DIR} ${TEST_XSD}) + file(RELATIVE_PATH xml_relpath ${CMAKE_CURRENT_BINARY_DIR} ${TEST_XML}) + add_test(${TEST_UNPARSED_ARGUMENTS} ${XMLLINT_EXECUTABLE} --noout --schema ${xsd_relpath} ${xml_relpath}) +endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/cmake/modules/FindXsltproc.cmake new/akonadi-17.12.3/cmake/modules/FindXsltproc.cmake --- old/akonadi-17.12.2/cmake/modules/FindXsltproc.cmake 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/cmake/modules/FindXsltproc.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Find xsltproc executable and provide a macro to generate D-Bus interfaces. -# -# The following variables are defined : -# XSLTPROC_EXECUTABLE - path to the xsltproc executable -# Xsltproc_FOUND - true if the program was found -# -find_program(XSLTPROC_EXECUTABLE xsltproc DOC "Path to the xsltproc executable") -mark_as_advanced(XSLTPROC_EXECUTABLE) - -if(XSLTPROC_EXECUTABLE) - set(Xsltproc_FOUND TRUE) - - # Macro to generate a D-Bus interface description from a KConfigXT file - macro(kcfg_generate_dbus_interface _kcfg _name) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml - COMMAND ${XSLTPROC_EXECUTABLE} --stringparam interfaceName ${_name} - ${CMAKE_SOURCE_DIR}/akonadi/kcfg2dbus.xsl - ${_kcfg} - > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml - DEPENDS ${CMAKE_SOURCE_DIR}/akonadi/kcfg2dbus.xsl - ${_kcfg} - ) - endmacro() -endif() - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/po/nb/akonadi_knut_resource.po new/akonadi-17.12.3/po/nb/akonadi_knut_resource.po --- old/akonadi-17.12.2/po/nb/akonadi_knut_resource.po 2018-02-06 01:37:37.000000000 +0100 +++ new/akonadi-17.12.3/po/nb/akonadi_knut_resource.po 2018-03-06 01:26:53.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-09-18 03:28+0200\n" "PO-Revision-Date: 2010-08-16 15:23+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -19,68 +19,68 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: knutresource.cpp:81 +#: knutresource.cpp:79 #, kde-format msgid "No data file selected." msgstr "Ingen datafil valgt." -#: knutresource.cpp:98 +#: knutresource.cpp:96 #, kde-format msgid "File '%1' loaded successfully." msgstr "Fil «%1» vellykket lastet inn." -#: knutresource.cpp:124 +#: knutresource.cpp:122 #, kde-format msgid "Select Data File" msgstr "Velg datafil" -#: knutresource.cpp:125 +#: knutresource.cpp:123 #, kde-format msgctxt "Filedialog filter for Akonadi data file" msgid "Akonadi Knut Data File" msgstr "Akonadi Knut datafil" -#: knutresource.cpp:167 knutresource.cpp:187 knutresource.cpp:342 +#: knutresource.cpp:165 knutresource.cpp:185 knutresource.cpp:340 #, kde-format msgid "No item found for remoteid %1" msgstr "Fant ikke noe element for fjern-id %1" -#: knutresource.cpp:205 +#: knutresource.cpp:203 #, kde-format msgid "Parent collection not found in DOM tree." msgstr "Fant ikke foreldersamlingen i DOM-treet." -#: knutresource.cpp:213 +#: knutresource.cpp:211 #, kde-format msgid "Unable to write collection." msgstr "Klarte ikke skrive samlingen." -#: knutresource.cpp:225 +#: knutresource.cpp:223 #, kde-format msgid "Modified collection not found in DOM tree." msgstr "Fant ikke endret samling i DOM-treet." -#: knutresource.cpp:256 +#: knutresource.cpp:254 #, kde-format msgid "Deleted collection not found in DOM tree." msgstr "Fant ikke slettet samling i DOM-treet." -#: knutresource.cpp:270 knutresource.cpp:329 knutresource.cpp:336 +#: knutresource.cpp:268 knutresource.cpp:327 knutresource.cpp:334 #, kde-format msgid "Parent collection '%1' not found in DOM tree." msgstr "Fant ikke foreldersamlingen «%1» i DOM-treet." -#: knutresource.cpp:278 knutresource.cpp:349 +#: knutresource.cpp:276 knutresource.cpp:347 #, kde-format msgid "Unable to write item." msgstr "Klarte ikke skrive elementet." -#: knutresource.cpp:292 +#: knutresource.cpp:290 #, kde-format msgid "Modified item not found in DOM tree." msgstr "Fant ikke endret element i DOM-treet." -#: knutresource.cpp:308 +#: knutresource.cpp:306 #, kde-format msgid "Deleted item not found in DOM tree." msgstr "Fant ikke slettet element i DOM-treet." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/po/nb/libakonadi5.po new/akonadi-17.12.3/po/nb/libakonadi5.po --- old/akonadi-17.12.2/po/nb/libakonadi5.po 2018-02-06 01:37:37.000000000 +0100 +++ new/akonadi-17.12.3/po/nb/libakonadi5.po 2018-03-06 01:26:53.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libakonadi\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-01 03:06+0200\n" +"POT-Creation-Date: 2017-12-11 05:12+0100\n" "PO-Revision-Date: 2014-09-23 21:56+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -34,18 +34,18 @@ msgid "Unable to register object at dbus: %1" msgstr "Klarte ikke å registrere objeket ved dbus: %1" -#: agentbase/agentbase.cpp:467 +#: agentbase/agentbase.cpp:468 #, kde-format msgctxt "Name and type of Akonadi resource" msgid "%1 of type %2" msgstr "%1 av type %2" -#: agentbase/agentbase.cpp:913 +#: agentbase/agentbase.cpp:914 #, kde-format msgid "Agent identifier" msgstr "Agentidentifikasjon" -#: agentbase/agentbase.cpp:920 +#: agentbase/agentbase.cpp:921 #, kde-format msgid "Akonadi Agent" msgstr "Akonadi Agent" @@ -189,24 +189,24 @@ msgid "Unable to create agent instance." msgstr "Klarte ikke starte en instans av agenten." -#: core/jobs/collectionattributessynchronizationjob.cpp:89 +#: core/jobs/collectionattributessynchronizationjob.cpp:86 #, kde-format msgid "Invalid collection instance." msgstr "Ugyldig samlingsinstans." -#: core/jobs/collectionattributessynchronizationjob.cpp:96 +#: core/jobs/collectionattributessynchronizationjob.cpp:93 #: core/jobs/resourcesynchronizationjob.cpp:106 #, kde-format msgid "Invalid resource instance." msgstr "Ugyldig ressursinstans." -#: core/jobs/collectionattributessynchronizationjob.cpp:117 +#: core/jobs/collectionattributessynchronizationjob.cpp:114 #: core/jobs/resourcesynchronizationjob.cpp:131 #, kde-format msgid "Unable to obtain D-Bus interface for resource '%1'" msgstr "Klarte ikke skaffe D-Bus-grensesnitt for ressurs «%1»" -#: core/jobs/collectionattributessynchronizationjob.cpp:140 +#: core/jobs/collectionattributessynchronizationjob.cpp:137 #, kde-format msgid "Collection attributes synchronization timed out." msgstr "Tidsavbrudd ved synkronisering av samlingsattributter." @@ -262,12 +262,12 @@ msgid "Invalid parent collection" msgstr "" -#: core/jobs/job.cpp:327 +#: core/jobs/job.cpp:326 #, kde-format msgid "Cannot connect to the Akonadi service." msgstr "Kan ikke koble til Akonadi-tjenesten." -#: core/jobs/job.cpp:330 +#: core/jobs/job.cpp:329 #, kde-format msgid "" "The protocol version of the Akonadi server is incompatible. Make sure you " @@ -276,17 +276,17 @@ "Protokollversjonen til Akonadi-tjeneren er ikke kompatibel. Pass på at du " "har en kompatibel versjon installert." -#: core/jobs/job.cpp:333 +#: core/jobs/job.cpp:332 #, kde-format msgid "User canceled operation." msgstr "Bruker avbrøt handlinga." -#: core/jobs/job.cpp:338 +#: core/jobs/job.cpp:337 #, kde-format msgid "Unknown error." msgstr "Ukjent feil." -#: core/jobs/job.cpp:371 +#: core/jobs/job.cpp:370 #, kde-format msgid "Unexpected response" msgstr "" @@ -375,13 +375,13 @@ msgid "Loading..." msgstr "Laster inn …" -#: core/models/entitytreemodel.cpp:560 core/models/entitytreemodel_p.cpp:1413 +#: core/models/entitytreemodel.cpp:556 core/models/entitytreemodel_p.cpp:1409 #: widgets/selftestdialog.cpp:634 #, kde-format msgid "Error" msgstr "Feil" -#: core/models/entitytreemodel.cpp:561 +#: core/models/entitytreemodel.cpp:557 #, kde-format msgid "" "The target collection '%1' contains already\n" @@ -390,53 +390,53 @@ "Målsamlingen «%1» inneholdder fra før\n" "en samling som heter «%2»." -#: core/models/entitytreemodel.cpp:741 +#: core/models/entitytreemodel.cpp:737 #, kde-format msgctxt "@title:column Name of a thing" msgid "Name" msgstr "Navn" -#: core/models/entitytreemodel_p.cpp:1400 +#: core/models/entitytreemodel_p.cpp:1396 #, kde-format msgid "Could not copy item:" msgstr "Klarte ikke å kopiere element:" -#: core/models/entitytreemodel_p.cpp:1402 +#: core/models/entitytreemodel_p.cpp:1398 #, kde-format msgid "Could not copy collection:" msgstr "Klarte ikke å kopiere samlingen:" -#: core/models/entitytreemodel_p.cpp:1404 +#: core/models/entitytreemodel_p.cpp:1400 #, kde-format msgid "Could not move item:" msgstr "Klarte ikke flytte element:" -#: core/models/entitytreemodel_p.cpp:1406 +#: core/models/entitytreemodel_p.cpp:1402 #, kde-format msgid "Could not move collection:" msgstr "Klarte ikke å flytte samling:" -#: core/models/entitytreemodel_p.cpp:1408 +#: core/models/entitytreemodel_p.cpp:1404 #, kde-format msgid "Could not link entity:" msgstr "Klarte ikke lenke entiteten:" -#: core/models/favoritecollectionsmodel.cpp:381 +#: core/models/favoritecollectionsmodel.cpp:385 #, kde-format msgid "Favorite Folders" msgstr "Favorittmapper" -#: core/models/itemmodel.cpp:326 +#: core/models/itemmodel.cpp:327 #, kde-format msgid "Id" msgstr "ID" -#: core/models/itemmodel.cpp:328 +#: core/models/itemmodel.cpp:329 #, kde-format msgid "Remote Id" msgstr "Fjern-ID" -#: core/models/itemmodel.cpp:330 +#: core/models/itemmodel.cpp:331 #, kde-format msgid "MimeType" msgstr "Mime-type" @@ -704,34 +704,34 @@ msgid "Use folder by default" msgstr "Bruk mappe som standard" -#: widgets/collectiondialog.cpp:233 +#: widgets/collectiondialog.cpp:234 #, kde-format msgid "&New Subfolder..." msgstr "&Ny undermappe …" -#: widgets/collectiondialog.cpp:235 +#: widgets/collectiondialog.cpp:236 #, kde-format msgid "Create a new subfolder under the currently selected folder" msgstr "Lag ny undermappe under den valgte mappa" -#: widgets/collectiondialog.cpp:269 widgets/standardactionmanager.cpp:237 +#: widgets/collectiondialog.cpp:270 widgets/standardactionmanager.cpp:237 #, kde-format msgctxt "@title:window" msgid "New Folder" msgstr "Ny mappe" -#: widgets/collectiondialog.cpp:270 +#: widgets/collectiondialog.cpp:271 #, kde-format msgctxt "@label:textbox, name of a thing" msgid "Name" msgstr "Navn" -#: widgets/collectiondialog.cpp:289 widgets/standardactionmanager.cpp:243 +#: widgets/collectiondialog.cpp:290 widgets/standardactionmanager.cpp:243 #, kde-format msgid "Folder creation failed" msgstr "Mappeoppretting mislyktes" -#: widgets/collectiondialog.cpp:290 widgets/standardactionmanager.cpp:241 +#: widgets/collectiondialog.cpp:291 widgets/standardactionmanager.cpp:241 #, kde-format msgid "Could not create folder: %1" msgstr "Klarte ikke opprette mappe: %1" @@ -800,29 +800,29 @@ msgid "0 Byte" msgstr "0 byte" -#: widgets/collectionmaintenancepage.cpp:64 +#: widgets/collectionmaintenancepage.cpp:59 #, kde-format msgid "Remember that indexing can take some minutes." msgstr "" -#: widgets/collectionmaintenancepage.cpp:92 +#: widgets/collectionmaintenancepage.cpp:87 #, kde-format msgid "Maintenance" msgstr "" -#: widgets/collectionmaintenancepage.cpp:154 +#: widgets/collectionmaintenancepage.cpp:150 #, kde-format msgid "Error while retrieving indexed items count" msgstr "" -#: widgets/collectionmaintenancepage.cpp:157 +#: widgets/collectionmaintenancepage.cpp:153 #, kde-format msgid "Indexed %1 item in this folder" msgid_plural "Indexed %1 items in this folder" msgstr[0] "" msgstr[1] "" -#: widgets/collectionmaintenancepage.cpp:163 +#: widgets/collectionmaintenancepage.cpp:159 #, kde-format msgid "Calculating indexed items..." msgstr "" @@ -923,44 +923,44 @@ msgid "Cancel" msgstr "Avbryt" -#: widgets/conflictresolvedialog.cpp:126 +#: widgets/conflictresolvedialog.cpp:129 #, kde-format msgid "Modification Time" msgstr "Endringstidspunkt" -#: widgets/conflictresolvedialog.cpp:144 +#: widgets/conflictresolvedialog.cpp:147 #, kde-format msgid "Flags" msgstr "Flagg" -#: widgets/conflictresolvedialog.cpp:162 widgets/conflictresolvedialog.cpp:169 -#: widgets/conflictresolvedialog.cpp:178 +#: widgets/conflictresolvedialog.cpp:165 widgets/conflictresolvedialog.cpp:172 +#: widgets/conflictresolvedialog.cpp:181 #, kde-format msgid "Attribute: %1" msgstr "Attributt: %1" -#: widgets/conflictresolvedialog.cpp:189 +#: widgets/conflictresolvedialog.cpp:192 #, kde-format msgctxt "@title:window" msgid "Conflict Resolution" msgstr "Konfliktløsning" -#: widgets/conflictresolvedialog.cpp:204 +#: widgets/conflictresolvedialog.cpp:207 #, kde-format msgid "Take left one" msgstr "Ta den venstre" -#: widgets/conflictresolvedialog.cpp:205 +#: widgets/conflictresolvedialog.cpp:208 #, kde-format msgid "Take right one" msgstr "Ta den høyre" -#: widgets/conflictresolvedialog.cpp:206 +#: widgets/conflictresolvedialog.cpp:209 #, kde-format msgid "Keep both" msgstr "Behold begge" -#: widgets/conflictresolvedialog.cpp:212 +#: widgets/conflictresolvedialog.cpp:215 #, kde-kuit-format msgctxt "@label" msgid "" @@ -970,7 +970,7 @@ "To oppdateringer er i konflikt med hverandre.<nl/> Velg hvilke(n) " "oppdatering(er) som skal brukes." -#: widgets/conflictresolvedialog.cpp:242 +#: widgets/conflictresolvedialog.cpp:257 #, kde-format msgid "Data" msgstr "Data" @@ -1005,7 +1005,7 @@ msgid "C&ancel" msgstr "&Avbryt" -#: widgets/erroroverlay.cpp:239 +#: widgets/erroroverlay.cpp:241 #, kde-format msgctxt "%1 is a reason why" msgid "" @@ -1014,17 +1014,17 @@ "%1" msgstr "" -#: widgets/erroroverlay.cpp:244 widgets/erroroverlay.cpp:245 +#: widgets/erroroverlay.cpp:246 widgets/erroroverlay.cpp:247 #, kde-format msgid "Personal information management service is starting..." msgstr "Tjenesten for håndtering av personlig informasjon starter …" -#: widgets/erroroverlay.cpp:249 widgets/erroroverlay.cpp:250 +#: widgets/erroroverlay.cpp:251 widgets/erroroverlay.cpp:252 #, kde-format msgid "Personal information management service is shutting down..." msgstr "Tjenesten for personlig informasjonsbehandling avslutter …" -#: widgets/erroroverlay.cpp:254 +#: widgets/erroroverlay.cpp:256 #, kde-format msgid "" "Personal information management service is performing a database upgrade." @@ -1032,7 +1032,7 @@ "Tjenesten for håndtering av personlig informasjon kjører en database-" "oppgradering." -#: widgets/erroroverlay.cpp:255 +#: widgets/erroroverlay.cpp:257 #, kde-format msgid "" "Personal information management service is performing a database upgrade.\n" @@ -1088,12 +1088,12 @@ msgid "Details..." msgstr "Detaljer …" -#: widgets/manageaccountwidget.cpp:204 +#: widgets/manageaccountwidget.cpp:213 #, kde-format msgid "Do you want to remove account '%1'?" msgstr "Vil du fjerne kontoen «%1»?" -#: widgets/manageaccountwidget.cpp:205 +#: widgets/manageaccountwidget.cpp:214 #, kde-format msgid "Remove account?" msgstr "Fjern konto?" @@ -2283,68 +2283,68 @@ msgid "Search:" msgstr "Søk:" -#: widgets/subscriptiondialog.cpp:193 +#: widgets/subscriptiondialog.cpp:192 #, kde-format msgid "Subscribed only" msgstr "Bare abonnerte" -#: widgets/subscriptiondialog.cpp:203 +#: widgets/subscriptiondialog.cpp:201 #, kde-format msgid "Subscribe" msgstr "Abonner" -#: widgets/subscriptiondialog.cpp:207 +#: widgets/subscriptiondialog.cpp:205 #, kde-format msgid "Unsubscribe" msgstr "Avslutt abonnementet" -#: widgets/tageditwidget.cpp:127 +#: widgets/tageditwidget.cpp:126 #, kde-format msgid "Failed to create a new tag" msgstr "Klarte ikke opprette en ny etikett" -#: widgets/tageditwidget.cpp:128 +#: widgets/tageditwidget.cpp:127 #, kde-format msgid "An error occurred while creating a new tag" msgstr "Det oppstod en feil mens en ny etikett ble opprettet" -#: widgets/tageditwidget.cpp:183 +#: widgets/tageditwidget.cpp:182 #, kde-kuit-format msgctxt "@info" msgid "Do you really want to remove the tag <resource>%1</resource>?" msgstr "Er du sikker på at du vil fjerne etiketten <resource>%1</resource>?" -#: widgets/tageditwidget.cpp:185 +#: widgets/tageditwidget.cpp:184 #, kde-format msgctxt "@title" msgid "Delete tag" msgstr "Slett etikett" -#: widgets/tageditwidget.cpp:186 +#: widgets/tageditwidget.cpp:185 #, kde-format msgctxt "@action:button" msgid "Delete" msgstr "Slett" -#: widgets/tageditwidget.cpp:186 +#: widgets/tageditwidget.cpp:185 #, kde-format msgctxt "@action:button" msgid "Cancel" msgstr "Avbryt" -#: widgets/tageditwidget.cpp:223 +#: widgets/tageditwidget.cpp:222 #, kde-format msgctxt "@label" msgid "Create new tag" msgstr "Opprett ny etikett" -#: widgets/tageditwidget.cpp:234 +#: widgets/tageditwidget.cpp:233 #, kde-format msgctxt "@label:textbox" msgid "Configure which tags should be applied." msgstr "Sett opp hvilke etiketter som skal brukes." -#: widgets/tageditwidget.cpp:245 +#: widgets/tageditwidget.cpp:244 #, kde-format msgctxt "@info" msgid "Delete tag" @@ -2356,12 +2356,12 @@ msgid "Manage Tags" msgstr "Behandle etiketter" -#: widgets/tagwidget.cpp:56 +#: widgets/tagwidget.cpp:55 #, kde-format msgid "Click to Add Tags" msgstr "" -#: widgets/tagwidget.cpp:67 +#: widgets/tagwidget.cpp:66 #, kde-format msgid "Clear" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/po/zh_CN/akonadi_knut_resource.po new/akonadi-17.12.3/po/zh_CN/akonadi_knut_resource.po --- old/akonadi-17.12.2/po/zh_CN/akonadi_knut_resource.po 2018-02-06 01:37:37.000000000 +0100 +++ new/akonadi-17.12.3/po/zh_CN/akonadi_knut_resource.po 2018-03-06 01:26:54.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-09-18 03:28+0200\n" -"PO-Revision-Date: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:27-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/po/zh_CN/libakonadi5.po new/akonadi-17.12.3/po/zh_CN/libakonadi5.po --- old/akonadi-17.12.2/po/zh_CN/libakonadi5.po 2018-02-06 01:37:37.000000000 +0100 +++ new/akonadi-17.12.3/po/zh_CN/libakonadi5.po 2018-03-06 01:26:54.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-12-11 05:12+0100\n" -"PO-Revision-Date: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:27-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/src/core/typepluginloader.cpp new/akonadi-17.12.3/src/core/typepluginloader.cpp --- old/akonadi-17.12.2/src/core/typepluginloader.cpp 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/src/core/typepluginloader.cpp 2018-03-05 11:14:26.000000000 +0100 @@ -310,6 +310,7 @@ const QMimeDatabase mimeDb; const QMimeType mimeType = mimeDb.mimeTypeForName(type); if (!mimeType.isValid()) { + qCWarning(AKONADICORE_LOG) << "Invalid mimetype requested:" << type; return mDefaultPlugin.plugin(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/src/server/CMakeLists.txt new/akonadi-17.12.3/src/server/CMakeLists.txt --- old/akonadi-17.12.2/src/server/CMakeLists.txt 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/src/server/CMakeLists.txt 2018-03-05 11:14:26.000000000 +0100 @@ -10,32 +10,31 @@ endif() ########### next target ############### +set(AKONADI_DB_SCHEMA "${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xml") -set(AKONADI_DB_SCHEME ${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xml) - -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/entities.h - ${CMAKE_CURRENT_BINARY_DIR}/entities.cpp - COMMAND ${XSLTPROC_EXECUTABLE} - --output ${CMAKE_CURRENT_BINARY_DIR}/entities.h - --stringparam code header - ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities.xsl - ${AKONADI_DB_SCHEME} - COMMAND ${XSLTPROC_EXECUTABLE} - --output ${CMAKE_CURRENT_BINARY_DIR}/entities.cpp - --stringparam code source - ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities.xsl - ${AKONADI_DB_SCHEME} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities.xsl - ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities-header.xsl - ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities-source.xsl - ${AKONADI_DB_SCHEME} +akonadi_run_xsltproc( + XSL ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities.xsl + XML ${AKONADI_DB_SCHEMA} + BASENAME entities ) -add_test(akonadidb-xmllint ${XMLLINT_EXECUTABLE} --noout --schema ${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xsd ${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xml) -add_test(akonadidbupdate-xmllint ${XMLLINT_EXECUTABLE} --noout --schema ${CMAKE_CURRENT_SOURCE_DIR}/storage/dbupdate.xsd ${CMAKE_CURRENT_SOURCE_DIR}/storage/dbupdate.xml) +akonadi_run_xsltproc( + XSL ${Akonadi_SOURCE_DIR}/src/server/storage/schema.xsl + XML ${AKONADI_DB_SCHEMA} + CLASSNAME AkonadiSchema + BASENAME akonadischema +) -akonadi_generate_schema(${AKONADI_DB_SCHEME} AkonadiSchema akonadischema) +akonadi_add_xmllint_test( + akonadidb-xmllint + XSD ${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xsd + XML ${AKONADI_DB_SCHEMA} +) +akonadi_add_xmllint_test( + akonadidbupdate-xmllint + XSD ${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xsd + XML ${AKONADI_DB_SCHEMA} +) set(libakonadiserver_SRCS akonadi.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/src/server/storage/datastore.cpp new/akonadi-17.12.3/src/server/storage/datastore.cpp --- old/akonadi-17.12.2/src/server/storage/datastore.cpp 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/src/server/storage/datastore.cpp 2018-03-05 11:14:26.000000000 +0100 @@ -95,7 +95,6 @@ m_keepAliveTimer->setInterval(3600 * 1000); QObject::connect(m_keepAliveTimer, &QTimer::timeout, this, &DataStore::sendKeepAliveQuery); - m_keepAliveTimer->start(); } } @@ -137,6 +136,10 @@ }); DbConfig::configuredDatabase()->initSession(m_database); + + if (m_keepAliveTimer) { + m_keepAliveTimer->start(); + } } QSqlDatabase DataStore::database() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/templates/akonadiresource/CMakeLists.txt new/akonadi-17.12.3/templates/akonadiresource/CMakeLists.txt --- old/akonadi-17.12.2/templates/akonadiresource/CMakeLists.txt 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/templates/akonadiresource/CMakeLists.txt 2018-03-05 11:14:26.000000000 +0100 @@ -22,12 +22,10 @@ set(AKONADI_MIN_VERSION "5.2") find_package(KF5Akonadi ${AKONADI_MIN_VERSION} CONFIG REQUIRED) -find_package(Xsltproc REQUIRED) -set_package_properties(Xsltproc PROPERTIES - DESCRIPTION "XSLT processor from libxslt" - TYPE REQUIRED - PURPOSE "Required to generate a D-Bus interface for the resource." -) +find_program(XSLTPROC_EXECUTABLE xsltproc DOC "Path to the xsltproc executable") +if (NOT XSLTPROC_EXECUTABLE) + message(FATAL_ERROR "\nThe command line XSLT processor program 'xsltproc' could not be found.\nPlease install xsltproc.\n") +endif() add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/templates/akonadiresource/akonadiresource.kdevtemplate new/akonadi-17.12.3/templates/akonadiresource/akonadiresource.kdevtemplate --- old/akonadi-17.12.2/templates/akonadiresource/akonadiresource.kdevtemplate 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/templates/akonadiresource/akonadiresource.kdevtemplate 2018-03-05 11:14:26.000000000 +0100 @@ -13,6 +13,7 @@ Name[nl]=C++ Name[pl]=C++ Name[pt]=C++ +Name[pt_BR]=C++ Name[ru]=C++ Name[sk]=C++ Name[sr]=Ц++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/templates/akonadiresource/cmake/modules/FindXsltproc.cmake new/akonadi-17.12.3/templates/akonadiresource/cmake/modules/FindXsltproc.cmake --- old/akonadi-17.12.2/templates/akonadiresource/cmake/modules/FindXsltproc.cmake 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/templates/akonadiresource/cmake/modules/FindXsltproc.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# Find xsltproc executable and provide a macro to generate D-Bus interfaces. -# -# The following variables are defined : -# XSLTPROC_EXECUTABLE - path to the xsltproc executable -# Xsltproc_FOUND - true if the program was found - -find_program(XSLTPROC_EXECUTABLE xsltproc DOC "Path to the xsltproc executable") -mark_as_advanced(XSLTPROC_EXECUTABLE) - -if(XSLTPROC_EXECUTABLE) - set(Xsltproc_FOUND TRUE) - - # We depend on Akonadi, make sure it's found - if(NOT DEFINED KF5Akonadi_DATA_DIR) - find_package(KF5Akonadi REQUIRED) - endif() - - - # Macro to generate a D-Bus interface description from a KConfigXT file - macro(kcfg_generate_dbus_interface _kcfg _name) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml - COMMAND ${XSLTPROC_EXECUTABLE} - --stringparam interfaceName ${_name} - ${KF5Akonadi_DATA_DIR}/kcfg2dbus.xsl - ${_kcfg} - > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml - DEPENDS - ${KF5Akonadi_DATA_DIR}/kcfg2dbus.xsl - ${_kcfg} - ) - endmacro() -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-17.12.2/templates/akonadiserializer/akonadiserializer.kdevtemplate new/akonadi-17.12.3/templates/akonadiserializer/akonadiserializer.kdevtemplate --- old/akonadi-17.12.2/templates/akonadiserializer/akonadiserializer.kdevtemplate 2018-01-24 17:42:44.000000000 +0100 +++ new/akonadi-17.12.3/templates/akonadiserializer/akonadiserializer.kdevtemplate 2018-03-05 11:14:26.000000000 +0100 @@ -13,6 +13,7 @@ Name[nl]=C++ Name[pl]=C++ Name[pt]=C++ +Name[pt_BR]=C++ Name[ru]=C++ Name[sk]=C++ Name[sr]=Ц++
