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

[Maxime Gauduin]

    Date: Tuesday, August 8, 2017 @ 21:51:31
  Author: alucryd
Revision: 249632

upgpkg: pantheon-music 0.4.1-1

Modified:
  pantheon-music/trunk/PKGBUILD
  pantheon-music/trunk/mesa-demos-conflict.patch

---------------------------+
 PKGBUILD                  |    4 ++--
 mesa-demos-conflict.patch |   31 ++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-08 21:39:28 UTC (rev 249631)
+++ PKGBUILD	2017-08-08 21:51:31 UTC (rev 249632)
@@ -26,7 +26,7 @@
         'mesa-demos-conflict.patch'
         'pantheon-music-install-dirs.patch')
 sha256sums=('cd7020b8ee3bb878ff1686a86a808b06ea51f08132152c3e27b10998e8b16f77'
-            '9135fe677b0d61778a624ba211b545eb861468b500cfd161469aa28139ab1296'
+            '205f26c7dd613036739517620da37fea0f2a9f9d74ea546d5bce2c0a859f2792'
             'd0ebc710a742d942e04a8df61d91dd75ae4b2aeafe7fece08f1fbc90c507f1df')
 
 prepare() {
@@ -49,7 +49,7 @@
     -DCMAKE_INSTALL_PREFIX='/usr' \
     -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
     -DGSETTINGS_COMPILE='OFF'
-  make
+  make -j1
 }
 
 package() {

Modified: mesa-demos-conflict.patch
===================================================================
--- mesa-demos-conflict.patch	2017-08-08 21:39:28 UTC (rev 249631)
+++ mesa-demos-conflict.patch	2017-08-08 21:51:31 UTC (rev 249632)
@@ -1,6 +1,18 @@
-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
+diff -rupN music-0.4.1.orig/data/org.pantheon.noise.appdata.xml.in music-0.4.1/data/org.pantheon.noise.appdata.xml.in
+--- music-0.4.1.orig/data/org.pantheon.noise.appdata.xml.in	2017-08-08 23:41:12.570798209 +0200
++++ music-0.4.1/data/org.pantheon.noise.appdata.xml.in	2017-08-08 23:42:54.621177616 +0200
+@@ -56,7 +56,7 @@
+         </release>
+     </releases>
+     <provides>
+-        <binary>noise</binary>
++        <binary>pantheon-music</binary>
+         <library>libnoise-core.so.0</library>
+     </provides>
+     <developer_name>elementary LLC.</developer_name>
+diff -rupN music-0.4.1.orig/data/org.pantheon.noise.desktop.in.in music-0.4.1/data/org.pantheon.noise.desktop.in.in
+--- music-0.4.1.orig/data/org.pantheon.noise.desktop.in.in	2017-08-08 23:41:12.570798209 +0200
++++ music-0.4.1/data/org.pantheon.noise.desktop.in.in	2017-08-08 23:43:25.620407132 +0200
 @@ -3,7 +3,7 @@ Type=Application
  _Name=@APP_NAME@
  _GenericName=Music Player
@@ -10,16 +22,9 @@
  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
-+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
+diff -rupN music-0.4.1.orig/src/CMakeLists.txt music-0.4.1/src/CMakeLists.txt
+--- music-0.4.1.orig/src/CMakeLists.txt	2017-08-08 23:41:12.580797885 +0200
++++ music-0.4.1/src/CMakeLists.txt	2017-08-08 23:45:06.061592605 +0200
 @@ -88,7 +88,7 @@ vala_precompile (CLIENT_VALA_C ${SRC_TAR
    ${CLIENT_VAPI}
  )