ladish: remove

python 2

developer has updated it to support python 3, but does not intend on making
further releases:
```
<nedko> python3 migration is complete
<abby> any plans for a release soon?
<nedko> i don't plan for new tarball and advise distros to fetch from git
```

common/shlibs

@@ -1106,7 +1106,6 @@ libcdt.so.5 graphviz-libs-2.28.0_6
 libpathplan.so.4 graphviz-libs-2.28.0_6
 liblab_gamut.so.1 graphviz-libs-2.40.1_1
 libflowcanvas.so.5 flowcanvas-0.7.1_1
-liblash.so.1 ladish-1_1
 libmowgli-2.so.0 libmowgli-2.1.3_8
 libgts-0.7.so.5 gts-0.7.6_1
 libguess.so.1 libguess-1.1_1

srcpkgs/ladish-devel

@@ -1 +0,0 @@
-ladish

srcpkgs/ladish/patches/aarch64.patch

@@ -1,11 +0,0 @@
---- a/daemon/sigsegv.c	2017-10-21 17:29:14.166064983 +0200
-+++ b/daemon/sigsegv.c	2017-10-21 17:28:45.685063897 +0200
-@@ -61,7 +61,7 @@
- # define REGFORMAT "%x"
- #endif
- 
--#if defined(__arm__) || defined(__powerpc__) || defined (__ia64__) || defined (__alpha__) || defined (__FreeBSD_kernel__) || defined (__sh__)
-+#if defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined (__ia64__) || defined (__alpha__) || defined (__FreeBSD_kernel__) || defined (__sh__)
- # define DISABLE_STACKTRACE
- #endif
- 

srcpkgs/ladish/patches/musl-no-dlvsym.patch

