Hello community, here is the log from the commit of package kcalcore for openSUSE:Factory checked in at 2019-08-28 16:01:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcalcore (Old) and /work/SRC/openSUSE:Factory/.kcalcore.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcalcore" Wed Aug 28 16:01:28 2019 rev:48 rq:725576 version:19.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcalcore/kcalcore.changes 2019-08-16 15:36:14.485863428 +0200 +++ /work/SRC/openSUSE:Factory/.kcalcore.new.7948/kcalcore.changes 2019-08-28 16:01:31.854800062 +0200 @@ -1,0 +2,5 @@ +Fri Aug 23 12:42:17 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add 0001-Restore-backward-compatibility-for-the-version-heade.patch + +------------------------------------------------------------------- New: ---- 0001-Restore-backward-compatibility-for-the-version-heade.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcalcore.spec ++++++ --- /var/tmp/diff_new_pack.7n5nYV/_old 2019-08-28 16:01:33.966799744 +0200 +++ /var/tmp/diff_new_pack.7n5nYV/_new 2019-08-28 16:01:33.966799744 +0200 @@ -35,6 +35,8 @@ %endif # PATCH-FIX-OPENSUSE Patch0: 0001-Revert-GIT_SILENT-increase-version.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Restore-backward-compatibility-for-the-version-heade.patch BuildRequires: bison BuildRequires: extra-cmake-modules >= 5.19.0 BuildRequires: kdelibs4support-devel >= %{kf5_version} @@ -66,8 +68,7 @@ to develop KDE PIM applications. %prep -%setup -q -n kcalcore-%{version} -%autopatch -p1 +%autosetup -p1 -n kcalcore-%{version} %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} @@ -89,6 +90,7 @@ %license COPYING* %{_kf5_cmakedir}/KF5CalendarCore/ %{_kf5_includedir}/KCalendarCore/ +%{_kf5_includedir}/kcalcore_version.h %{_kf5_includedir}/kcalendarcore_version.h %{_kf5_libdir}/libKF5CalendarCore.so %{_kf5_mkspecsdir}/qt_KCalendarCore.pri ++++++ 0001-Restore-backward-compatibility-for-the-version-heade.patch ++++++ >From 28eab632238352ab46f6c1db11f6ebf7d3ce0690 Mon Sep 17 00:00:00 2001 From: Volker Krause <[email protected]> Date: Fri, 16 Aug 2019 18:01:11 +0200 Subject: [PATCH] Restore backward compatibility for the version header Summary: Needed by Calligra. Reviewers: asturmlechner, dfaure Subscribers: kde-pim Tags: #kde_pim Differential Revision: https://phabricator.kde.org/D23204 --- CMakeLists.txt | 9 +++++++++ src/CMakeLists.txt | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d89b7ec51..018bcc57a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,9 @@ include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) +# TODO: remove for KF6 +option(KCALENDARCORE_NO_DEPRECATED_NAMESPACE "Disable deprecated KCalCore namespace" OFF) + if(POLICY CMP0053) cmake_policy(SET CMP0053 NEW) endif() @@ -84,6 +87,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcalendarcore_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +if (NOT KCALENDARCORE_NO_DEPRECATED_NAMESPACE) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/kcalendarcore_version.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel RENAME kcalcore_version.h + ) +endif() install(FILES kcalendarcore.renamecategories kcalendarcore.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37e117376..5718a2030 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,8 +46,6 @@ generate_export_header(KF5CalendarCore BASE_NAME kcalendarcore) add_library(KF5::CalendarCore ALIAS KF5CalendarCore) # backward compatibility with the old name -# TODO: remove for KF6 -option(KCALENDARCORE_NO_DEPRECATED_NAMESPACE "Disable deprecated KCalCore namespace" OFF) if (NOT KCALENDARCORE_NO_DEPRECATED_NAMESPACE) target_compile_definitions(KF5CalendarCore INTERFACE "-DKCalCore=KCalendarCore") endif() -- 2.23.0
