[arch-commits] Commit in noise-player/trunk (PKGBUILD mesa-demos-conflict.patch)

Fri Aug 12 11:22:43 UTC 2016

Date: Friday, August 12, 2016 @ 11:22:43
  Author: alucryd
Revision: 186602

upgpkg: noise-player 0.4-1

Modified:
  noise-player/trunk/PKGBUILD
  noise-player/trunk/mesa-demos-conflict.patch

---------------------------+
 PKGBUILD                  |   20 +++++-----
 mesa-demos-conflict.patch |   81 +++++++++++---------------------------------
 2 files changed, 32 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2016-08-12 11:10:34 UTC (rev 186601)
+++ PKGBUILD	2016-08-12 11:22:43 UTC (rev 186602)
@@ -2,28 +2,28 @@
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 
 pkgname=noise-player
-pkgver=0.3.1
-pkgrel=2
+pkgver=0.4
+pkgrel=1
 pkgdesc='The Pantheon Music Player'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/noise'
 license=('GPL3')
-depends=('cairo' 'desktop-file-utils' 'gdk-pixbuf2' 'glib2' 'glibc'
-         'gst-plugins-base-libs' 'gstreamer' 'gtk3' 'hicolor-icon-theme'
-         'libgee' 'libgpod' 'libnotify' 'libpeas' 'libsoup' 'libxml2' 'pango'
-         'sqlheavy' 'taglib' 'zeitgeist'
+depends=('cairo' 'gdk-pixbuf2' 'glib2' 'glibc' 'gst-plugins-base-libs'
+         'gstreamer' 'gtk3' 'json-glib' 'libaccounts-glib' 'libgda' 'libgee'
+         'libgpod' 'libgsignon-glib' 'libpeas' 'libsoup' 'pango' 'taglib'
+         'zeitgeist'
          'libgranite.so')
-makedepends=('cmake' 'gobject-introspection' 'vala')
+makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala')
 optdepends=('gst-plugins-base: "Base" plugin libraries'
             'gst-plugins-good: "Good" plugin libraries'
             'gst-plugins-bad: "Bad" plugin libraries'
             'gst-plugins-ugly: "Ugly" plugin libraries')
 replaces=('noise')
-source=("https://launchpad.net/noise/${pkgver%.*}.x/${pkgver}/+download/noise-${pkgver}.tgz"
+source=("https://launchpad.net/noise/0.4.x/${pkgver}/+download/noise-${pkgver}.tar.xz"
         'mesa-demos-conflict.patch'
         'noise-install-dirs.patch')
-sha256sums=('245c4659d0944be59b53ed24089ffe7ad77dbaf6d1834b871bc860bc646e0e1e'
-            'b3bec8516d9497ee961fcd607e96b7c17ed76eed3d7af4093827ff5e052d0dc0'
+sha256sums=('ae7b1f07df1f1e773c602cad224188ebc26799f1b759525b114edc698d044ab1'
+            '9135fe677b0d61778a624ba211b545eb861468b500cfd161469aa28139ab1296'
             'd0ebc710a742d942e04a8df61d91dd75ae4b2aeafe7fece08f1fbc90c507f1df')
 
 prepare() {

Modified: mesa-demos-conflict.patch
===================================================================
--- mesa-demos-conflict.patch	2016-08-12 11:10:34 UTC (rev 186601)
+++ mesa-demos-conflict.patch	2016-08-12 11:22:43 UTC (rev 186602)
@@ -1,68 +1,31 @@
-diff -rupN noise-0.3.1.orig/data/CMakeLists.txt noise-0.3.1/data/CMakeLists.txt
---- noise-0.3.1.orig/data/CMakeLists.txt	2015-08-30 13:02:13.782481101 +0200
-+++ noise-0.3.1/data/CMakeLists.txt	2015-08-30 13:04:05.279065874 +0200
-@@ -1 +1 @@
--install (FILES noise.desktop DESTINATION share/applications)
-+install (FILES noise-player.desktop DESTINATION share/applications)
-diff -rupN noise-0.3.1.orig/data/noise.desktop noise-0.3.1/data/noise.desktop
---- noise-0.3.1.orig/data/noise.desktop	2015-08-30 13:02:13.782481101 +0200
-+++ noise-0.3.1/data/noise.desktop	1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
--[Desktop Entry]
--Type=Application
--Name=Noise
--GenericName=Music Player
--Comment=Listen to music
+diff -rupN noise-0.4.orig/data/org.pantheon.noise.desktop.in.in noise-0.4/data/org.pantheon.noise.desktop.in.in
+--- noise-0.4.orig/data/org.pantheon.noise.desktop.in.in	2016-08-12 12:42:36.415710999 +0200
++++ noise-0.4/data/org.pantheon.noise.desktop.in.in	2016-08-12 12:46:39.418412632 +0200
+@@ -3,7 +3,7 @@ Type=Application
+ _Name=@APP_NAME@
+ _GenericName=Music Player
+ _Comment=Listen to music
 -Exec=noise %U
--Icon=multimedia-audio-player
--Terminal=false
--Categories=Audio;Music;Player;AudioVideo;GNOME;GTK;
--MimeType=x-content/audio-player;x-content/audio-cdda;application/ogg;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-ogg;audio/3gpp;audio/aac;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/flac;audio/midi;audio/mp2;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;
--StartupNotify=true
--X-GNOME-Gettext-Domain=noise
--X-GNOME-Keywords=Noise;Audio;Player;MP3;iPod;Play;Playlist;Media;CD;Phone;Songs;
--X-GNOME-UsesNotifications=true
--X-AppInstall-Keywords=Noise;Audio;Player;MP3;iPod;Play;Playlist;Media;CD;Phone;Songs;
--X-PulseAudio-Properties=media.role=music
--Actions=AboutDialog;
--
--[Desktop Action AboutDialog]
++Exec=pantheon-music %U
+ Icon=multimedia-audio-player
+ Terminal=false
+ Categories=Audio;Music;Player;AudioVideo;GNOME;GTK;
+@@ -15,5 +15,5 @@ X-PulseAudio-Properties=media.role=music
+ Actions=AboutDialog;
+ 
+ [Desktop Action AboutDialog]
 -Exec=noise --about
--Name=About Noise
-diff -rupN noise-0.3.1.orig/data/noise-player.desktop noise-0.3.1/data/noise-player.desktop
---- noise-0.3.1.orig/data/noise-player.desktop	1970-01-01 01:00:00.000000000 +0100
-+++ noise-0.3.1/data/noise-player.desktop	2015-08-30 13:03:47.112955459 +0200
-@@ -0,0 +1,21 @@
-+[Desktop Entry]
-+Type=Application
-+Name=Noise
-+GenericName=Music Player
-+Comment=Listen to music
-+Exec=noise-player %U
-+Icon=multimedia-audio-player
-+Terminal=false
-+Categories=Audio;Music;Player;AudioVideo;GNOME;GTK;
-+MimeType=x-content/audio-player;x-content/audio-cdda;application/ogg;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-ogg;audio/3gpp;audio/aac;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/flac;audio/midi;audio/mp2;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;
-+StartupNotify=true
-+X-GNOME-Gettext-Domain=noise
-+X-GNOME-Keywords=Noise;Audio;Player;MP3;iPod;Play;Playlist;Media;CD;Phone;Songs;
-+X-GNOME-UsesNotifications=true
-+X-AppInstall-Keywords=Noise;Audio;Player;MP3;iPod;Play;Playlist;Media;CD;Phone;Songs;
-+X-PulseAudio-Properties=media.role=music
-+Actions=AboutDialog;
-+
-+[Desktop Action AboutDialog]
-+Exec=noise-player --about
-+Name=About Noise
-diff -rupN noise-0.3.1.orig/src/CMakeLists.txt noise-0.3.1/src/CMakeLists.txt
---- noise-0.3.1.orig/src/CMakeLists.txt	2015-08-30 13:02:13.789147563 +0200
-+++ noise-0.3.1/src/CMakeLists.txt	2015-08-30 13:03:12.900669914 +0200
-@@ -93,7 +93,7 @@ vala_precompile (CLIENT_VALA_C ${SRC_TAR
++Exec=pantheon-music --about
+ _Name=About @APP_NAME@
+diff -rupN noise-0.4.orig/src/CMakeLists.txt noise-0.4/src/CMakeLists.txt
+--- noise-0.4.orig/src/CMakeLists.txt	2016-08-12 12:42:36.425710687 +0200
++++ noise-0.4/src/CMakeLists.txt	2016-08-12 12:45:25.250582352 +0200
+@@ -88,7 +88,7 @@ vala_precompile (CLIENT_VALA_C ${SRC_TAR
    ${CLIENT_VAPI}
  )
  
 -set (EXEC_NAME ${SRC_TARGET})
-+set (EXEC_NAME ${SRC_TARGET}-player)
++set (EXEC_NAME pantheon-music)
  
  add_definitions (${DEPS_CFLAGS})
  link_directories (${DEPS_LIBRARY_DIRS})

