diff options
| author | adridg <adridg@FreeBSD.org> | 2018-09-03 04:30:45 +0800 |
|---|---|---|
| committer | adridg <adridg@FreeBSD.org> | 2018-09-03 04:30:45 +0800 |
| commit | f62b64acb65075c33dbc16ca7a9bc7e61cca9d82 (patch) | |
| tree | 455007b607157c2f512128c4d255a64fcc72c536 /audio | |
| parent | 4dfb4bcb5e4315db33b23421a0d1dba939c3b690 (diff) | |
| download | freebsd-ports-gnome-f62b64acb65075c33dbc16ca7a9bc7e61cca9d82.tar.gz freebsd-ports-gnome-f62b64acb65075c33dbc16ca7a9bc7e61cca9d82.tar.zst freebsd-ports-gnome-f62b64acb65075c33dbc16ca7a9bc7e61cca9d82.zip | |
Fix build of audio/sayonara on 10.4.
/wrkdirs/usr/ports/audio/sayonara/work/sayonara-player/src/Components/Covers/LocalCoverSearcher.cpp:71:14: error: call to 'abs' is ambiguous
double d = std::abs(height - width) / (width * 1.0) + 1.0;
While here, remove superfluous patch that now just added a
duplicate #include. Don't bump PORTREVISION because this
only fixes the build on 10.4 and otherwise has no effect
on the package.
Reported by: pkg-fallout
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/sayonara/files/patch-src_Components_Covers_LocalCoverSearcher.cpp | 11 | ||||
| -rw-r--r-- | audio/sayonara/files/patch-src_Components_Engine_AbstractEngine.cpp | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/audio/sayonara/files/patch-src_Components_Covers_LocalCoverSearcher.cpp b/audio/sayonara/files/patch-src_Components_Covers_LocalCoverSearcher.cpp new file mode 100644 index 000000000000..980c7de0731a --- /dev/null +++ b/audio/sayonara/files/patch-src_Components_Covers_LocalCoverSearcher.cpp @@ -0,0 +1,11 @@ +--- src/Components/Covers/LocalCoverSearcher.cpp.orig 2018-09-02 20:19:55 UTC ++++ src/Components/Covers/LocalCoverSearcher.cpp +@@ -68,7 +68,7 @@ QStringList LocalSearcher::cover_paths_f + continue; + } + +- double d = std::abs(height - width) / (width * 1.0) + 1.0; ++ double d = std::abs(static_cast<double>(height - width)) / (width * 1.0) + 1.0; + double pixels = static_cast<double>(width * height); + + d = (d * d * std::max(width, height)) / pixels; diff --git a/audio/sayonara/files/patch-src_Components_Engine_AbstractEngine.cpp b/audio/sayonara/files/patch-src_Components_Engine_AbstractEngine.cpp deleted file mode 100644 index 2d641d6d1dbe..000000000000 --- a/audio/sayonara/files/patch-src_Components_Engine_AbstractEngine.cpp +++ /dev/null @@ -1,13 +0,0 @@ -Missing include needed for std::abs; this caused a build error on 10.3 i386. - ---- src/Components/Engine/AbstractEngine.cpp.orig 2017-12-31 13:34:19 UTC -+++ src/Components/Engine/AbstractEngine.cpp -@@ -29,6 +29,8 @@ - - #include <gst/gst.h> - -+#include <cstdlib> -+ - using Engine::Base; - - struct Base::Private |