Merge pull request #11 from dcaliste/update

[kf5-calendarcore] Update to upstream 5.92.
sailfishos · Mar 15, 2022 · b8947f1 · b8947f1
2 parents 2e3a187 + e29849e
commit b8947f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/rpm/0001-Adjust-for-lower-Qt-versions.patch b/rpm/0001-Adjust-for-lower-Qt-versions.patch
@@ -32,7 +32,7 @@ index 406925e2b..f39c15fab 100644
 
  # ECM setup
  include(FeatureSummary)
--find_package(ECM 5.90.0  NO_MODULE)
+-find_package(ECM 5.92.0  NO_MODULE)
 +find_package(ECM 5.89.0  NO_MODULE)
  set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
  feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -65,9 +65,9 @@ index 4c821d45b..9bc28ff9c 100644
  void TestDateSerialization::testTodoCompletedOnce()
  {
 +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-     QDateTime startDate = QDate::currentDate().startOfDay();
+     QDateTime startDate = QDate(2022, 1, 27).startOfDay();
 +#else
-+    QDateTime startDate { QDate::currentDate() };
++    QDateTime startDate { QDate(2022, 1, 27) };
 +#endif
      QDateTime dueDate{startDate.addDays(1)};
 

diff --git a/rpm/kf5-calendarcore.spec b/rpm/kf5-calendarcore.spec
@@ -1,6 +1,6 @@
 Name:       kf5-calendarcore
 Summary:    KDE calendar library
-Version:    5.90.0
+Version:    5.92.0
 Release:    1
 License:    LGPLv2+
 URL:        https://invent.kde.org/frameworks/kcalendarcore

diff --git a/upstream b/upstream