[kf5-calendarcore] Update to latest upstream including patch for 0 se…

…cond duration.
sailfishos · Jun 4, 2019 · 356fb13 · 356fb13
1 parent 6251c7a
commit 356fb13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/rpm/0003-Adjust-for-lower-Qt-versions.patch b/rpm/0003-Adjust-for-lower-Qt-versions.patch
@@ -21,7 +21,7 @@ index 727c611dc..f7a27f41a 100644
  project(KCalCore VERSION ${PIM_VERSION})
 
  # ECM setup
--set(KF5_MIN_VERSION "5.57.0")
+-set(KF5_MIN_VERSION "5.58.0")
 +set(KF5_MIN_VERSION "5.44.0")
 
  find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)

diff --git a/rpm/kf5-calendarcore.spec b/rpm/kf5-calendarcore.spec
@@ -16,9 +16,8 @@ BuildRequires:  pkgconfig(libical)
 BuildRequires:  extra-cmake-modules >= 5.44.0
 
 Patch1: 0001-Use-UTC-times-when-calculating-the-transition-dates-.patch
-Patch2: 0002-Create-second-type-duration-for-0-delay-durations-in.patch
-Patch3: 0003-Adjust-for-lower-Qt-versions.patch
-Patch4: 0004-Add-pkgconfig-packaging.patch
+Patch2: 0003-Adjust-for-lower-Qt-versions.patch
+Patch3: 0004-Add-pkgconfig-packaging.patch
 
 %description
 KDE Framework calendar core library
@@ -38,7 +37,6 @@ applications using %{name}
 %patch1 -d upstream -p1
 %patch2 -d upstream -p1
 %patch3 -d upstream -p1
-%patch4 -d upstream -p1
 
 %build
 if [ ! -d upstream/build ] ; then mkdir upstream/build ; fi ; cd upstream/build

diff --git a/upstream b/upstream