diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-11-27 06:27:52 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-11-27 06:28:24 +1100 |
| commit | c231fe9f0abe6bda9bb385052ca0289d8655b9a4 (patch) | |
| tree | e7965b5ebfb29d8f03b2a7a6884f95bb8cb78512 | |
| parent | app-office/libreoffice: Add revision bump (stable candidate with bugfixes) (diff) | |
| download | gentoo-c231fe9f0abe6bda9bb385052ca0289d8655b9a4.tar.gz gentoo-c231fe9f0abe6bda9bb385052ca0289d8655b9a4.tar.bz2 gentoo-c231fe9f0abe6bda9bb385052ca0289d8655b9a4.zip | |
media-video/baka-mplayer: backport patch from upstream to resolve build failure with GCC 5
Gentoo-bug: 591270
Package-Manager: portage-2.3.2
| -rw-r--r-- | media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild | 4 | ||||
| -rw-r--r-- | media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch | 32 |
2 files changed, 35 insertions, 1 deletions
diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild index ee266adf6b27..1579da0c5571 100644 --- a/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild +++ b/media-video/baka-mplayer/baka-mplayer-2.0.4.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit qmake-utils +inherit eutils qmake-utils DESCRIPTION="Cross-platform libmpv-based multimedia player with uncluttered design" HOMEPAGE="http://bakamplayer.u8sand.net/" @@ -32,6 +32,8 @@ src_prepare() { sed -e '/^INSTALLS/s:license::' -i src/Baka-MPlayer.pro || die # put manual in our docdir sed -e '/^manual.path/s:'${PN}':'${PF}':' -i src/Baka-MPlayer.pro || die + + epatch "${FILESDIR}/${P}-gcc5.patch" } src_configure() { diff --git a/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch new file mode 100644 index 000000000000..97ff52537ad0 --- /dev/null +++ b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-gcc5.patch @@ -0,0 +1,32 @@ +From 640cac8bab18cffca8258645c2b13b4defc01a8e Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +Date: Wed, 2 Dec 2015 02:38:44 +0000 +Subject: [PATCH] Explicitly use <cmath> to unbreak build with libc++ + +src/ui/mainwindow.cpp:996:53: error: use of undeclared identifier 'ceil' + playlistRect.setLeft(playlistRect.right() - ceil(playlistRect.width()/7.0)) +--- + src/ui/mainwindow.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp +index 4f051ad..c3f5f92 100644 +--- a/src/ui/mainwindow.cpp ++++ b/src/ui/mainwindow.cpp +@@ -1,6 +1,7 @@ + #include "mainwindow.h" + #include "ui_mainwindow.h" + ++#include <cmath> + #include <QLibraryInfo> + #include <QMimeData> + #include <QDesktopWidget> +@@ -993,7 +994,7 @@ void MainWindow::mouseMoveEvent(QMouseEvent *event) + ui->seekBar->setVisible(showPlayback || ui->outputTextEdit->isVisible()); + + QRect playlistRect = geometry(); +- playlistRect.setLeft(playlistRect.right() - ceil(playlistRect.width()/7.0)); ++ playlistRect.setLeft(playlistRect.right() - std::ceil(playlistRect.width()/7.0)); + bool showPlaylist = playlistRect.contains(event->globalPos()); + ShowPlaylist(showPlaylist); + |