Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at 2016-05-08 10:45:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old) and /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes 2015-03-11 09:58:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes 2016-05-08 10:46:20.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 4 20:20:52 UTC 2016 - [email protected] + +- Added fix-build-with-gcc5.patch: fixes build in Factory + +------------------------------------------------------------------- New: ---- fix-build-with-gcc5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.nNyPxA/_old 2016-05-08 10:46:21.000000000 +0200 +++ /var/tmp/diff_new_pack.nNyPxA/_new 2016-05-08 10:46:21.000000000 +0200 @@ -25,6 +25,8 @@ Group: System/GUI/KDE Url: https://github.com/QtCurve/qtcurve Source: qtcurve-%{version}.tar.xz +# PATCH-FIX-UPSTREAM fix-build-with-gcc5.patch -- fixes build in Factory +Patch: fix-build-with-gcc5.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules BuildRequires: gtk2-devel @@ -92,6 +94,7 @@ %prep %setup -q -n qtcurve-%{version} +%patch -p1 %build %cmake_kde4 -d build -- -DENABLE_QT5=ON -DQTC_QT5_ENABLE_KDE=ON ++++++ fix-build-with-gcc5.patch ++++++ From: Yichao Yu <[email protected]> Date: Sat, 27 Feb 2016 15:34:18 +0000 Subject: Fix compilation on gcc5 X-Git-Url: http://quickgit.kde.org/?p=qtcurve.git&a=commitdiff&h=34a1e3277aa21c59029576bffe2576a9ddd4b1a7 --- Fix compilation on gcc5 --- --- a/gtk2/style/qt_settings.cpp +++ b/gtk2/style/qt_settings.cpp @@ -467,7 +467,7 @@ #define MIX(a, b, bias) (a + ((b - a) * bias)) GdkColor mixColors(const GdkColor *c1, const GdkColor *c2, double bias) { - if (bias <= 0.0 || isnan(bias)) + if (bias <= 0.0 || std::isnan(bias)) return *c1; if (bias >= 1.0) return *c2; --- a/lib/utils/color.cpp +++ b/lib/utils/color.cpp @@ -177,7 +177,7 @@ _qtcColorTint(const QtcColor *base, const QtcColor *col, double amount, QtcColor *out) { - if (qtcUnlikely(amount <= 0.0 || isnan(amount))) { + if (qtcUnlikely(amount <= 0.0 || std::isnan(amount))) { *out = *base; return; } @@ -205,7 +205,7 @@ QTC_EXPORT void _qtcColorMix(const QtcColor *c1, const QtcColor *c2, double bias, QtcColor *out) { - if (qtcUnlikely(bias <= 0.0 || isnan(bias))) { + if (qtcUnlikely(bias <= 0.0 || std::isnan(bias))) { *out = *c1; return; }
