[arch-commits] Commit in sonic-visualiser/trunk (PKGBUILD capnproto-version.patch)

[David Runge]

    Date: Thursday, December 7, 2017 @ 13:33:56
  Author: dvzrv
Revision: 273043

upgpkg: sonic-visualiser 3.0.3-2

Exchanging capnproto-version.patch with a proper recompile of the file in question.

Modified:
  sonic-visualiser/trunk/PKGBUILD
Deleted:
  sonic-visualiser/trunk/capnproto-version.patch

-------------------------+
 PKGBUILD                |    9 +++++----
 capnproto-version.patch |   11 -----------
 2 files changed, 5 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-07 13:12:15 UTC (rev 273042)
+++ PKGBUILD	2017-12-07 13:33:56 UTC (rev 273043)
@@ -5,7 +5,7 @@
 
 pkgname=sonic-visualiser
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A viewer and analyser of music audio files."
 arch=('x86_64')
 url="http://www.sonicvisualiser.org/"
@@ -14,14 +14,15 @@
 'liblrdf' 'libmad' 'liboggz' 'libpulse' 'portaudio' 'qt5-svg'
 'rubberband' 'sord' 'hicolor-icon-theme')
 source=("https://code.soundsoftware.ac.uk/attachments/download/2246/${pkgname}-${pkgver}.tar.gz"
-        "capnproto-version.patch")
+        "https://raw.githubusercontent.com/piper-audio/piper/02bafb5284eb20e4c8d96ac5fe5b697ed11f59a4/capnp/piper.capnp")
 sha512sums=('845cc92231f6c8eec24e4f583d1a736042ecfa73b7a7c401efb3d6e26050657851b1672043482ebc78dd19ded0e6aee6f930165e6410330eafaa08e0d4a50aa1'
-            '04ef2ddca1c503cb251e76aff035eb2f7b8b50b350671fe69bdf63e4dd36c53dcd9c7572d83597e9fbcc2a95523e1c804127714f8f2acd5db7a4f8afdaf7aa89')
+            '43d3f20d7849cf5fe69933e1c57ef56f3a1fadada5a0c73a01628ae62b14ef40c2ee7c907063eb08ad7a267c71420b4385fccf1bd7b0ed9cacd7907d1dcc9f4d')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
   # Fix capnproto use: https://sourceforge.net/p/sv1/bugs/239/
-  patch -Np0 -i "${srcdir}/capnproto-version.patch"
+  cp "${srcdir}/piper.capnp" piper-cpp/vamp-capnp/piper.capnp
+  capnp compile -oc++ piper-cpp/vamp-capnp/piper.capnp
   autoreconf -vi
 }
 

Deleted: capnproto-version.patch
===================================================================
--- capnproto-version.patch	2017-12-07 13:12:15 UTC (rev 273042)
+++ capnproto-version.patch	2017-12-07 13:33:56 UTC (rev 273043)
@@ -1,11 +0,0 @@
---- piper-cpp/vamp-capnp/piper.capnp.h	2017-05-25 10:26:10.000000000 +0200
-+++ piper-cpp/vamp-capnp/piper.capnp.h.new	2017-12-05 13:46:42.929667773 +0100
-@@ -6,7 +6,7 @@
- 
- #include <capnp/generated-header-support.h>
- 
--#if CAPNP_VERSION != 6000
-+#if CAPNP_VERSION < 6000
- #error "Version mismatch between generated code and library headers.  You must use the same version of the Cap'n Proto compiler and library."
- #endif
-