Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2016-05-31 12:18:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2016-03-26 15:15:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kholidays.new/kholidays.changes 2016-05-31 12:18:09.000000000 +0200 @@ -1,0 +2,26 @@ +Sat May 7 10:28:28 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 06:04:48 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:41:20 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + +- Drop kholidays-glibc-2.23.patch, this is no longer needed as the + issue was fixed upstream + +------------------------------------------------------------------- Old: ---- kholidays-15.12.3.tar.xz kholidays-glibc-2.23.patch New: ---- kholidays-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.dY8kQP/_old 2016-05-31 12:18:10.000000000 +0200 +++ /var/tmp/diff_new_pack.dY8kQP/_new 2016-05-31 12:18:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: kholidays -Version: 15.12.3 +Version: 16.04.1 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries @@ -25,8 +25,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: kholidays-%{version}.tar.xz -#PATCH-FIX-OPENSUSE kholidays-glibc-2.23.patch -- Fix build with glibc 2.23 -Patch1: kholidays-glibc-2.23.patch BuildRequires: boost-devel >= 1.34.0 BuildRequires: cyrus-sasl-devel BuildRequires: extra-cmake-modules >= 1.0.0 @@ -48,7 +46,7 @@ BuildRequires: kwallet-devel >= %{kf5_version} BuildRequires: kwidgetsaddons-devel >= %{kf5_version} BuildRequires: kxmlgui-devel >= %{kf5_version} -BuildRequires: libKF5AkonadiPrivate-devel >= 1.72.43 +BuildRequires: akonadi-server-devel BuildRequires: libassuan-devel BuildRequires: libical-devel >= 0.42 BuildRequires: libxslt-devel @@ -87,7 +85,6 @@ %prep %setup -q -n kholidays-%{version} -%patch1 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%_kf5_includedir @@ -109,6 +106,9 @@ %doc COPYING.LIB %{_kf5_datadir}/libkholidays/ %{_kf5_libdir}/libKF5Holidays.so.* +%dir %_kf5_qmldir/org +%dir %_kf5_qmldir/org/kde +%_kf5_qmldir/org/kde/kholidays/ %files devel %defattr(-,root,root) ++++++ kholidays-15.12.3.tar.xz -> kholidays-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/CMakeLists.txt new/kholidays-16.04.1/CMakeLists.txt --- old/kholidays-15.12.3/CMakeLists.txt 2016-02-11 18:26:09.000000000 +0100 +++ new/kholidays-16.04.1/CMakeLists.txt 2016-04-26 22:18:12.000000000 +0200 @@ -3,7 +3,7 @@ project(KHolidays) # ECM setup -find_package(ECM 5.14.0 CONFIG REQUIRED) +find_package(ECM 5.19.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -15,11 +15,11 @@ include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -set(KF5_VERSION "5.14.0") -set(KHOLIDAYS_LIB_VERSION "4.80.0") +set(KF5_VERSION "5.19.0") +set(KHOLIDAYS_LIB_VERSION "5.2.1") ecm_setup_version(${KHOLIDAYS_LIB_VERSION} VARIABLE_PREFIX KHOLIDAYS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h" @@ -29,7 +29,7 @@ ########### Find packages ########### set(REQUIRED_QT_VERSION 5.4.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Qml) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/autotests/testholidayregion.cpp new/kholidays-16.04.1/autotests/testholidayregion.cpp --- old/kholidays-15.12.3/autotests/testholidayregion.cpp 2016-02-11 18:26:09.000000000 +0100 +++ new/kholidays-16.04.1/autotests/testholidayregion.cpp 2016-04-26 22:18:12.000000000 +0200 @@ -84,7 +84,7 @@ { KHolidays::HolidayRegion region(QFileInfo(KDESRCDIR "/holiday_gb-eaw_en-gb_Test")); printMetadata(region); - parseRegionCalendarYear(region, 2010, "gregorian"); + parseRegionCalendarYear(region, 2010, QStringLiteral("gregorian")); parseRegionCalendarYear(region, 2010); parseRegionCalendarYear(region, 2011); parseRegionCalendarYear(region, 2012); @@ -96,7 +96,7 @@ void HolidayRegionTest::testGb() { - KHolidays::HolidayRegion region("gb-eaw_en-gb"); + KHolidays::HolidayRegion region(QStringLiteral("gb-eaw_en-gb")); printMetadata(region); parseRegionDateRange(region, QDate(2010, 7, 1), QDate(2011, 6, 30)); parseRegionDateRange(region, QDate(2010, 1, 1), QDate(2012, 12, 31)); @@ -112,7 +112,7 @@ void HolidayRegionTest::testIran() { - KHolidays::HolidayRegion region("ir_en-us"); + KHolidays::HolidayRegion region(QStringLiteral("ir_en-us")); printMetadata(region); parseRegionCalendarYear(region, 2010); parseRegionCalendarYear(region, 2011); @@ -124,7 +124,7 @@ void HolidayRegionTest::testIsrael() { - KHolidays::HolidayRegion region("il_en-us"); + KHolidays::HolidayRegion region(QStringLiteral("il_en-us")); printMetadata(region); parseRegionCalendarYear(region, 2010); parseRegionCalendarYear(region, 2011); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/holidays/plan2/holiday_de-by_de new/kholidays-16.04.1/holidays/plan2/holiday_de-by_de --- old/kholidays-15.12.3/holidays/plan2/holiday_de-by_de 2016-02-11 18:26:09.000000000 +0100 +++ new/kholidays-16.04.1/holidays/plan2/holiday_de-by_de 2016-04-26 22:18:12.000000000 +0200 @@ -42,7 +42,8 @@ "Mariä Himmelfahrt" public cultural on august 15 "Einheitstag" public on october 3 "Allerheiligen" public on november 1 -"Buß- und Bettag" public on sunday before december 24 minus 32 days +::No longer a public holiday (except in Saxony), per Bug 355073 +::"Buß- und Bettag" public on sunday before december 24 minus 32 days "Weihnachten" public cultural on december 25 length 2 days :: Religious diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/holidays/plan2/holiday_ua_uk new/kholidays-16.04.1/holidays/plan2/holiday_ua_uk --- old/kholidays-15.12.3/holidays/plan2/holiday_ua_uk 2016-02-11 18:26:09.000000000 +0100 +++ new/kholidays-16.04.1/holidays/plan2/holiday_ua_uk 2016-04-26 22:18:12.000000000 +0200 @@ -59,10 +59,10 @@ ((([may 2] == [sunday after ([may 2])])) ? [tuesday after ([may 2])] : noop ) ) -: Victory Day -"День Перемоги" public on may 9 -: Victory Day Substitute Holiday -"День Перемоги" public on ( (([may 9] == [saturday after ([may 9])]) || +: Victory Day over Nazism in World War II +"День перемоги над нацизмом у Другій світовій війні" public on may 9 +: Victory Day over Nazism in World War II Substitute Holiday +"День перемоги над нацизмом у Другій світовій війні" public on ( (([may 9] == [saturday after ([may 9])]) || ([may 9] == [sunday after ([may 9])])) ? [monday after ([may 9])] : noop ) @@ -85,6 +85,14 @@ [monday after ([august 24])] : noop ) +: Defender of Ukraine Day +"День захисника України" public on october 14 +: Defender of Ukraine Day Substitute Holiday +"День захисника України" public on ( (([october 14] == [saturday after ([october 14])]) || + ([october 14] == [sunday after ([october 14])])) ? + [monday after ([october 14])] : + noop ) + :: Religious : Old New Year Eve, could use "on julian december 31" "Щедрий вечір" religious on january 13 @@ -112,12 +120,16 @@ "День пам’яті героїв Крут" cultural on january 29 : Valentine's Day "День святого Валентина (День всіх закоханих)" cultural on february 14 +: Day of the Heavenly Hundred Heroes +"День Героїв Небесної Сотні" cultural on february 20 : International Mother Language Day "Міжнародний день рідної мови" cultural on february 21 : International Day for Monuments and Sites "День пам'яток історії та культури" cultural on april 18 : Environment Day "День довкілля" cultural on third saturday in april +: Day of Remembrance and Reconciliation +"День пам'яті та примирення" cultural on may 8 : Mother's Day "День матері" cultural on second sunday in may : Europe Day @@ -138,8 +150,8 @@ "День Українського козацтва" cultural on october 14 : Day of Ukrainian Script and Language "День української писемності та мови" cultural on november 9 -: Freedom Day -"День Свободи" cultural on november 22 +: Day of Dignity and Freedom +"День Гідності та Свободи" cultural on november 21 : Holodomor Memorial Day "День пам'яті жертв голодоморів" cultural on fourth saturday in november diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/CMakeLists.txt new/kholidays-16.04.1/src/CMakeLists.txt --- old/kholidays-15.12.3/src/CMakeLists.txt 2016-02-11 18:26:09.000000000 +0100 +++ new/kholidays-16.04.1/src/CMakeLists.txt 2016-04-26 22:18:12.000000000 +0200 @@ -74,3 +74,5 @@ ecm_generate_pri_file(BASE_NAME KHolidays LIB_NAME KF5KHolidays DEPS "widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KHolidays) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) + +add_subdirectory(declarative) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/declarative/CMakeLists.txt new/kholidays-16.04.1/src/declarative/CMakeLists.txt --- old/kholidays-15.12.3/src/declarative/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-16.04.1/src/declarative/CMakeLists.txt 2016-04-26 22:18:12.000000000 +0200 @@ -0,0 +1,12 @@ +include_directories(${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..) + +add_library(kholidaysdeclarativeplugin SHARED kholidaysdeclarativeplugin.cpp + holidayregionsmodel.cpp) + +target_link_libraries(kholidaysdeclarativeplugin Qt5::Qml + Qt5::Core + KF5Holidays +) + +install(TARGETS kholidaysdeclarativeplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kholidays) +install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kholidays) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/declarative/holidayregionsmodel.cpp new/kholidays-16.04.1/src/declarative/holidayregionsmodel.cpp --- old/kholidays-15.12.3/src/declarative/holidayregionsmodel.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-16.04.1/src/declarative/holidayregionsmodel.cpp 2016-04-26 22:18:12.000000000 +0200 @@ -0,0 +1,83 @@ +/* + This file is part of the kholidays library. + + Copyright (c) 2015 Martin Klapetek <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "holidayregionsmodel.h" + +#include "../holidayregion.h" + +class HolidayRegionsDeclarativeModel::Private +{ +public: + QStringList regionCodes; +}; + +HolidayRegionsDeclarativeModel::HolidayRegionsDeclarativeModel(QObject *parent) + : QAbstractListModel(parent), + d(new Private()) +{ + d->regionCodes = KHolidays::HolidayRegion::regionCodes(); + // Make sure we don't add the same regions twice + // This can happen if two copies of the data exists + // in the system and both are read by KHolidays + d->regionCodes.removeDuplicates(); +} + +HolidayRegionsDeclarativeModel::~HolidayRegionsDeclarativeModel() +{ + delete d; +} + +int HolidayRegionsDeclarativeModel::rowCount(const QModelIndex &parent) const +{ + Q_UNUSED(parent) + + return d->regionCodes.size(); +} + +QVariant HolidayRegionsDeclarativeModel::data(const QModelIndex &index, int role) const +{ + if (!index.isValid()) { + return QVariant(); + } + + const QString regionCode = d->regionCodes.at(index.row()); + + switch (role) { + case HolidayRegionsDeclarativeModel::RegionRole: + return regionCode; + case HolidayRegionsDeclarativeModel::NameRole: + return KHolidays::HolidayRegion::name(regionCode); + case HolidayRegionsDeclarativeModel::DescriptionRole: + return KHolidays::HolidayRegion::description(regionCode); + } + + return QVariant(); +} + +QHash<int, QByteArray> HolidayRegionsDeclarativeModel::roleNames() const +{ + QHash<int, QByteArray> roles; + roles.insert(HolidayRegionsDeclarativeModel::RegionRole, QByteArrayLiteral("region")); + roles.insert(HolidayRegionsDeclarativeModel::NameRole, QByteArrayLiteral("name")); + roles.insert(HolidayRegionsDeclarativeModel::DescriptionRole, QByteArrayLiteral("description")); + + return roles; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/declarative/holidayregionsmodel.h new/kholidays-16.04.1/src/declarative/holidayregionsmodel.h --- old/kholidays-15.12.3/src/declarative/holidayregionsmodel.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-16.04.1/src/declarative/holidayregionsmodel.h 2016-04-26 22:18:12.000000000 +0200 @@ -0,0 +1,49 @@ +/* + This file is part of the kholidays library. + + Copyright (c) 2015 Martin Klapetek <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef HOLIDAYREGIONSDECLARATIVEMODEL_H +#define HOLIDAYREGIONSDECLARATIVEMODEL_H + +#include <QObject> +#include <QAbstractListModel> + +class HolidayRegionsDeclarativeModel : public QAbstractListModel +{ + Q_OBJECT +public: + enum Roles { + RegionRole = Qt::UserRole + 1, + NameRole, + DescriptionRole + }; + explicit HolidayRegionsDeclarativeModel(QObject *parent = Q_NULLPTR); + virtual ~HolidayRegionsDeclarativeModel(); + + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; + +private: + class Private; + Private *const d; +}; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/declarative/kholidaysdeclarativeplugin.cpp new/kholidays-16.04.1/src/declarative/kholidaysdeclarativeplugin.cpp --- old/kholidays-15.12.3/src/declarative/kholidaysdeclarativeplugin.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-16.04.1/src/declarative/kholidaysdeclarativeplugin.cpp 2016-04-26 22:18:12.000000000 +0200 @@ -0,0 +1,30 @@ +/* + This file is part of the kholidays library. + + Copyright (c) 2015 Martin Klapetek <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "kholidaysdeclarativeplugin.h" +#include "holidayregionsmodel.h" + +#include <qqml.h> + +void KHolidaysDeclarativePlugin::registerTypes(const char *uri) +{ + qmlRegisterType<HolidayRegionsDeclarativeModel>(uri, 1, 0, "HolidayRegionsModel"); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/declarative/kholidaysdeclarativeplugin.h new/kholidays-16.04.1/src/declarative/kholidaysdeclarativeplugin.h --- old/kholidays-15.12.3/src/declarative/kholidaysdeclarativeplugin.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-16.04.1/src/declarative/kholidaysdeclarativeplugin.h 2016-04-26 22:18:12.000000000 +0200 @@ -0,0 +1,35 @@ +/* + This file is part of the kholidays library. + + Copyright (c) 2015 Martin Klapetek <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KHOLIDAYSDECLARATIVEPLUGIN_H +#define KHOLIDAYSDECLARATIVEPLUGIN_H + +#include <QQmlExtensionPlugin> + +class KHolidaysDeclarativePlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") +public: + virtual void registerTypes(const char *uri); +}; + +#endif // KHOLIDAYSDECLARATIVEPLUGIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/declarative/qmldir new/kholidays-16.04.1/src/declarative/qmldir --- old/kholidays-15.12.3/src/declarative/qmldir 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-16.04.1/src/declarative/qmldir 2016-04-26 22:18:12.000000000 +0200 @@ -0,0 +1,3 @@ +module org.kde.kholidays + +plugin kholidaysdeclarativeplugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/parsers/plan2/holidayparserplan.cpp new/kholidays-16.04.1/src/parsers/plan2/holidayparserplan.cpp --- old/kholidays-15.12.3/src/parsers/plan2/holidayparserplan.cpp 2016-02-11 18:26:09.000000000 +0100 +++ new/kholidays-16.04.1/src/parsers/plan2/holidayparserplan.cpp 2016-04-26 22:18:12.000000000 +0200 @@ -173,7 +173,7 @@ case '"': return yyr; } - do_not_strip_quotes: ; + do_not_strip_quotes:; } return yystr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/parsers/plan2/holidayscannerplan.cpp new/kholidays-16.04.1/src/parsers/plan2/holidayscannerplan.cpp --- old/kholidays-15.12.3/src/parsers/plan2/holidayscannerplan.cpp 2016-02-11 18:26:09.000000000 +0100 +++ new/kholidays-16.04.1/src/parsers/plan2/holidayscannerplan.cpp 2016-04-26 22:18:12.000000000 +0200 @@ -523,7 +523,7 @@ 137, 196, 0, 0, 0, 0, 145, 0, 0, 0, 52, 0, 146, 0, 155, 154, 157, 161, 0, 147, 0 -} ; +}; static yyconst flex_int32_t yy_ec[256] = { 0, @@ -555,7 +555,7 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 -} ; +}; static yyconst flex_int32_t yy_meta[70] = { 0, @@ -566,7 +566,7 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 -} ; +}; static yyconst flex_int16_t yy_base[985] = { 0, @@ -678,7 +678,7 @@ 2013, 2013, 1934, 1939, 1929, 1942, 2013, 1944, 1934, 1936, 2013, 1945, 2013, 1953, 2013, 2013, 2013, 2013, 1960, 2013, 2013, 102, 100, 99 -} ; +}; static yyconst flex_int16_t yy_def[985] = { 0, @@ -790,7 +790,7 @@ 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 0, 981, 981, 981 -} ; +}; static yyconst flex_int16_t yy_nxt[2083] = { 0, @@ -1023,7 +1023,7 @@ 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981 -} ; +}; static yyconst flex_int16_t yy_chk[2083] = { 0, @@ -1256,7 +1256,7 @@ 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981, 981 -} ; +}; static yyconst flex_int16_t yy_rule_linenum[202] = { 0, @@ -1283,7 +1283,7 @@ 309, 310, 311, 313, 314, 315, 316, 317, 318, 319, 321 -} ; +}; /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-15.12.3/src/sunriseset.cpp new/kholidays-16.04.1/src/sunriseset.cpp --- old/kholidays-15.12.3/src/sunriseset.cpp 2016-02-11 18:26:09.000000000 +0100 +++ new/kholidays-16.04.1/src/sunriseset.cpp 2016-04-26 22:18:12.000000000 +0200 @@ -180,8 +180,9 @@ 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(), timeUTC.second() > 29 ? timeUTC.minute() + 1 : timeUTC.minute(), @@ -199,8 +200,9 @@ 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(), timeUTC.second() > 29 ? timeUTC.minute() + 1 : timeUTC.minute(),
