From fcc7a93fc5a93350edb19bc751d8f63d08edc6e7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Feb 2016 08:33:41 -0600 Subject: [PATCH] fix gcc6 FTBFS --- kf5-kholidays.spec | 8 ++++++-- kholidays-15.12.1-gcc6.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 kholidays-15.12.1-gcc6.patch diff --git a/kf5-kholidays.spec b/kf5-kholidays.spec index 75bca45..c0c3404 100644 --- a/kf5-kholidays.spec +++ b/kf5-kholidays.spec @@ -16,6 +16,9 @@ URL: https://projects.kde.org/%{framework} %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{framework}-%{version}.tar.xz +## upstreamable patches +Patch1: kholidays-15.12.1-gcc6.patch + BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules BuildRequires: qt5-qtbase-devel @@ -38,7 +41,7 @@ developing applications that use %{name}. %prep -%setup -q -n %{framework}-%{version} +%autosetup -n %{framework}-%{version} -p1 %build @@ -71,8 +74,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog -* Sat Feb 06 2016 Rex Dieter 15.12.1-1 +* Thu Feb 11 2016 Rex Dieter 15.12.1-1 - 15.12.1 +- fix gcc6 FTBFS * Thu Feb 04 2016 Fedora Release Engineering - 15.12.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/kholidays-15.12.1-gcc6.patch b/kholidays-15.12.1-gcc6.patch new file mode 100644 index 0000000..843c3a3 --- /dev/null +++ b/kholidays-15.12.1-gcc6.patch @@ -0,0 +1,11 @@ +diff -up kholidays-15.12.1/src/sunriseset.cpp.gcc6 kholidays-15.12.1/src/sunriseset.cpp +--- kholidays-15.12.1/src/sunriseset.cpp.gcc6 2015-11-21 18:49:24.000000000 -0600 ++++ kholidays-15.12.1/src/sunriseset.cpp 2016-02-11 08:31:39.554683739 -0600 +@@ -23,6 +23,7 @@ + */ + + #include "sunriseset.h" ++#include + #include + static const double PI = 3.14159265358979323846; + static const double MaxLat = 89.99;