Merge pull request #1455 from groni/master

kholidays add patch and missing build dependency
2016-03-30 00:28:39 +03:00
parent bddfdde093 6e3409d37f
commit d8b3baea0e
2 changed files with 25 additions and 0 deletions
@@ -0,0 +1,21 @@
+--- 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(),
+
@@ -17,6 +17,7 @@
        <Archive sha1sum="1efd7b3e6b545a587bb109ecf3b7fe6709aa1640" type="tarxz">mirrors://kde/stable/applications/15.12.3/src/kholidays-15.12.3.tar.xz</Archive>
        <BuildDependencies>
            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>autogen-devel</Dependency>
            <Dependency>kitemviews-devel</Dependency>
            <Dependency>kdoctools-devel</Dependency>
            <Dependency>kdelibs4-support-devel</Dependency>
@@ -27,6 +28,9 @@
            <Dependency>kdesignerplugin</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch level="1">sunrise-fix.patch</Patch>
+        </Patches>
    </Source>

    <Package>