Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcalutils for openSUSE:Factory checked in at 2024-08-26 22:03:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcalutils (Old) and /work/SRC/openSUSE:Factory/.kcalutils.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcalutils" Mon Aug 26 22:03:57 2024 rev:111 rq:1195369 version:24.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcalutils/kcalutils.changes 2024-07-05 19:51:18.126647035 +0200 +++ /work/SRC/openSUSE:Factory/.kcalutils.new.2698/kcalutils.changes 2024-08-26 22:04:18.227164191 +0200 @@ -1,0 +2,20 @@ +Mon Aug 19 07:13:33 UTC 2024 - Christophe Marin <[email protected]> + +- Update to 24.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/24.08.0/ +- Changes since 24.05.2: + * Fix cmake lint warning + * Namespace QRC content + * Add build-ftime support + * Fix unit test with KF 6.3 embedded Breeze icons + * Fix typo + * Fix icon from qrc + * It compiles fine without deprecated kf methods + * Enable mandatory tests for Linux and FreeBSD + * Use the Breeze icons for test + * Force locale and timezone for the todo tooltip test + * Adapt test data to the removal of KEmoticons + +------------------------------------------------------------------- Old: ---- kcalutils-24.05.2.tar.xz kcalutils-24.05.2.tar.xz.sig New: ---- kcalutils-24.08.0.tar.xz kcalutils-24.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcalutils.spec ++++++ --- /var/tmp/diff_new_pack.V7z8Jc/_old 2024-08-26 22:04:19.107200960 +0200 +++ /var/tmp/diff_new_pack.V7z8Jc/_new 2024-08-26 22:04:19.111201127 +0200 @@ -16,13 +16,13 @@ # -%define kf6_version 6.0.0 +%define kf6_version 6.3.0 %define qt6_version 6.6.0 -%define kpim6_version 6.1.2 +%define kpim6_version 6.2.0 %bcond_without released Name: kcalutils -Version: 24.05.2 +Version: 24.08.0 Release: 0 Summary: Library with utility functions for handling calendar data License: LGPL-2.1-or-later ++++++ kcalutils-24.05.2.tar.xz -> kcalutils-24.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/.gitlab-ci.yml new/kcalutils-24.08.0/.gitlab-ci.yml --- old/kcalutils-24.05.2/.gitlab-ci.yml 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/.gitlab-ci.yml 2024-08-16 06:59:55.000000000 +0200 @@ -7,3 +7,4 @@ - /gitlab-templates/linux-qt6.yml - /gitlab-templates/freebsd-qt6.yml - /gitlab-templates/windows-qt6.yml + - /gitlab-templates/cppcheck.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/.kde-ci.yml new/kcalutils-24.08.0/.kde-ci.yml --- old/kcalutils-24.05.2/.kde-ci.yml 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/.kde-ci.yml 2024-08-16 06:59:55.000000000 +0200 @@ -9,3 +9,6 @@ 'pim/kidentitymanagement' : '@same' 'frameworks/breeze-icons': '@latest-kf6' 'frameworks/ktexttemplate': '@latest-kf6' + +Options: + require-passing-tests-on: [ 'Linux', 'FreeBSD' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/CMakeLists.txt new/kcalutils-24.08.0/CMakeLists.txt --- old/kcalutils-24.05.2/CMakeLists.txt 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/CMakeLists.txt 2024-08-16 06:59:55.000000000 +0200 @@ -2,11 +2,11 @@ # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "6.1.2") +set(PIM_VERSION "6.2.0") project(KCalUtils VERSION ${PIM_VERSION}) # ECM setup -set(KF_MIN_VERSION "6.0.0") +set(KF_MIN_VERSION "6.3.0") set(QT_REQUIRED_VERSION "6.6.0") find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) @@ -38,7 +38,7 @@ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") set(CALENDARUTILS_LIB_VERSION ${PIM_VERSION}) -set(IDENTITYMANAGER_LIB_VERSION "6.1.2") +set(IDENTITYMANAGER_LIB_VERSION "6.1.90") ecm_setup_version(PROJECT VARIABLE_PREFIX KCALUTILS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/kcalutils_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6CalendarUtilsConfigVersion.cmake" @@ -59,7 +59,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkcalutils6\") add_definitions(-DQT_NO_CONTEXTLESS_CONNECT) -ecm_set_disabled_deprecation_versions(QT 6.7.0 KF 6.1.0) +ecm_set_disabled_deprecation_versions(QT 6.7.2 KF 6.4.0) if(BUILD_TESTING) @@ -68,7 +68,7 @@ option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) -if (USE_UNITY_CMAKE_SUPPORT) +if(USE_UNITY_CMAKE_SUPPORT) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) add_definitions(-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT) endif() @@ -80,13 +80,13 @@ ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6CalendarUtils") -if (BUILD_QCH) +if(BUILD_QCH) ecm_install_qch_export( TARGETS KPim6CalendarUtils_QCH FILE KPim6CalendarUtilsQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel - ) +) set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6CalendarUtilsQchTargets.cmake\")") endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/CMakePresets.json new/kcalutils-24.08.0/CMakePresets.json --- old/kcalutils-24.05.2/CMakePresets.json 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/CMakePresets.json 2024-08-16 06:59:55.000000000 +0200 @@ -130,6 +130,24 @@ "inherits": [ "base" ] + }, + { + "name": "ftime-trace", + "displayName": "ftime-trace", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_DEVELOPER_MODE": "ON", + "CMAKE_C_FLAGS_INIT": "-ftime-trace", + "CMAKE_CXX_FLAGS_INIT": "-ftime-trace" + }, + "environment": { + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++", + "CCACHE_DISABLE": "ON" + }, + "inherits": [ + "base" + ] } ], "buildPresets": [ @@ -138,6 +156,10 @@ "configurePreset": "dev" }, { + "name": "ftime-trace", + "configurePreset": "ftime-trace" + }, + { "name": "dev-mold", "configurePreset": "dev-mold" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/autotests/data/todo-1.html new/kcalutils-24.08.0/autotests/data/todo-1.html --- old/kcalutils-24.05.2/autotests/data/todo-1.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/autotests/data/todo-1.html 2024-08-16 06:59:55.000000000 +0200 @@ -61,7 +61,7 @@ <!-- Description --> <tr> <th valign="top">Description:</th> - <td>We need milk <img align="center" title=":)" alt=":)" src="file:face-smile" width="22" height="22" /></td> + <td>We need milk ð</td> </tr> <!-- Comments --> <!-- Reminders --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/autotests/testincidenceformatter.cpp new/kcalutils-24.08.0/autotests/testincidenceformatter.cpp --- old/kcalutils-24.05.2/autotests/testincidenceformatter.cpp 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/autotests/testincidenceformatter.cpp 2024-08-16 06:59:55.000000000 +0200 @@ -53,7 +53,7 @@ QStandardPaths::setTestModeEnabled(true); GrantleeTemplateManager::instance()->setTemplatePath(QStringLiteral(TEST_TEMPLATE_PATH)); GrantleeTemplateManager::instance()->setPluginPath(QStringLiteral(TEST_PLUGIN_PATH)); - QIcon::setThemeName(QStringLiteral("oxygen")); + QIcon::setThemeName(QStringLiteral("breeze")); QLocale::setDefault(QLocale(QStringLiteral("C"))); QPalette palette; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/autotests/testtodotooltip.cpp new/kcalutils-24.08.0/autotests/testtodotooltip.cpp --- old/kcalutils-24.05.2/autotests/testtodotooltip.cpp 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/autotests/testtodotooltip.cpp 2024-08-16 06:59:55.000000000 +0200 @@ -39,6 +39,16 @@ static const QString EXPECTED_PCT50{QStringLiteral("50%")}; static const QString EXPECTED_PCT0{QStringLiteral("0%")}; +#ifndef Q_OS_WIN +void initLocale() +{ + setenv("LC_ALL", "en_US.utf-8", 1); + setenv("TZ", "UTC", 1); +} + +Q_CONSTRUCTOR_FUNCTION(initLocale) +#endif + using namespace KCalUtils::IncidenceFormatter; // Create a to-do that may or may not be an all-day to-do, may or may nor recur, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/po/cs/libkcalutils6.po new/kcalutils-24.08.0/po/cs/libkcalutils6.po --- old/kcalutils-24.05.2/po/cs/libkcalutils6.po 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/po/cs/libkcalutils6.po 2024-08-16 06:59:55.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: libkcal\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2024-03-02 00:38+0000\n" -"PO-Revision-Date: 2024-04-26 10:56+0200\n" +"PO-Revision-Date: 2024-06-25 10:58+0200\n" "Last-Translator: Vit Pelcak <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 24.02.2\n" +"X-Generator: Lokalize 24.05.1\n" #: src/grantleetemplatemanager.cpp:81 #, kde-format @@ -33,12 +33,12 @@ #: src/grantleetemplatemanager.cpp:99 #, kde-format msgid "Template parsing error" -msgstr "" +msgstr "Chyba analýzy Å¡ablony" #: src/grantleetemplatemanager.cpp:104 #, kde-format msgid "Template rendering error" -msgstr "" +msgstr "Chyba vykreslovánà šablony" #: src/incidenceformatter.cpp:167 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/po/eo/libkcalutils6.po new/kcalutils-24.08.0/po/eo/libkcalutils6.po --- old/kcalutils-24.05.2/po/eo/libkcalutils6.po 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/po/eo/libkcalutils6.po 2024-08-16 06:59:55.000000000 +0200 @@ -67,7 +67,7 @@ msgid "1 minute " msgid_plural "%1 minutes " msgstr[0] "1 minuto " -msgstr[1] "%1 minutoj" +msgstr[1] "%1 minutoj " #: src/incidenceformatter.cpp:606 src/incidenceformatter.cpp:1254 #, kde-format @@ -2138,7 +2138,7 @@ #: src/templates/itip_todo.html:39 msgid "Due:" -msgstr "KompletiÄenda:" +msgstr "Paga:" #: src/templates/journal.html:5 msgid "Journal" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/po/zh_CN/libkcalutils6.po new/kcalutils-24.08.0/po/zh_CN/libkcalutils6.po --- old/kcalutils-24.05.2/po/zh_CN/libkcalutils6.po 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/po/zh_CN/libkcalutils6.po 2024-08-16 06:59:55.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2024-03-02 00:38+0000\n" -"PO-Revision-Date: 2024-04-23 19:27\n" +"PO-Revision-Date: 2024-04-22 15:58\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/readme-build-ftime.txt new/kcalutils-24.08.0/readme-build-ftime.txt --- old/kcalutils-24.05.2/readme-build-ftime.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kcalutils-24.08.0/readme-build-ftime.txt 2024-08-16 06:59:55.000000000 +0200 @@ -0,0 +1,26 @@ +# Analyzing Build Performance + +For debug build time: +We need ClangBuildAnalyzer +` +git clone https://github.com/aras-p/ClangBuildAnalyzer +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=<path> ../ +make install +` + +## Command line + +cmake -preset ftime-trace + +ClangBuildAnalyzer --start $PWD/build-ftime-trace +cmake --build --preset ftime-trace + +ClangBuildAnalyzer --stop $PWD/build-ftime-trace build-ftime.txt + +ClangBuildAnalyzer --analyze build-ftime.txt > analyze-build-ftime.txt + + +see https://aras-p.info/blog/2019/09/28/Clang-Build-Analyzer/ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/CMakeLists.txt new/kcalutils-24.08.0/src/CMakeLists.txt --- old/kcalutils-24.05.2/src/CMakeLists.txt 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/CMakeLists.txt 2024-08-16 06:59:55.000000000 +0200 @@ -37,7 +37,7 @@ ki18n_wrap_ui(KPim6CalendarUtils recurrenceactionsscopewidget.ui) -if (COMPILE_WITH_UNITY_CMAKE_SUPPORT) +if(COMPILE_WITH_UNITY_CMAKE_SUPPORT) set_target_properties(KPim6CalendarUtils PROPERTIES UNITY_BUILD ON) endif() ecm_generate_export_header(KPim6CalendarUtils @@ -102,7 +102,7 @@ COMPONENT Devel ) -if (BUILD_QCH) +if(BUILD_QCH) ecm_add_qch( KPim6CalendarUtils_QCH NAME KCalendarUtils @@ -124,7 +124,7 @@ TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel - ) +) endif() ecm_qt_install_logging_categories(EXPORT KCALUTILS FILE kcalutils.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/grantlee_plugin/CMakeLists.txt new/kcalutils-24.08.0/src/grantlee_plugin/CMakeLists.txt --- old/kcalutils-24.05.2/src/grantlee_plugin/CMakeLists.txt 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/grantlee_plugin/CMakeLists.txt 2024-08-16 06:59:55.000000000 +0200 @@ -20,7 +20,7 @@ KF6::TextTemplate KF6::IconThemes KPim6CalendarUtils - ) +) install(TARGETS kcalendar_grantlee_plugin LIBRARY DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/ktexttemplate/ - ) +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/grantlee_plugin/icon.cpp new/kcalutils-24.08.0/src/grantlee_plugin/icon.cpp --- old/kcalutils-24.05.2/src/grantlee_plugin/icon.cpp 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/grantlee_plugin/icon.cpp 2024-08-16 06:59:55.000000000 +0200 @@ -114,9 +114,16 @@ } } + QString iconPath = KIconLoader::global()->iconPath(iconName, mSizeOrGroup < KIconLoader::LastGroup ? mSizeOrGroup : -mSizeOrGroup); + if (iconPath.startsWith(QLatin1String(":/"))) { + iconPath = QStringLiteral("qrc") + iconPath; + } else { + iconPath = QStringLiteral("file://") + iconPath; + } + const QString html = - QStringLiteral("<img src=\"file://%1\" align=\"top\" height=\"%2\" width=\"%2\" alt=\"%3\" title=\"%4\" />") - .arg(KIconLoader::global()->iconPath(iconName, mSizeOrGroup)) + QStringLiteral("<img src=\"%1\" align=\"top\" height=\"%2\" width=\"%2\" alt=\"%3\" title=\"%4\" />") + .arg(iconPath) .arg(mSizeOrGroup < KIconLoader::LastGroup ? KIconLoader::global()->currentSize(static_cast<KIconLoader::Group>(mSizeOrGroup)) : mSizeOrGroup) .arg(altText.isEmpty() ? iconName : altText, altText); // title is intentionally blank if no alt is provided (*stream) << KTextTemplate::SafeString(html, KTextTemplate::SafeString::IsSafe); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/incidenceformatter.cpp new/kcalutils-24.08.0/src/incidenceformatter.cpp --- old/kcalutils-24.05.2/src/incidenceformatter.cpp 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/incidenceformatter.cpp 2024-08-16 06:59:55.000000000 +0200 @@ -474,7 +474,7 @@ incidence[QStringLiteral("attachments")] = displayViewFormatAttachments(event); incidence[QStringLiteral("creationDate")] = event->created().toLocalTime(); - return GrantleeTemplateManager::instance()->render(QStringLiteral(":/event.html"), incidence); + return GrantleeTemplateManager::instance()->render(QStringLiteral(":/org.kde.pim/kcalutils/event.html"), incidence); } [[nodiscard]] static QString displayViewFormatTodo(const Calendar::Ptr &calendar, const QString &sourceName, const Todo::Ptr &todo, QDate ocurrenceDueDate) @@ -553,7 +553,7 @@ incidence[QStringLiteral("attachments")] = displayViewFormatAttachments(todo); incidence[QStringLiteral("creationDate")] = todo->created().toLocalTime(); - return GrantleeTemplateManager::instance()->render(QStringLiteral(":/todo.html"), incidence); + return GrantleeTemplateManager::instance()->render(QStringLiteral(":/org.kde.pim/kcalutils/todo.html"), incidence); } [[nodiscard]] static QString displayViewFormatJournal(const Calendar::Ptr &calendar, const QString &sourceName, const Journal::Ptr &journal) @@ -569,7 +569,7 @@ incidence[QStringLiteral("categories")] = journal->categories(); incidence[QStringLiteral("creationDate")] = journal->created().toLocalTime(); - return GrantleeTemplateManager::instance()->render(QStringLiteral(":/journal.html"), incidence); + return GrantleeTemplateManager::instance()->render(QStringLiteral(":/org.kde.pim/kcalutils/journal.html"), incidence); } [[nodiscard]] static QString displayViewFormatFreeBusy(const Calendar::Ptr &calendar, const QString &sourceName, const FreeBusy::Ptr &fb) @@ -625,7 +625,7 @@ fbData[QStringLiteral("periods")] = periodsData; - return GrantleeTemplateManager::instance()->render(QStringLiteral(":/freebusy.html"), fbData); + return GrantleeTemplateManager::instance()->render(QStringLiteral(":/org.kde.pim/kcalutils/freebusy.html"), fbData); } //@endcond @@ -2287,16 +2287,16 @@ QString templateName; switch (inc->type()) { case KCalendarCore::IncidenceBase::TypeEvent: - templateName = QStringLiteral(":/itip_event.html"); + templateName = QStringLiteral(":/org.kde.pim/kcalutils/itip_event.html"); break; case KCalendarCore::IncidenceBase::TypeTodo: - templateName = QStringLiteral(":/itip_todo.html"); + templateName = QStringLiteral(":/org.kde.pim/kcalutils/itip_todo.html"); break; case KCalendarCore::IncidenceBase::TypeJournal: - templateName = QStringLiteral(":/itip_journal.html"); + templateName = QStringLiteral(":/org.kde.pim/kcalutils/itip_journal.html"); break; case KCalendarCore::IncidenceBase::TypeFreeBusy: - templateName = QStringLiteral(":/itip_freebusy.html"); + templateName = QStringLiteral(":/org.kde.pim/kcalutils/itip_freebusy.html"); break; case KCalendarCore::IncidenceBase::TypeUnknown: return QString(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/event.html new/kcalutils-24.08.0/src/templates/event.html --- old/kcalutils-24.05.2/src/templates/event.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/event.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,9 +1,9 @@ -{% extends ":/template_base.html" %} +{% extends ":/org.kde.pim/kcalutils/template_base.html" %} {% block body %} {% with _("Event") as type %} -{% include ":/incidence_header.html" %} +{% include ":/org.kde.pim/kcalutils/incidence_header.html" %} {% endwith %} <table> @@ -112,7 +112,7 @@ <th valign="top">{% i18n "Organizer:" %}</th> <td> {% with incidence.organizer as attendee %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% endwith %} </td> </tr> @@ -124,7 +124,7 @@ <th valign="top">{% i18n "Chair:" %}</th> <td> {% for attendee in incidence.chair %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> @@ -137,7 +137,7 @@ <th valign="top">{% i18n "Required Participants:" %}</th> <td> {% for attendee in incidence.requiredParticipants %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> @@ -150,7 +150,7 @@ <th valign="top">{% i18n "Optional participants:" %}</th> <td> {% for attendee in incidence.optionalParticipants %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> @@ -163,7 +163,7 @@ <th valign="top">{% i18n "Observers:" %}</th> <td> {% for attendee in incidence.chair %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/freebusy.html new/kcalutils-24.08.0/src/templates/freebusy.html --- old/kcalutils-24.05.2/src/templates/freebusy.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/freebusy.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,4 +1,4 @@ -{% extends ":/template_base.html" %} +{% extends ":/org.kde.pim/kcalutils/template_base.html" %} {% block body %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/itip.html new/kcalutils-24.08.0/src/templates/itip.html --- old/kcalutils-24.05.2/src/templates/itip.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/itip.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,4 +1,4 @@ -{% extends ":/template_base.html" %} +{% extends ":/org.kde.pim/kcalutils/template_base.html" %} {% block style %} #invitation { @@ -109,7 +109,7 @@ <th valign="top">{{ incidence.attendeesTitle }}</th> <td> {% for attendee in incidence.attendees %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/itip_event.html new/kcalutils-24.08.0/src/templates/itip_event.html --- old/kcalutils-24.05.2/src/templates/itip_event.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/itip_event.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,4 +1,4 @@ -{% extends ":/itip.html" %} +{% extends ":/org.kde.pim/kcalutils/itip.html" %} {% block incidenceDetail %} <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/itip_freebusy.html new/kcalutils-24.08.0/src/templates/itip_freebusy.html --- old/kcalutils-24.05.2/src/templates/itip_freebusy.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/itip_freebusy.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,4 +1,4 @@ -{% extends ":/itip.html" %} +{% extends ":/org.kde.pim/kcalutils/itip.html" %} {% block incidenceDetail %} <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/itip_journal.html new/kcalutils-24.08.0/src/templates/itip_journal.html --- old/kcalutils-24.05.2/src/templates/itip_journal.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/itip_journal.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,4 +1,4 @@ -{% extends ":/itip.html" %} +{% extends ":/org.kde.pim/kcalutils/itip.html" %} {% block incidenceDetail %} <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/itip_todo.html new/kcalutils-24.08.0/src/templates/itip_todo.html --- old/kcalutils-24.05.2/src/templates/itip_todo.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/itip_todo.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,4 +1,4 @@ -{% extends ":/itip.html" %} +{% extends ":/org.kde.pim/kcalutils/itip.html" %} {% block incidenceDetail %} {% if incidence.location %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/journal.html new/kcalutils-24.08.0/src/templates/journal.html --- old/kcalutils-24.05.2/src/templates/journal.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/journal.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,9 +1,9 @@ -{% extends ":/template_base.html" %} +{% extends ":/org.kde.pim/kcalutils/template_base.html" %} {% block body %} {% with _("Journal") as type %} -{% include ":/incidence_header.html" %} +{% include ":/org.kde.pim/kcalutils/incidence_header.html" %} {% endwith %} <table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates/todo.html new/kcalutils-24.08.0/src/templates/todo.html --- old/kcalutils-24.05.2/src/templates/todo.html 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates/todo.html 2024-08-16 06:59:55.000000000 +0200 @@ -1,9 +1,9 @@ -{% extends ":/template_base.html" %} +{% extends ":/org.kde.pim/kcalutils/template_base.html" %} {% block body %} {% with _("Todo") as type %} -{% include ":/incidence_header.html" %} +{% include ":/org.kde.pim/kcalutils/incidence_header.html" %} {% endwith %} <table class="main"> @@ -93,7 +93,7 @@ <th valign="top">{% i18n "Organizer:" %}</th> <td> {% with incidence.organizer as attendee %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% endwith %} </td> </tr> @@ -105,7 +105,7 @@ <th valign="top">{% i18n "Chair:" %}</th> <td> {% for attendee in incidence.chair %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> @@ -118,7 +118,7 @@ <th valign="top">{% i18n "Required Participants:" %}</th> <td> {% for attendee in incidence.requiredParticipants %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> @@ -131,7 +131,7 @@ <th valign="top">{% i18n "Optional participants:" %}</th> <td> {% for attendee in incidence.optionalParticipants %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> @@ -144,7 +144,7 @@ <th valign="top">{% i18n "Observers:" %}</th> <td> {% for attendee in incidence.chair %} - {% include ":/attendee_row.html" %} + {% include ":/org.kde.pim/kcalutils/attendee_row.html" %} {% if not forloop.last %}<br/>{% endif %} {% endfor %} </td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalutils-24.05.2/src/templates.qrc new/kcalutils-24.08.0/src/templates.qrc --- old/kcalutils-24.05.2/src/templates.qrc 2024-06-15 17:25:16.000000000 +0200 +++ new/kcalutils-24.08.0/src/templates.qrc 2024-08-16 06:59:55.000000000 +0200 @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/"> + <qresource prefix="/org.kde.pim/kcalutils"> <file alias="event.html">templates/event.html</file> <file alias="freebusy.html">templates/freebusy.html</file> <file alias="incidence_header.html">templates/incidence_header.html</file>
