diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/clementine/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/clementine/clementine-gcc5.1.patch | 23 | ||||
| -rw-r--r-- | libre/clementine/clementine-udisks-namespace.patch (renamed from libre/clementine/udisks-namespace.patch) | 0 |
3 files changed, 31 insertions, 4 deletions
diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD index feebd4690..a93a8a7ab 100644 --- a/libre/clementine/PKGBUILD +++ b/libre/clementine/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122423 2014-11-12 06:07:22Z foutrelis $ +# $Id: PKGBUILD 134345 2015-05-30 09:33:56Z alucryd $ # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com> # Contributor (Arch): Stéphane Gaudreault <stephane@archlinux.org> # Contributor (Arch): BlackEagle <ike.devolder@gmail.com> @@ -10,7 +10,7 @@ pkgname=clementine _pkgname=$pkgname-libre pkgver=1.2.3 -pkgrel=5.parabola1 +pkgrel=6.parabola1 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support' url="http://www.$pkgname-player.org/" license=('GPL') @@ -24,17 +24,20 @@ optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' 'gstreamer0.10-good-plugins: "Good" plugin libraries' 'gstreamer0.10-bad-plugins: "Bad" plugin libraries' 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' + 'gstreamer0.10-ffmpeg: FFmpeg plugin' 'gvfs: Various devices support') install="${pkgname}.install" mksource=("${pkgname}-${pkgver}.tar.gz::https://github.com/$pkgname-player/${pkgname^}/archive/${pkgver}.tar.gz" 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" - 'udisks-namespace.patch') + "${pkgname}-gcc5.1.patch" + "${pkgname}-udisks-namespace.patch") mksha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf' '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b' 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') sha256sums=('c68275373b839b5b256b813b5bed85d501f94e12bef3dd8ed69e90094af3f769' + 'b03c190b881520c3233ed8f5804b518e9e699c6f773ab227f36133f422b786e1' 'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008') mksource() { @@ -66,7 +69,8 @@ mksource() { prepare() { cd ${pkgname^}-${pkgver} - patch -Np1 -i ../udisks-namespace.patch + patch -Np1 -i ../clementine-gcc5.1.patch + patch -Np1 -i ../clementine-udisks-namespace.patch } build() { diff --git a/libre/clementine/clementine-gcc5.1.patch b/libre/clementine/clementine-gcc5.1.patch new file mode 100644 index 000000000..4fff0f704 --- /dev/null +++ b/libre/clementine/clementine-gcc5.1.patch @@ -0,0 +1,23 @@ +diff -rupN Clementine-1.2.3.orig/src/CMakeLists.txt Clementine-1.2.3/src/CMakeLists.txt +--- Clementine-1.2.3.orig/src/CMakeLists.txt 2015-05-30 11:15:10.903093300 +0200 ++++ Clementine-1.2.3/src/CMakeLists.txt 2015-05-30 11:15:34.801955100 +0200 +@@ -1,6 +1,6 @@ + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs --std=c++0x -U__STRICT_ANSI__") + + option(BUILD_WERROR "Build with -Werror" ON) + +diff -rupN Clementine-1.2.3.orig/src/ui/mainwindow.cpp Clementine-1.2.3/src/ui/mainwindow.cpp +--- Clementine-1.2.3.orig/src/ui/mainwindow.cpp 2015-05-30 11:15:10.867894300 +0200 ++++ Clementine-1.2.3/src/ui/mainwindow.cpp 2015-05-30 11:15:54.578517000 +0200 +@@ -911,7 +911,7 @@ void MainWindow::ScrobblingEnabledChange + if (ui_->action_toggle_scrobbling->isVisible()) + SetToggleScrobblingIcon(value); + +- if (!app_->player()->GetState() == Engine::Idle) { ++ if (app_->player()->GetState() != Engine::Idle) { + return; + } + else { diff --git a/libre/clementine/udisks-namespace.patch b/libre/clementine/clementine-udisks-namespace.patch index e74889e78..e74889e78 100644 --- a/libre/clementine/udisks-namespace.patch +++ b/libre/clementine/clementine-udisks-namespace.patch |