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

[Maxime Gauduin]

    Date: Sunday, September 2, 2018 @ 06:37:50
  Author: alucryd
Revision: 376017

protobuf 3.6.1 rebuild: clementine 1.3.1-19

Modified:
  clementine/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-02 06:20:46 UTC (rev 376016)
+++ PKGBUILD	2018-09-02 06:37:50 UTC (rev 376017)
@@ -6,7 +6,7 @@
 
 pkgname=clementine
 pkgver=1.3.1
-pkgrel=18
+pkgrel=19
 pkgdesc='A modern music player and library organizer'
 url='http://www.clementine-player.org/'
 license=('GPL')
@@ -15,7 +15,7 @@
          'gst-plugins-base-libs' 'gstreamer' 'libcdio' 'libechonest' 'libgl'
          'libgpod' 'liblastfm' 'libmtp' 'libpulse' 'libx11' 'protobuf' 'qjson'
          'qt4' 'sqlite' 'taglib' 'zlib')
-makedepends=('boost' 'cmake' 'mesa' 'sparsehash')
+makedepends=('boost' 'cmake' 'git' 'mesa' 'sparsehash')
 optdepends=('gst-plugins-base: "Base" plugin libraries'
             'gst-plugins-good: "Good" plugin libraries'
             'gst-plugins-bad: "Bad" plugin libraries'
@@ -22,13 +22,13 @@
             'gst-plugins-ugly: "Ugly" plugin libraries'
             'gst-libav: Libav plugin'
             'gvfs: Various devices support')
-source=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
+source=("git+https://github.com/clementine-player/Clementine.git#tag=${pkgver}"
         'clementine-gcc6.patch'
         'add-missing-functional-includes-5630.patch'
         'clementine-1.3.1-chromaprint-1.4.0.patch'
         'clementine-cryptopp6.patch'
         'https://github.com/clementine-player/Clementine/commit/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch')
-sha256sums=('f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c'
+sha256sums=('SKIP'
             '05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee'
             '213a1c2eb3f3c1d2904ed855ad851c10705d04cfa20b36b843b60003469fdc1a'
             '4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0'
@@ -36,8 +36,13 @@
             'd4dbd7f09da7a554f86237476b96e3ca097117b7ab2acd706088c72203d8b64f')
 
 prepare() {
-  cd Clementine-${pkgver}
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build
 
+  cd Clementine
+
   # Fix build with GCC 6
   patch -p1 -i ../clementine-gcc6.patch
   # https://github.com/clementine-player/Clementine/pull/5630
@@ -48,17 +53,12 @@
   patch -p1 -i ../clementine-cryptopp6.patch
   # FS#58413
   patch -Np1 -i ../75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch
-
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
 }
 
 build() {
-  cd Clementine-${pkgver}/build
+  cd build
 
-  cmake .. \
+  cmake ../Clementine \
     -DCMAKE_BUILD_TYPE='Release' \
     -DCMAKE_INSTALL_PREFIX='/usr'\
     -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-catch-value"
@@ -66,9 +66,7 @@
 }
 
 package() {
-  cd Clementine-${pkgver}/build
-
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" -C build install
 }
 
 # vim: ts=2 sw=2 et: