[arch-commits] Commit in clementine/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Sunday, April 28, 2019 @ 16:00:12
  Author: alucryd
Revision: 455086

switch to qt5 branch: clementine 1.3.1.r702.3b76fa627-1

Modified:
  clementine/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-28 15:33:36 UTC (rev 455085)
+++ PKGBUILD	2019-04-28 16:00:12 UTC (rev 455086)
@@ -4,8 +4,8 @@
 # Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
 
 pkgname=clementine
-pkgver=1.3.1
-pkgrel=22
+pkgver=1.3.1.r702.3b76fa627
+pkgrel=1
 pkgdesc='A modern music player and library organizer'
 url=https://www.clementine-player.org/
 license=(GPL)
@@ -19,18 +19,17 @@
   gst-plugins-base-libs
   gstreamer
   libcdio
-  libechonest
   libgl
   libgpod
-  liblastfm
+  liblastfm-qt5
   libmtp
+  libmygpo-qt5
   libpulse
   libx11
   protobuf
-  qjson
-  qt4
+  qt5-base
+  qt5-x11extras
   sqlite
-  taglib
   zlib
 )
 makedepends=(
@@ -38,6 +37,7 @@
   cmake
   git
   mesa
+  qt5-tools
   sparsehash
 )
 optdepends=(
@@ -49,18 +49,20 @@
   'gvfs: Various devices support'
 )
 source=(
-  git+https://github.com/clementine-player/Clementine.git#tag=${pkgver}
+  git+https://github.com/clementine-player/Clementine.git#commit=3b76fa62752f25b445ee2a71f02c0c9d7581735a
   clementine-gcc6.patch
-  clementine-chromaprint1.4.0.patch
-  clementine-cryptopp6.patch
 )
 sha256sums=(
   SKIP
   05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee
-  4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0
-  e9c09dca76ed8fae2ecb089571396c9293f546871fb2f27cc37010dd5cba9e46
 )
 
+pkgver() {
+  cd Clementine
+
+  git describe --tags | sed 's/-/.r/; s/-g/./'
+}
+
 prepare() {
   if [[ -d build ]]; then
     rm -rf build
@@ -73,10 +75,6 @@
   patch -p1 -i ../clementine-gcc6.patch
   # https://github.com/clementine-player/Clementine/pull/5630
   git cherry-pick -n 8a6cc8b5069265e1e92e22def985e22c5955e503
-  # Fix build with chromaprint 1.4.0
-  patch -p1 -i ../clementine-chromaprint1.4.0.patch
-  # Fix build with crypto++ 6.0.0 due to https://github.com/weidai11/cryptopp/issues/442
-  patch -p1 -i ../clementine-cryptopp6.patch
   # FS#58413
   git cherry-pick -n -m 1 75f9439843a0e9cdc26cd739d5e1dbd93bd974bc
   # Fix DI.FM
@@ -88,8 +86,7 @@
 
   cmake ../Clementine \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr\
-    -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-catch-value"
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }