[arch-commits] Commit in clementine/trunk (4 files)
Maxime Gauduin
alucryd at archlinux.org
Sat May 30 09:33:56 UTC 2015
Date: Saturday, May 30, 2015 @ 11:33:56
Author: alucryd
Revision: 134345
gcc5.1: clementine 1.2.3-6
Added:
clementine/trunk/clementine-gcc5.1.patch
clementine/trunk/clementine-udisks-namespace.patch
Modified:
clementine/trunk/PKGBUILD
Deleted:
clementine/trunk/udisks-namespace.patch
-----------------------------------+
PKGBUILD | 10 ++++++---
clementine-gcc5.1.patch | 23 +++++++++++++++++++++
clementine-udisks-namespace.patch | 38 ++++++++++++++++++++++++++++++++++++
udisks-namespace.patch | 38 ------------------------------------
4 files changed, 68 insertions(+), 41 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-30 08:52:39 UTC (rev 134344)
+++ PKGBUILD 2015-05-30 09:33:56 UTC (rev 134345)
@@ -6,7 +6,7 @@
pkgname=clementine
pkgver=1.2.3
-pkgrel=5
+pkgrel=6
pkgdesc='A modern music player and library organizer'
url='http://www.clementine-player.org/'
license=('GPL')
@@ -18,17 +18,21 @@
'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='clementine.install'
source=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
- 'udisks-namespace.patch')
+ 'clementine-gcc5.1.patch'
+ 'clementine-udisks-namespace.patch')
sha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf'
+ 'b03c190b881520c3233ed8f5804b518e9e699c6f773ab227f36133f422b786e1'
'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008')
prepare() {
cd Clementine-${pkgver}
- patch -Np1 -i ../udisks-namespace.patch
+ patch -Np1 -i ../clementine-gcc5.1.patch
+ patch -Np1 -i ../clementine-udisks-namespace.patch
}
build() {
Added: clementine-gcc5.1.patch
===================================================================
--- clementine-gcc5.1.patch (rev 0)
+++ clementine-gcc5.1.patch 2015-05-30 09:33:56 UTC (rev 134345)
@@ -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 {
Property changes on: clementine/trunk/clementine-gcc5.1.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: clementine-udisks-namespace.patch
===================================================================
--- clementine-udisks-namespace.patch (rev 0)
+++ clementine-udisks-namespace.patch 2015-05-30 09:33:56 UTC (rev 134345)
@@ -0,0 +1,38 @@
+From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
+From: Chocobozzz <florian.chocobo at gmail.com>
+Date: Wed, 16 Jul 2014 15:57:25 +0200
+Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
+
+---
+ src/CMakeLists.txt | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 650fa74..775b0a5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
+ if(HAVE_DBUS)
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
+
+- # Hack to get it to generate interfaces without namespaces - required
+- # because otherwise org::freedesktop::UDisks and
+- # org::freedesktop::UDisks::Device conflict.
+- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
+-
+ # MPRIS DBUS interfaces
+ qt4_add_dbus_adaptor(SOURCES
+ dbus/org.freedesktop.MediaPlayer.player.xml
+@@ -964,6 +959,10 @@ if(HAVE_DBUS)
+
+ # DeviceKit DBUS interfaces
+ if(HAVE_DEVICEKIT)
++ set_source_files_properties(dbus/org.freedesktop.UDisks.xml
++ PROPERTIES NO_NAMESPACE dbus/udisks)
++ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
++ PROPERTIES NO_NAMESPACE dbus/udisksdevice)
+ qt4_add_dbus_interface(SOURCES
+ dbus/org.freedesktop.UDisks.xml
+ dbus/udisks)
+--
+2.0.3
Property changes on: clementine/trunk/clementine-udisks-namespace.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: udisks-namespace.patch
===================================================================
--- udisks-namespace.patch 2015-05-30 08:52:39 UTC (rev 134344)
+++ udisks-namespace.patch 2015-05-30 09:33:56 UTC (rev 134345)
@@ -1,38 +0,0 @@
-From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
-From: Chocobozzz <florian.chocobo at gmail.com>
-Date: Wed, 16 Jul 2014 15:57:25 +0200
-Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
-
----
- src/CMakeLists.txt | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 650fa74..775b0a5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
- if(HAVE_DBUS)
- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
-
-- # Hack to get it to generate interfaces without namespaces - required
-- # because otherwise org::freedesktop::UDisks and
-- # org::freedesktop::UDisks::Device conflict.
-- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
--
- # MPRIS DBUS interfaces
- qt4_add_dbus_adaptor(SOURCES
- dbus/org.freedesktop.MediaPlayer.player.xml
-@@ -964,6 +959,10 @@ if(HAVE_DBUS)
-
- # DeviceKit DBUS interfaces
- if(HAVE_DEVICEKIT)
-+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml
-+ PROPERTIES NO_NAMESPACE dbus/udisks)
-+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
-+ PROPERTIES NO_NAMESPACE dbus/udisksdevice)
- qt4_add_dbus_interface(SOURCES
- dbus/org.freedesktop.UDisks.xml
- dbus/udisks)
---
-2.0.3
More information about the arch-commits
mailing list