Remove obsolete libxputty patch; fix lv2lint error

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

4 files changed, 17 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e2d945e48dc..b16ac2ae561d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xmonk.lv2-git
 	pkgdesc = A simple sound generator LV2 plugin to have some fun with (git version)
-	pkgver = 0.4.r56.3f69d90
+	pkgver = 0.4.r85.4443523
 	pkgrel = 1
 	url = https://github.com/brummer10/Xmonk.lv2
 	arch = x86_64
@@ -17,10 +17,10 @@ pkgbase = xmonk.lv2-git
 	conflicts = xmonk.lv2
 	conflicts = xmonk-lv2-git
 	source = Xmonk.lv2::git+https://github.com/brummer10/Xmonk.lv2.git
+	source = lv2ui.version
 	source = libxputty::git+https://github.com/brummer10/libxputty.git
-	source = libxputty-fix-asprintf.patch::https://github.com/brummer10/libxputty/commit/7eb70bf3f7bce0af9e1919d6c875cdb8efca734e.patch
 	sha256sums = SKIP
+	sha256sums = 5abe9dbb9f02b02b361f5e5393e52029cd2eae4fb4b45817ad51c8ab7a217a88
 	sha256sums = SKIP
-	sha256sums = 15fe7e3e2ec8efe62dc9bb4c0830eaf3ed0373cd39ebd755f2d9193710ebbf76
 
 pkgname = xmonk.lv2-git
diff --git a/.gitignore b/.gitignore
index 13b7f58470cc..7a875dfaf5f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 libxputty/
-libxputty-fix-*.patch
 pkg/
 src/
 Xmonk.lv2/
-xmonk-lv2-git-*.pkg.tar.*
-xmonk-lv2-git-*.src.tar.gz
+xmonk.lv2-git-*.pkg.tar.*
+xmonk.lv2-git-*.src.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 50ff6361afe8..e4bf30a627d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _name=Xmonk.lv2
 _pkgname=${_name,,}
 _plugin_uri="https://github.com/brummer10/$_name"
 pkgname=$_pkgname-git
-pkgver=0.4.r56.3f69d90
+pkgver=0.4.r85.4443523
 pkgrel=1
 pkgdesc='A simple sound generator LV2 plugin to have some fun with (git version)'
 arch=(x86_64)
@@ -16,11 +16,11 @@ groups=(pro-audio lv2-plugins)
 provides=($_pkgname ${_pkgname/./-}-git)
 conflicts=($_pkgname ${_pkgname/./-}-git)
 source=("$_name::git+https://github.com/brummer10/$_name.git"
-        'libxputty::git+https://github.com/brummer10/libxputty.git'
-        'libxputty-fix-asprintf.patch::https://github.com/brummer10/libxputty/commit/7eb70bf3f7bce0af9e1919d6c875cdb8efca734e.patch')
+        'lv2ui.version'
+        'libxputty::git+https://github.com/brummer10/libxputty.git')
 sha256sums=('SKIP'
-            'SKIP'
-            '15fe7e3e2ec8efe62dc9bb4c0830eaf3ed0373cd39ebd755f2d9193710ebbf76')
+            '5abe9dbb9f02b02b361f5e5393e52029cd2eae4fb4b45817ad51c8ab7a217a88'
+            'SKIP')
 
 
 pkgver() {
@@ -34,17 +34,17 @@ prepare() {
   git submodule init
   git submodule set-url libxputty "$srcdir"/libxputty
   git -c protocol.file.allow=always submodule update
-  cd libxputty
-  patch -p1 -N -r - -i "$srcdir"/libxputty-fix-asprintf.patch || true
 }
 
 build() {
   cd $_name
+  # make sure only needed symbols are export in UI shared lib
+  export GUI_LDFLAGS="-Wl,--version-script=$srcdir/lv2ui.version"
   make
 }
 
 check() {
-  lv2lint -M pack -I $_name/${_name/.lv2/}/$_name "$_plugin_uri"
+  lv2lint -M pack -I $_name/bin/$_name "$_plugin_uri"
 }
 
 package() {
diff --git a/lv2ui.version b/lv2ui.version
new file mode 100644
index 000000000000..95c55e1b79f4
--- /dev/null
+++ b/lv2ui.version
@@ -0,0 +1,4 @@
+LV2UIABI_1.0 {
+    global: *lv2ui_descriptor*;
+    local: *;
+};