audio/jalv: Updated for version 1.4.6.

3 files changed, 26 insertions, 20 deletions

diff --git a/audio/jalv/jalv.SlackBuild b/audio/jalv/jalv.SlackBuild
index 565ac0bdca65..bc9055db18ee 100644
--- a/audio/jalv/jalv.SlackBuild
+++ b/audio/jalv/jalv.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=jalv
-VERSION=${VERSION:-1.4.4}
+VERSION=${VERSION:-1.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,7 +72,7 @@ strip $PKG/usr/bin/*
 gzip -9 $PKG/usr/man/man1/*.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/jalv/jalv.info b/audio/jalv/jalv.info
index 8062de6dc541..8c2532e5337f 100644
--- a/audio/jalv/jalv.info
+++ b/audio/jalv/jalv.info
@@ -1,8 +1,8 @@
 PRGNAM="jalv"
-VERSION="1.4.4"
+VERSION="1.4.6"
 HOMEPAGE="http://drobilla.net/software/jalv/"
-DOWNLOAD="http://download.drobilla.net/jalv-1.4.4.tar.bz2"
-MD5SUM="56aea296a43b2906cc930c1727b3835c"
+DOWNLOAD="http://download.drobilla.net/jalv-1.4.6.tar.bz2"
+MD5SUM="8c11c58c4b0e69fb6b21041bcac275f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit lilv suil"
diff --git a/audio/jalv/remove_experimental_uis.diff b/audio/jalv/remove_experimental_uis.diff
index 9b6ef597a8fe..78fb2f6693a3 100644
--- a/audio/jalv/remove_experimental_uis.diff
+++ b/audio/jalv/remove_experimental_uis.diff
@@ -1,6 +1,6 @@
-diff -Naur jalv-1.4.4/doc/jalv.gtkmm.1 jalv-1.4.4.patched/doc/jalv.gtkmm.1
---- jalv-1.4.4/doc/jalv.gtkmm.1	2012-04-19 18:12:54.000000000 -0400
-+++ jalv-1.4.4.patched/doc/jalv.gtkmm.1	1969-12-31 19:00:00.000000000 -0500
+diff -Naur jalv-1.4.6/doc/jalv.gtkmm.1 jalv-1.4.6.patched/doc/jalv.gtkmm.1
+--- jalv-1.4.6/doc/jalv.gtkmm.1	2012-04-19 18:12:54.000000000 -0400
++++ jalv-1.4.6.patched/doc/jalv.gtkmm.1	1969-12-31 19:00:00.000000000 -0500
 @@ -1,25 +0,0 @@
 -.TH JALV.GTKMM 1 "19 Apr 2012"
 -
@@ -27,9 +27,9 @@ diff -Naur jalv-1.4.4/doc/jalv.gtkmm.1 jalv-1.4.4.patched/doc/jalv.gtkmm.1
 -.PP
 -This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz>
 -and David Robillard <d@drobilla.net>
-diff -Naur jalv-1.4.4/doc/jalv.qt.1 jalv-1.4.4.patched/doc/jalv.qt.1
---- jalv-1.4.4/doc/jalv.qt.1	2012-04-19 18:12:43.000000000 -0400
-+++ jalv-1.4.4.patched/doc/jalv.qt.1	1969-12-31 19:00:00.000000000 -0500
+diff -Naur jalv-1.4.6/doc/jalv.qt.1 jalv-1.4.6.patched/doc/jalv.qt.1
+--- jalv-1.4.6/doc/jalv.qt.1	2012-04-19 18:12:43.000000000 -0400
++++ jalv-1.4.6.patched/doc/jalv.qt.1	1969-12-31 19:00:00.000000000 -0500
 @@ -1,25 +0,0 @@
 -.TH JALV.QT 1 "19 Apr 2012"
 -
@@ -56,10 +56,10 @@ diff -Naur jalv-1.4.4/doc/jalv.qt.1 jalv-1.4.4.patched/doc/jalv.qt.1
 -.PP
 -This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz>
 -and David Robillard <d@drobilla.net>
-diff -Naur jalv-1.4.4/wscript jalv-1.4.4.patched/wscript
---- jalv-1.4.4/wscript	2014-01-04 16:18:19.000000000 -0500
-+++ jalv-1.4.4.patched/wscript	2014-02-08 01:08:11.000000000 -0500
-@@ -45,12 +45,6 @@
+diff -Naur jalv-1.4.6/wscript jalv-1.4.6.patched/wscript
+--- jalv-1.4.6/wscript	2014-08-08 17:36:24.000000000 -0400
++++ jalv-1.4.6.patched/wscript	2016-10-16 13:55:52.873636638 -0400
+@@ -48,15 +48,6 @@
                        atleast_version='0.120.0', mandatory=True)
      autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2',
                        atleast_version='2.18.0', mandatory=False)
@@ -67,13 +67,16 @@ diff -Naur jalv-1.4.4/wscript jalv-1.4.4.patched/wscript
 -                      atleast_version='3.0.0', mandatory=False)
 -    autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM2',
 -                      atleast_version='2.20.0', mandatory=False)
--    autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4',
--                      atleast_version='4.0.0', mandatory=False)
+-    if not Options.options.no_qt:
+-        autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4',
+-                          atleast_version='4.0.0', mandatory=False)
+-        if conf.is_defined('HAVE_QT4'):
+-            conf.find_program('moc')
  
      conf.check(function_name='jack_port_type_get_buffer_size',
                 header_name='jack/jack.h',
-@@ -66,12 +60,6 @@
- 
+@@ -81,12 +72,6 @@
+                         conf.is_defined('HAVE_JACK_METADATA'))
      autowaf.display_msg(conf, "Gtk 2.0 support",
                          conf.is_defined('HAVE_GTK2'))
 -    autowaf.display_msg(conf, "Gtk 3.0 support",
@@ -85,7 +88,7 @@ diff -Naur jalv-1.4.4/wscript jalv-1.4.4.patched/wscript
      print('')
  
  def build(bld):
-@@ -98,36 +86,6 @@
+@@ -113,39 +98,6 @@
                    install_path = '${BINDIR}')
          autowaf.use_lib(bld, obj, libs + ' GTK2')
  
@@ -111,6 +114,9 @@ diff -Naur jalv-1.4.4/wscript jalv-1.4.4.patched/wscript
 -
 -    # Qt version
 -    if bld.is_defined('HAVE_QT4'):
+-        obj = bld(rule = '${MOC} ${SRC} > ${TGT}',
+-                  source = 'src/jalv_qt4.cpp',
+-                  target = 'jalv_qt4_meta.hpp')
 -        obj = bld(features     = 'c cxx cxxprogram',
 -                  source       = source + ' src/jalv_qt4.cpp',
 -                  target       = 'jalv.qt',