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

[Maxime Gauduin]

    Date: Monday, July 14, 2014 @ 15:48:50
  Author: alucryd
Revision: 115711

FS#41129: noise 0.3.0-2

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

---------------------------+
 PKGBUILD                  |    9 ++++++---
 mesa-demos-conflict.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-14 13:46:55 UTC (rev 115710)
+++ PKGBUILD	2014-07-14 13:48:50 UTC (rev 115711)
@@ -3,7 +3,7 @@
 
 pkgname=noise
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='The Pantheon Music Player'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/noise'
@@ -15,12 +15,15 @@
             'gst-plugins-bad: "Bad" plugin libraries'
             'gst-plugins-ugly: "Ugly" plugin libraries')
 install="${pkgname}.install"
-source=("https://launchpad.net/${pkgname}/${pkgver%.?}.x/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
-sha256sums=('56d9dc11e376f0727748e5f60ad35555626314ecead6d62139a56ab487fdf7cf')
+source=("https://launchpad.net/${pkgname}/${pkgver%.?}.x/${pkgver}/+download/${pkgname}-${pkgver}.tgz"
+        'mesa-demos-conflict.patch')
+sha256sums=('56d9dc11e376f0727748e5f60ad35555626314ecead6d62139a56ab487fdf7cf'
+            'df2c77d7da40126b8957e40924f8d07f8e722cfae27d7f59eb3fa307768a3620')
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
+  patch -Np1 -i ../mesa-demos-conflict.patch
   sed 's|${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR_UNPREFIXED}|${PLUGIN_DIR_UNPREFIXED}|' -i CMakeLists.txt
 }
 

Added: mesa-demos-conflict.patch
===================================================================
--- mesa-demos-conflict.patch	                        (rev 0)
+++ mesa-demos-conflict.patch	2014-07-14 13:48:50 UTC (rev 115711)
@@ -0,0 +1,24 @@
+diff -rupN noise-0.3.0.orig/data/noise.desktop noise-0.3.0/data/noise.desktop
+--- noise-0.3.0.orig/data/noise.desktop	2014-07-14 15:32:41.859039779 +0200
++++ noise-0.3.0/data/noise.desktop	2014-07-14 15:33:18.950708937 +0200
+@@ -3,7 +3,7 @@ Type=Application
+ Name=Noise
+ GenericName=Music Player
+ Comment=Listen to music
+-Exec=noise %U
++Exec=noise-player %U
+ Icon=multimedia-audio-player
+ Terminal=false
+ Categories=Audio;Music;Player;AudioVideo;GNOME;GTK;
+diff -rupN noise-0.3.0.orig/src/CMakeLists.txt noise-0.3.0/src/CMakeLists.txt
+--- noise-0.3.0.orig/src/CMakeLists.txt	2014-07-14 15:32:41.852369815 +0200
++++ noise-0.3.0/src/CMakeLists.txt	2014-07-14 15:38:21.230137167 +0200
+@@ -107,7 +107,7 @@ vala_precompile (CLIENT_VALA_C ${SRC_TAR
+   ${CLIENT_VAPI}
+ )
+ 
+-set (EXEC_NAME ../${SRC_TARGET})
++set (EXEC_NAME ../${SRC_TARGET}-player)
+ 
+ add_definitions (${DEPS_CFLAGS})
+ link_directories (${DEPS_LIBRARY_DIRS})