clementine-1.3.1-18.parabola1: protobuf 3.6.0 rebuild

1 files changed, 20 insertions, 15 deletions

diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD
index ad3e4b5f2..14e5d5337 100644
--- a/libre/clementine/PKGBUILD
+++ b/libre/clementine/PKGBUILD
@@ -11,16 +11,16 @@
 pkgname=clementine
 _pkgname=$pkgname-libre
 pkgver=1.3.1
-pkgrel=13.parabola1
+pkgrel=18.parabola1
 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support'
-url="http://www.$pkgname-player.org/"
+url='http://www.clementine-player.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'armv7h')
 replaces=("$_pkgname")
 conflicts=("$_pkgname")
 depends=('chromaprint' 'crypto++' 'fftw' 'gcc-libs' 'glew' 'glib2' 'glibc'
          'gst-plugins-base-libs' 'gstreamer' 'libcdio' 'libechonest' 'libgl'
-         'libgpod' 'liblastfm' 'libmtp' 'libpulse' 'libx11' 'protobuf<3.6' 'qjson'
+         'libgpod' 'liblastfm' 'libmtp' 'libpulse' 'libx11' 'protobuf<3.7' 'qjson'
          'qt4' 'sqlite' 'taglib' 'zlib')
 makedepends=('boost' 'cmake' 'mesa' 'sparsehash')
 optdepends=('gst-plugins-base: "Base" plugin libraries'
@@ -29,23 +29,25 @@ optdepends=('gst-plugins-base: "Base" plugin libraries'
             'gst-plugins-ugly: "Ugly" plugin libraries'
             'gst-libav: Libav plugin'
             'gvfs: Various devices support')
-mksource=("${pkgname}-${pkgver}.tar.gz::https://github.com/$pkgname-player/${pkgname^}/archive/${pkgver}.tar.gz")
+mksource=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz")
 source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
-        clementine-gcc6.patch
-        add-missing-functional-includes-5630.patch
-        clementine-1.3.1-chromaprint-1.4.0.patch
-        remove-nonfree-artwork-and-spotify.patch
-        moognu.png)
+        'clementine-gcc6.patch'
+        'add-missing-functional-includes-5630.patch'
+        'clementine-1.3.1-chromaprint-1.4.0.patch'
+        'https://github.com/clementine-player/Clementine/commit/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch'
+        'remove-nonfree-artwork-and-spotify.patch'
+        'moognu.png')
 mksha256sums=('f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c')
 sha256sums=('9b84b3b867963da265308b150746aec0faaf5bcd79f78e3363a741edda7286ec'
             '05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee'
             '213a1c2eb3f3c1d2904ed855ad851c10705d04cfa20b36b843b60003469fdc1a'
             '4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0'
+            'd4dbd7f09da7a554f86237476b96e3ca097117b7ab2acd706088c72203d8b64f'
             'aecd13727a55a4556b70db73519a6ff4cecabefadedad9f952b5499aa5131711'
             'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
 
 mksource() {
-  cd ${pkgname^}-${pkgver}
+  cd Clementine-${pkgver}
 
   # remove nonfree artwork for the Nyan Cat plugin
   # https://labs.parabola.nu/issues/329
@@ -53,7 +55,7 @@ mksource() {
 }
 
 prepare() {
-  cd ${pkgname^}-${pkgver}
+  cd Clementine-${pkgver}
 
   # remove nonfree artwork and Spotify references
   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
@@ -82,8 +84,10 @@ prepare() {
   patch -p1 -i ../clementine-gcc6.patch
   # https://github.com/clementine-player/Clementine/pull/5630
   patch -p1 -i ../add-missing-functional-includes-5630.patch
-  # fix build with chromaprint 1.4.0
+  # Fix build with chromaprint 1.4.0
   patch -p1 -i ../clementine-1.3.1-chromaprint-1.4.0.patch
+  # FS#58413
+  patch -Np1 -i ../75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch
 
   if [[ -d build ]]; then
     rm -rf build
@@ -92,16 +96,17 @@ prepare() {
 }
 
 build() {
-  cd ${pkgname^}-${pkgver}/build
+  cd Clementine-${pkgver}/build
 
   cmake .. \
     -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr'
+    -DCMAKE_INSTALL_PREFIX='/usr'\
+    -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-catch-value"
   make
 }
 
 package() {
-  cd ${pkgname^}-${pkgver}/build
+  cd Clementine-${pkgver}/build
 
   make DESTDIR="${pkgdir}" install
 }