[arch-commits] Commit in clementine/trunk (3 files)

[Maxime Gauduin]

    Date: Wednesday, April 20, 2016 @ 22:25:33
  Author: alucryd
Revision: 171456

upgpkg: clementine 1.3.1-1

Modified:
  clementine/trunk/PKGBUILD
Deleted:
  clementine/trunk/clementine-gcc5.1.patch
  clementine/trunk/clementine-udisks-namespace.patch

-----------------------------------+
 PKGBUILD                          |    4 +--
 clementine-gcc5.1.patch           |   23 ---------------------
 clementine-udisks-namespace.patch |   38 ------------------------------------
 3 files changed, 2 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-20 17:12:44 UTC (rev 171455)
+++ PKGBUILD	2016-04-20 20:25:33 UTC (rev 171456)
@@ -5,7 +5,7 @@
 # Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
 
 pkgname=clementine
-pkgver=1.3
+pkgver=1.3.1
 pkgrel=1
 pkgdesc='A modern music player and library organizer'
 url='http://www.clementine-player.org/'
@@ -24,7 +24,7 @@
             'gvfs: Various devices support')
 install='clementine.install'
 source=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz")
-sha256sums=('55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617')
+sha256sums=('f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c')
 
 prepare() {
   cd Clementine-${pkgver}

Deleted: clementine-gcc5.1.patch
===================================================================
--- clementine-gcc5.1.patch	2016-04-20 17:12:44 UTC (rev 171455)
+++ clementine-gcc5.1.patch	2016-04-20 20:25:33 UTC (rev 171456)
@@ -1,23 +0,0 @@
-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 {

Deleted: clementine-udisks-namespace.patch
===================================================================
--- clementine-udisks-namespace.patch	2016-04-20 17:12:44 UTC (rev 171455)
+++ clementine-udisks-namespace.patch	2016-04-20 20:25:33 UTC (rev 171456)
@@ -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