Skip to content

Commit

Permalink
[kf5-kcalcore] Update to upstream 5.75.
Browse files Browse the repository at this point in the history
  • Loading branch information
dcaliste committed Oct 8, 2020
1 parent ea8fa9c commit 7eed689
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions rpm/0002-Adjust-for-lower-Qt-versions.patch
Expand Up @@ -27,7 +27,7 @@ index ecf1986ca..413cd71ee 100644

# ECM setup
include(FeatureSummary)
-find_package(ECM 5.67.0 NO_MODULE)
-find_package(ECM 5.75.0 NO_MODULE)
+find_package(ECM 5.44.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)
Expand Down Expand Up @@ -83,12 +83,12 @@ index b0630cdcd..92616cdf7 100644
@@ -41,23 +41,24 @@ ecm_qt_declare_logging_category(kcalcore_LIB_SRCS
HEADER kcalendarcore_debug.h
IDENTIFIER KCALCORE_LOG
CATEGORY_NAME org.kde.pim.kcalcore
- OLD_CATEGORY_NAMES log_kcalcore
- DESCRIPTION "kcalcore (pim lib)"
CATEGORY_NAME kf.calendarcore
- OLD_CATEGORY_NAMES log_kcalcore org.kde.pim.kcalcore
- DESCRIPTION "KCalendarCore"
- EXPORT KCALENDARCORE
+# OLD_CATEGORY_NAMES log_kcalcore
+# DESCRIPTION "kcalcore (pim lib)"
+# OLD_CATEGORY_NAMES log_kcalcore org.kde.pim.kcalcore
+# DESCRIPTION "KCalendarCore"
+# EXPORT KCALENDARCORE
)

Expand Down Expand Up @@ -220,7 +220,7 @@ index a685a534f..7ac18ed95 100644
{
// check for self assignment
@@ -150,7 +149,6 @@ Recurrence &Recurrence::operator=(const Recurrence &recurrence)
*d = *recurrence.d;
QT_WARNING_POP
return *this;
}
-#endif
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from 52c0f1 to ad915f

0 comments on commit 7eed689

Please sign in to comment.