@@ -1,42 +0,0 @@
---- a/alsapid/lib.c	2016-06-06 16:35:46.734195397 +0200
-+++ b/alsapid/lib.c	2016-06-06 16:35:54.209195783 +0200
-@@ -73,16 +73,29 @@
- //static int (* real_snd_seq_create_port)(snd_seq_t * handle, snd_seq_port_info_t * info);
- //static int (* real_snd_seq_create_simple_port)(snd_seq_t * seq, const char * name, unsigned int caps, unsigned int type);
- 
--#define CHECK_FUNC(func)                                                \
--  if (real_ ## func == NULL)                                            \
--  {                                                                     \
--    real_ ## func = dlvsym(RTLD_NEXT, #func, API_VERSION);              \
--    if (real_ ## func == NULL)                                          \
--    {                                                                   \
--      fprintf(stderr, "dlvsym(\""#func"\", \""API_VERSION"\") failed. %s\n", dlerror()); \
--      return -1;                                                        \
--    }                                                                   \
--  }
-+#if defined(__GLIBC__)
-+  #define CHECK_FUNC(func)                                                \
-+    if (real_ ## func == NULL)                                            \
-+    {                                                                     \
-+      real_ ## func = dlvsym(RTLD_NEXT, #func, API_VERSION);              \
-+      if (real_ ## func == NULL)                                          \
-+      {                                                                   \
-+        fprintf(stderr, "dlvsym(\""#func"\", \""API_VERSION"\") failed. %s\n", dlerror()); \
-+        return -1;                                                        \
-+      }                                                                   \
-+    }
-+#else
-+  #define CHECK_FUNC(func)                                                \
-+    if (real_ ## func == NULL)                                            \
-+    {                                                                     \
-+      real_ ## func = dlsym(RTLD_NEXT, #func);                            \
-+      if (real_ ## func == NULL)                                          \
-+      {                                                                   \
-+        fprintf(stderr, "dlsym(\""#func"\") failed. %s\n", dlerror());    \
-+        return -1;                                                        \
-+      }                                                                   \
-+    }
-+#endif
- 
- #if 0
- LADISH_PUBLIC

srcpkgs/ladish/patches/musl-no-execinfo.patch

@@ -1,29 +0,0 @@
---- a/daemon/sigsegv.c	2016-06-06 16:11:21.506119807 +0200
-+++ b/daemon/sigsegv.c	2016-06-06 16:11:26.667120074 +0200
-@@ -39,7 +39,9 @@
- #include <signal.h>
- #include <ucontext.h>
- #include <dlfcn.h>
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <errno.h>
- #ifndef NO_CPP_DEMANGLE
- //#include <cxxabi.h>
-@@ -154,13 +156,15 @@
-         ip = bp[1];
-         bp = (void**)bp[0];
-     }
--#else
-+#elif defined(__GLIBC__)
-     log_error("Stack trace (non-dedicated):");
-     sz = backtrace(bt, 20);
-     strings = backtrace_symbols(bt, sz);
- 
-     for(i = 0; i < sz; ++i)
-         log_error("%s", strings[i]);
-+#else
-+    log_error("Stack trace not available");
- #endif
-     log_error("End of stack trace");
- #endif

srcpkgs/ladish/patches/musl-pid_t.patch

@@ -1,21 +0,0 @@
---- a/proxies/graph_proxy.h	2016-06-06 16:05:42.186102302 +0200
-+++ b/proxies/graph_proxy.h	2016-06-06 16:06:09.741103724 +0200
-@@ -28,7 +28,7 @@
- #define GRAPH_PROXY_H__61D1ED56_E33B_4F50_B45B_F520979E8AA7__INCLUDED
- 
- #include "common.h"
--
-+#include <unistd.h> /* pid_t */
- typedef struct graph_proxy_tag { int unused; } * graph_proxy_handle;
- 
- #ifdef __cplusplus
---- a/alsapid/alsapid.h	2016-06-06 16:26:09.314165609 +0200
-+++ b/alsapid/alsapid.h	2016-06-06 16:26:23.903166361 +0200
-@@ -28,6 +28,7 @@
- #define ALSAPID_H__0A27F284_7538_4791_8023_0FBED929EAF3__INCLUDED
- 
- #include "../common.h"
-+#include <unistd.h> /* pid_t */
- 
- void alsapid_compose_src_link(int alsa_client_id, char * buffer);
- void alsapid_compose_dst_link(char * buffer);

srcpkgs/ladish/patches/musl-stdout.patch

@@ -1,83 +0,0 @@
---- a/daemon/loader.c	2016-06-06 16:42:34.970216458 +0200
-+++ b/daemon/loader.c	2016-06-06 16:42:42.293216836 +0200
-@@ -59,13 +59,13 @@
- 
-   bool terminal;
- 
--  int stdout;
-+  int stdout_fd;
-   char stdout_buffer[CLIENT_OUTPUT_BUFFER_SIZE];
-   char stdout_last_line[CLIENT_OUTPUT_BUFFER_SIZE];
-   unsigned int stdout_last_line_repeat_count;
-   char * stdout_buffer_ptr;
- 
--  int stderr;
-+  int stderr_fd;
-   char stderr_buffer[CLIENT_OUTPUT_BUFFER_SIZE];
-   char stderr_last_line[CLIENT_OUTPUT_BUFFER_SIZE];
-   unsigned int stderr_last_line_repeat_count;
-@@ -149,8 +149,8 @@
- 
-       if (!child_ptr->terminal)
-       {
--        close(child_ptr->stdout);
--        close(child_ptr->stderr);
-+        close(child_ptr->stdout_fd);
-+        close(child_ptr->stderr_fd);
-       }
- 
-       g_on_child_exit(child_ptr->pid);
-@@ -462,7 +462,7 @@
-       loader_read_child_output(
-         child_ptr->vgraph_name,
-         child_ptr->app_name,
--        child_ptr->stdout,
-+        child_ptr->stdout_fd,
-         false,
-         child_ptr->stdout_buffer,
-         &child_ptr->stdout_buffer_ptr,
-@@ -472,7 +472,7 @@
-       loader_read_child_output(
-         child_ptr->vgraph_name,
-         child_ptr->app_name,
--        child_ptr->stderr,
-+        child_ptr->stderr_fd,
-         true,
-         child_ptr->stderr_buffer,
-         &child_ptr->stderr_buffer_ptr,
-@@ -585,9 +585,9 @@
-     }
-     else
-     {
--      child_ptr->stderr = stderr_pipe[0];
-+      child_ptr->stderr_fd = stderr_pipe[0];
- 
--      if (fcntl(child_ptr->stderr, F_SETFL, O_NONBLOCK) == -1)
-+      if (fcntl(child_ptr->stderr_fd, F_SETFL, O_NONBLOCK) == -1)
-       {
-         log_error("Failed to set nonblocking mode on "
-                    "stderr reading end: %s",
-@@ -603,7 +603,7 @@
-   if (!run_in_terminal)
-   {
-     /* We need pty to disable libc buffering of stdout */
--    pid = forkpty(&child_ptr->stdout, NULL, NULL, NULL);
-+    pid = forkpty(&child_ptr->stdout_fd, NULL, NULL, NULL);
-   }
-   else
-   {
-@@ -650,12 +650,12 @@
-     /* In parent, close unused writing ends of pipe */
-     close(stderr_pipe[1]);
- 
--    if (fcntl(child_ptr->stdout, F_SETFL, O_NONBLOCK) == -1)
-+    if (fcntl(child_ptr->stdout_fd, F_SETFL, O_NONBLOCK) == -1)
-     {
-       log_error("Could not set noblocking mode on stdout "
-                  "- pty: %s", strerror(errno));
-       close(stderr_pipe[0]);
--      close(child_ptr->stdout);
-+      close(child_ptr->stdout_fd);
-     }
-   }
- 

srcpkgs/ladish/patches/rlimit.patch

@@ -1,14 +0,0 @@
-diff --git daemon/loader.c daemon/loader.c
-index 777d7cb..d7b8a21 100644
---- a/daemon/loader.c
-+++ b/daemon/loader.c
-@@ -34,6 +34,8 @@
- #include <fcntl.h>
- #include <pty.h>                /* forkpty() */
- #include <sys/wait.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- 
- #include "loader.h"
- #include "../proxies/conf_proxy.h"
-

srcpkgs/ladish/template

@@ -1,38 +0,0 @@
-# Template file for 'ladish'
-pkgname=ladish
-version=1
-revision=11
-build_style=waf
-hostmakedepends="perl intltool python pkg-config"
-makedepends="python-devel alsa-lib-devel jack-devel
- dbus-devel dbus-glib-devel libuuid-devel expat-devel
- flowcanvas-devel boost-devel libgnomecanvasmm-devel gtkmm2-devel"
-depends="jack a2jmidid hicolor-icon-theme"
-pycompile_module="lash.py"
-short_desc="Session management system for JACK applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://ladish.org"
-distfiles="${DEBIAN_SITE}/main/l/ladish/ladish_1+dfsg0.orig.tar.bz2"
-checksum=39b09d5a4c2f2d65d37374eb8b53f35039f2229d96ea6ddef7b1ce154403383a
-python_version=2
-
-CXXFLAGS=-std=c++11
-
-do_configure() {
-	if [ "$CROSS_BUILD" ];then
-		python2 waf configure --prefix=/usr --enable-liblash
-	else
-		python2 waf configure --prefix=/usr --enable-liblash --enable-pylash
-	fi
-}
-
-ladish-devel_package() {
-	depends="libuuid-devel ladish>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}

srcpkgs/ladish/update

@@ -1,2 +0,0 @@
-site="https://github.com/LADI/ladish/releases"
-pattern="(${pkgname}-)?\K[\d.]+(?=\.tar)"

srcpkgs/removed-packages/template

@@ -284,6 +284,8 @@ replaces="
  keepassx2<=2.0.3_2
  keepassx<=0.4.4_2
  key-mon<=1.17_5
+ ladish-devel<=1_11
+ ladish<=1_11
  laditools<=1.1.0_3
  libXevie<=1.0.3_8
  libXfontcache<=1.0.5_2