diff options
Diffstat (limited to '')
-rw-r--r-- | kde/patch/kholidays.patch | 8 | ||||
-rw-r--r-- | kde/patch/kholidays/kholidays_depfreeze_revert.patch | 61 | ||||
-rw-r--r-- | kde/patch/kholidays/kholidays_isnan.patch | 30 |
3 files changed, 0 insertions, 99 deletions
diff --git a/kde/patch/kholidays.patch b/kde/patch/kholidays.patch deleted file mode 100644 index ec8ad80..0000000 --- a/kde/patch/kholidays.patch +++ /dev/null @@ -1,8 +0,0 @@ -# Fix for "error: isnan was not declared in this scope" -# Fixed post Plasma 5.5.5. -#cat $CWD/patch/kholidays/kholidays_isnan.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# Revert depfreeze breaking merges (KF5_VERSION, cmake, PIM_VERSION). -# Should be fixed in Applications > 16.12.3. -#cat $CWD/patch/kholidays/kholidays_depfreeze_revert.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - diff --git a/kde/patch/kholidays/kholidays_depfreeze_revert.patch b/kde/patch/kholidays/kholidays_depfreeze_revert.patch deleted file mode 100644 index 316403a..0000000 --- a/kde/patch/kholidays/kholidays_depfreeze_revert.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 506bd08a6faf61c776beecb05f1acbe04223827a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Fri, 10 Mar 2017 13:33:10 +0100 -Subject: Revert depfreeze breaking merges (KF5_VERSION, cmake, PIM_VERSION) - ---- - CMakeLists.txt | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05164db..e0b67b8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,28 +1,28 @@ --cmake_minimum_required(VERSION 3.0) --set(PIM_VERSION "5.4.40") -+cmake_minimum_required(VERSION 2.8.12) - --project(KHolidays VERSION ${PIM_VERSION}) -+project(KHolidays) - - # ECM setup --set(KF5_VERSION "5.31.0") -+set(KF5_VERSION "5.28.0") - find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) - - include(GenerateExportHeader) - include(ECMGenerateHeaders) - include(ECMGeneratePriFile) --include(CMakePackageConfigHelpers) -+include(ECMPackageConfigHelpers) - include(ECMSetupVersion) - include(ECMPoQmTools) - include(FeatureSummary) - include(KDEInstallDirs) - include(KDECMakeSettings) - include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) --include(ECMCoverageOption) -+ -+set(PIM_VERSION "5.4.3") - - set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION}) - --ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS -+ecm_setup_version(${KHOLIDAYS_LIB_VERSION} VARIABLE_PREFIX KHOLIDAYS - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfigVersion.cmake" - SOVERSION 5 -@@ -50,7 +50,7 @@ endif() - ########### CMake Config Files ########### - set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Holidays") - --configure_package_config_file( -+ecm_configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5HolidaysConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} --- -cgit v0.11.2 - diff --git a/kde/patch/kholidays/kholidays_isnan.patch b/kde/patch/kholidays/kholidays_isnan.patch deleted file mode 100644 index 55e79aa..0000000 --- a/kde/patch/kholidays/kholidays_isnan.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Milian Wolff <milian.wolff@kdab.com> -Date: Mon, 07 Mar 2016 09:58:37 +0000 -Subject: Fix compile with clang: isnan is in the std namespace when including cmath. -X-Git-Url: http://quickgit.kde.org/?p=kholidays.git&a=commitdiff&h=488aa158f7a0a99604a13a897a11388c02f8d39e ---- -Fix compile with clang: isnan is in the std namespace when including cmath. ---- - - ---- a/src/sunriseset.cpp -+++ b/src/sunriseset.cpp -@@ -180,7 +180,7 @@ - double hourAngle = calcHourAngleSunrise(latitude, solarDec); - double delta = longitude + radToDeg(hourAngle); - QTime timeUTC(0, 0); -- if (isnan(delta)) -+ if (std::isnan(delta)) - return timeUTC; - timeUTC = timeUTC.addSecs((720 - (4.0 * delta) - eqTime) * 60); - return QTime(timeUTC.hour(), -@@ -199,7 +199,7 @@ - double hourAngle = -calcHourAngleSunrise(latitude, solarDec); - double delta = longitude + radToDeg(hourAngle); - QTime timeUTC(0, 0); -- if (isnan(delta)) -+ if (std::isnan(delta)) - return timeUTC; - timeUTC = timeUTC.addSecs((720 - (4.0 * delta) - eqTime) * 60); - return QTime(timeUTC.hour(), - |