[arch-commits] Commit in cantata/trunk (PKGBUILD cantata.install)

[Antonio Rojas]

    Date: Thursday, May 5, 2016 @ 13:07:14
  Author: arojas
Revision: 173827

Hooks

Modified:
  cantata/trunk/PKGBUILD
Deleted:
  cantata/trunk/cantata.install

-----------------+
 PKGBUILD        |   18 ++++++++++++------
 cantata.install |   12 ------------
 2 files changed, 12 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-05 10:23:55 UTC (rev 173826)
+++ PKGBUILD	2016-05-05 11:07:14 UTC (rev 173827)
@@ -7,17 +7,19 @@
 
 pkgname=cantata
 pkgver=2.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Qt5 client for the music player daemon (MPD)'
 arch=(i686 x86_64)
 url='https://code.google.com/p/cantata/'
 license=(GPL)
-depends=(qt5-svg libmtp libcddb libmusicbrainz5 mpg123 vlc taglib-extras cdparanoia media-player-info udisks2)
+depends=(qt5-svg libmtp libcddb libmusicbrainz5 mpg123 vlc taglib-extras cdparanoia media-player-info 
+         udisks2 hicolor-icon-theme)
 optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support')
 makedepends=(cmake qt5-tools ffmpeg)
-install=$pkgname.install
-source=("https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2")
-md5sums=('dc7a65145692c5b2cac4c2c8a7c767c5')
+source=("https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2"
+        cantata-cxxflags.patch::"https://github.com/CDrummond/cantata/commit/bf353b1c.patch")
+md5sums=('dc7a65145692c5b2cac4c2c8a7c767c5'
+         'df65c35e954a4ddb9891b958fe78a6fe')
 
 prepare() {
   mkdir -p build
@@ -24,6 +26,9 @@
 
 # Fix build against ffmpeg 3.0
   sed -e '/audioconvert.h/d' -i $pkgname-$pkgver/replaygain/ffmpeginput.cpp
+# Don't replace CXXFLAGS
+  cd $pkgname-$pkgver
+  patch -p1 -i ../cantata-cxxflags.patch
 }
 
 build() {
@@ -31,7 +36,8 @@
   cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_TOUCH_SUPPORT=ON
+    -DENABLE_TOUCH_SUPPORT=ON \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
   make
 }
 

Deleted: cantata.install
===================================================================
--- cantata.install	2016-05-05 10:23:55 UTC (rev 173826)
+++ cantata.install	2016-05-05 11:07:14 UTC (rev 173827)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}