[arch-commits] Commit in clementine/repos (10 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Mon Dec 7 07:20:38 UTC 2015


    Date: Monday, December 7, 2015 @ 08:20:37
  Author: bpiotrowski
Revision: 149697

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  clementine/repos/community-staging-i686/
  clementine/repos/community-staging-i686/PKGBUILD
    (from rev 149696, clementine/trunk/PKGBUILD)
  clementine/repos/community-staging-i686/clementine-gcc5.1.patch
    (from rev 149696, clementine/trunk/clementine-gcc5.1.patch)
  clementine/repos/community-staging-i686/clementine-udisks-namespace.patch
    (from rev 149696, clementine/trunk/clementine-udisks-namespace.patch)
  clementine/repos/community-staging-i686/clementine.install
    (from rev 149696, clementine/trunk/clementine.install)
  clementine/repos/community-staging-x86_64/
  clementine/repos/community-staging-x86_64/PKGBUILD
    (from rev 149696, clementine/trunk/PKGBUILD)
  clementine/repos/community-staging-x86_64/clementine-gcc5.1.patch
    (from rev 149696, clementine/trunk/clementine-gcc5.1.patch)
  clementine/repos/community-staging-x86_64/clementine-udisks-namespace.patch
    (from rev 149696, clementine/trunk/clementine-udisks-namespace.patch)
  clementine/repos/community-staging-x86_64/clementine.install
    (from rev 149696, clementine/trunk/clementine.install)

------------------------------------------------------------+
 community-staging-i686/PKGBUILD                            |   58 +++++++++++
 community-staging-i686/clementine-gcc5.1.patch             |   23 ++++
 community-staging-i686/clementine-udisks-namespace.patch   |   38 +++++++
 community-staging-i686/clementine.install                  |   15 ++
 community-staging-x86_64/PKGBUILD                          |   58 +++++++++++
 community-staging-x86_64/clementine-gcc5.1.patch           |   23 ++++
 community-staging-x86_64/clementine-udisks-namespace.patch |   38 +++++++
 community-staging-x86_64/clementine.install                |   15 ++
 8 files changed, 268 insertions(+)

Copied: clementine/repos/community-staging-i686/PKGBUILD (from rev 149696, clementine/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2015-12-07 07:20:37 UTC (rev 149697)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: BlackEagle <ike.devolder at gmail.com>
+# Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
+
+pkgname=clementine
+pkgver=1.2.3
+pkgrel=8
+pkgdesc='A modern music player and library organizer'
+url='http://www.clementine-player.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod'
+         'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-qt4' 'taglib')
+makedepends=('cmake' 'boost' 'mesa' 'sparsehash')
+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='clementine.install'
+source=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
+        'clementine-gcc5.1.patch'
+        'clementine-udisks-namespace.patch')
+sha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf'
+            'b03c190b881520c3233ed8f5804b518e9e699c6f773ab227f36133f422b786e1'
+            'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008')
+
+prepare() {
+  cd Clementine-${pkgver}
+
+  patch -Np1 -i ../clementine-gcc5.1.patch
+  patch -Np1 -i ../clementine-udisks-namespace.patch
+}
+
+build() {
+  cd Clementine-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. \
+    -DCMAKE_BUILD_TYPE='Release' \
+    -DCMAKE_INSTALL_PREFIX='/usr'
+  make
+}
+
+package() {
+  cd Clementine-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:

Copied: clementine/repos/community-staging-i686/clementine-gcc5.1.patch (from rev 149696, clementine/trunk/clementine-gcc5.1.patch)
===================================================================
--- community-staging-i686/clementine-gcc5.1.patch	                        (rev 0)
+++ community-staging-i686/clementine-gcc5.1.patch	2015-12-07 07:20:37 UTC (rev 149697)
@@ -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 {

Copied: clementine/repos/community-staging-i686/clementine-udisks-namespace.patch (from rev 149696, clementine/trunk/clementine-udisks-namespace.patch)
===================================================================
--- community-staging-i686/clementine-udisks-namespace.patch	                        (rev 0)
+++ community-staging-i686/clementine-udisks-namespace.patch	2015-12-07 07:20:37 UTC (rev 149697)
@@ -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

Copied: clementine/repos/community-staging-i686/clementine.install (from rev 149696, clementine/trunk/clementine.install)
===================================================================
--- community-staging-i686/clementine.install	                        (rev 0)
+++ community-staging-i686/clementine.install	2015-12-07 07:20:37 UTC (rev 149697)
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+
+post_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:

Copied: clementine/repos/community-staging-x86_64/PKGBUILD (from rev 149696, clementine/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2015-12-07 07:20:37 UTC (rev 149697)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: BlackEagle <ike.devolder at gmail.com>
+# Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
+
+pkgname=clementine
+pkgver=1.2.3
+pkgrel=8
+pkgdesc='A modern music player and library organizer'
+url='http://www.clementine-player.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod'
+         'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-qt4' 'taglib')
+makedepends=('cmake' 'boost' 'mesa' 'sparsehash')
+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='clementine.install'
+source=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
+        'clementine-gcc5.1.patch'
+        'clementine-udisks-namespace.patch')
+sha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf'
+            'b03c190b881520c3233ed8f5804b518e9e699c6f773ab227f36133f422b786e1'
+            'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008')
+
+prepare() {
+  cd Clementine-${pkgver}
+
+  patch -Np1 -i ../clementine-gcc5.1.patch
+  patch -Np1 -i ../clementine-udisks-namespace.patch
+}
+
+build() {
+  cd Clementine-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. \
+    -DCMAKE_BUILD_TYPE='Release' \
+    -DCMAKE_INSTALL_PREFIX='/usr'
+  make
+}
+
+package() {
+  cd Clementine-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:

Copied: clementine/repos/community-staging-x86_64/clementine-gcc5.1.patch (from rev 149696, clementine/trunk/clementine-gcc5.1.patch)
===================================================================
--- community-staging-x86_64/clementine-gcc5.1.patch	                        (rev 0)
+++ community-staging-x86_64/clementine-gcc5.1.patch	2015-12-07 07:20:37 UTC (rev 149697)
@@ -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 {

Copied: clementine/repos/community-staging-x86_64/clementine-udisks-namespace.patch (from rev 149696, clementine/trunk/clementine-udisks-namespace.patch)
===================================================================
--- community-staging-x86_64/clementine-udisks-namespace.patch	                        (rev 0)
+++ community-staging-x86_64/clementine-udisks-namespace.patch	2015-12-07 07:20:37 UTC (rev 149697)
@@ -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

Copied: clementine/repos/community-staging-x86_64/clementine.install (from rev 149696, clementine/trunk/clementine.install)
===================================================================
--- community-staging-x86_64/clementine.install	                        (rev 0)
+++ community-staging-x86_64/clementine.install	2015-12-07 07:20:37 UTC (rev 149697)
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+
+post_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:



More information about the arch-commits mailing list