* [PR PATCH] ladish: remove (python2)
@ 2023-09-28 9:14 classabbyamp
2023-09-28 9:22 ` classabbyamp
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: classabbyamp @ 2023-09-28 9:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 632 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages remove/ladish
https://github.com/void-linux/void-packages/pull/46307
ladish: remove (python2)
- ladish: remove
- cadence: remove ladish support
- calf: remove ladish support
- muse: remove ladish support
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly** (former dependents build without ladish)
A patch file from https://github.com/void-linux/void-packages/pull/46307.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove/ladish-46307.patch --]
[-- Type: text/x-diff, Size: 16474 bytes --]
From f16a737f6a71a22923a43db1d066fcf10f2f9578 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Sep 2023 17:15:03 -0400
Subject: [PATCH 1/4] 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 | 1 -
srcpkgs/ladish-devel | 1 -
srcpkgs/ladish/patches/aarch64.patch | 11 ---
srcpkgs/ladish/patches/musl-no-dlvsym.patch | 42 ----------
srcpkgs/ladish/patches/musl-no-execinfo.patch | 29 -------
srcpkgs/ladish/patches/musl-pid_t.patch | 21 -----
srcpkgs/ladish/patches/musl-stdout.patch | 83 -------------------
srcpkgs/ladish/patches/rlimit.patch | 14 ----
srcpkgs/ladish/template | 38 ---------
srcpkgs/ladish/update | 2 -
srcpkgs/removed-packages/template | 2 +
11 files changed, 2 insertions(+), 242 deletions(-)
delete mode 120000 srcpkgs/ladish-devel
delete mode 100644 srcpkgs/ladish/patches/aarch64.patch
delete mode 100644 srcpkgs/ladish/patches/musl-no-dlvsym.patch
delete mode 100644 srcpkgs/ladish/patches/musl-no-execinfo.patch
delete mode 100644 srcpkgs/ladish/patches/musl-pid_t.patch
delete mode 100644 srcpkgs/ladish/patches/musl-stdout.patch
delete mode 100644 srcpkgs/ladish/patches/rlimit.patch
delete mode 100644 srcpkgs/ladish/template
delete mode 100644 srcpkgs/ladish/update
diff --git a/common/shlibs b/common/shlibs
index 13a439c085896..44715d5bf0e8d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1108,7 +1108,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
diff --git a/srcpkgs/ladish-devel b/srcpkgs/ladish-devel
deleted file mode 120000
index b1d0d0e17f92e..0000000000000
--- a/srcpkgs/ladish-devel
+++ /dev/null
@@ -1 +0,0 @@
-ladish
\ No newline at end of file
diff --git a/srcpkgs/ladish/patches/aarch64.patch b/srcpkgs/ladish/patches/aarch64.patch
deleted file mode 100644
index 3385f41871ef0..0000000000000
--- a/srcpkgs/ladish/patches/aarch64.patch
+++ /dev/null
@@ -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
-
diff --git a/srcpkgs/ladish/patches/musl-no-dlvsym.patch b/srcpkgs/ladish/patches/musl-no-dlvsym.patch
deleted file mode 100644
index c63709f436189..0000000000000
--- a/srcpkgs/ladish/patches/musl-no-dlvsym.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/ladish/patches/musl-no-execinfo.patch b/srcpkgs/ladish/patches/musl-no-execinfo.patch
deleted file mode 100644
index 6711cf125c9e1..0000000000000
--- a/srcpkgs/ladish/patches/musl-no-execinfo.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/ladish/patches/musl-pid_t.patch b/srcpkgs/ladish/patches/musl-pid_t.patch
deleted file mode 100644
index 76a697b36fe08..0000000000000
--- a/srcpkgs/ladish/patches/musl-pid_t.patch
+++ /dev/null
@@ -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);
diff --git a/srcpkgs/ladish/patches/musl-stdout.patch b/srcpkgs/ladish/patches/musl-stdout.patch
deleted file mode 100644
index 6a881fc20a076..0000000000000
--- a/srcpkgs/ladish/patches/musl-stdout.patch
+++ /dev/null
@@ -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);
- }
- }
-
diff --git a/srcpkgs/ladish/patches/rlimit.patch b/srcpkgs/ladish/patches/rlimit.patch
deleted file mode 100644
index 58d244fdcfbe2..0000000000000
--- a/srcpkgs/ladish/patches/rlimit.patch
+++ /dev/null
@@ -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"
-
diff --git a/srcpkgs/ladish/template b/srcpkgs/ladish/template
deleted file mode 100644
index 8e460fe9c0d3c..0000000000000
--- a/srcpkgs/ladish/template
+++ /dev/null
@@ -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"
- }
-}
diff --git a/srcpkgs/ladish/update b/srcpkgs/ladish/update
deleted file mode 100644
index 67988e9447e8c..0000000000000
--- a/srcpkgs/ladish/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/LADI/ladish/releases"
-pattern="(${pkgname}-)?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3b75f61119780..93b6f40a5c62b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -281,6 +281,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
From 4db576ecd3c50189217ad225bb638965e17ec979 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Sep 2023 17:28:44 -0400
Subject: [PATCH 2/4] cadence: remove ladish support
---
srcpkgs/cadence/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cadence/template b/srcpkgs/cadence/template
index ec1b51ee641ca..bc4f6fd51d3e0 100644
--- a/srcpkgs/cadence/template
+++ b/srcpkgs/cadence/template
@@ -1,11 +1,11 @@
# Template file for 'cadence'
pkgname=cadence
version=0.9.2
-revision=3
+revision=4
build_style=gnu-makefile
pycompile_dirs="usr/share/cadence/src"
hostmakedepends="pkg-config qt5-host-tools python3-PyQt5-devel-tools"
-makedepends="jack-devel ladish-devel pulseaudio-devel qt5-devel"
+makedepends="jack-devel pulseaudio-devel qt5-devel"
depends="a2jmidid desktop-file-utils hicolor-icon-theme jack python3-PyQt5-dbus
python3-PyQt5-svg"
short_desc="Set of tools useful for audio production"
From c2b7f4fe414c4e35457e808a741e85a5b15ee5f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Sep 2023 17:28:48 -0400
Subject: [PATCH 3/4] calf: remove ladish support
---
srcpkgs/calf/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 09034c06a43cc..44e259e825db5 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,14 +1,13 @@
# Template file for 'calf'
pkgname=calf
version=0.90.3
-revision=3
+revision=4
build_style=gnu-configure
build_helper=qemu
configure_args="--enable-experimental"
hostmakedepends="automake libtool pkg-config"
makedepends="expat-devel dssi-devel jack-devel glib-devel gtk+-devel
- cairo-devel ladish-devel fftw-devel fluidsynth-devel
- ladspa-sdk lv2"
+ cairo-devel fftw-devel fluidsynth-devel ladspa-sdk lv2"
depends="ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme"
short_desc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host"
maintainer="Orphaned <orphan@voidlinux.org>"
From 75c6a1d70b196cb2acdc78541d11bbc5a16e6ba5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Sep 2023 17:28:53 -0400
Subject: [PATCH 4/4] muse: remove ladish support
---
srcpkgs/muse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muse/template b/srcpkgs/muse/template
index 3da24ecc4c7ba..216d4364ed679 100644
--- a/srcpkgs/muse/template
+++ b/srcpkgs/muse/template
@@ -1,7 +1,7 @@
# Template file for 'muse'
pkgname=muse
version=4.1.0
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
build_helper=qmake
@@ -9,7 +9,7 @@ configure_args="-DENABLE_RTAUDIO=OFF -DLIB_INSTALL_DIR=/usr/lib
$(vopt_bool alsa ENABLE_ALSA) $(vopt_bool python ENABLE_PYTHON)"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
makedepends="$(vopt_if alsa alsa-lib-devel) dssi-devel fluidsynth-devel
- jack-devel ladish-devel ladspa-sdk libinstpatch-devel liblo-devel liblrdf-devel libsamplerate-devel
+ jack-devel ladspa-sdk libinstpatch-devel liblo-devel liblrdf-devel libsamplerate-devel
libsndfile-devel lilv-devel lv2 rubberband-devel qt5-svg-devel qt5-tools-devel
$(vopt_if python python3-devel)"
depends="desktop-file-utils qt5-svg $(vopt_if python 'python3-six python3-Pyro4')"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: ladish: remove (python2)
2023-09-28 9:14 [PR PATCH] ladish: remove (python2) classabbyamp
@ 2023-09-28 9:22 ` classabbyamp
2023-10-06 13:37 ` sgn
2023-10-06 13:55 ` [PR PATCH] [Closed]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2023-09-28 9:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/46307#issuecomment-1738792144
Comment:
TODO: add flowcanvas to this (also python2, this is only revdep of it)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: ladish: remove (python2)
2023-09-28 9:14 [PR PATCH] ladish: remove (python2) classabbyamp
2023-09-28 9:22 ` classabbyamp
@ 2023-10-06 13:37 ` sgn
2023-10-06 13:55 ` [PR PATCH] [Closed]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2023-10-06 13:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/46307#issuecomment-1750696456
Comment:
+1 to remove flowcanvas, too.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: ladish: remove (python2)
2023-09-28 9:14 [PR PATCH] ladish: remove (python2) classabbyamp
2023-09-28 9:22 ` classabbyamp
2023-10-06 13:37 ` sgn
@ 2023-10-06 13:55 ` classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2023-10-06 13:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
There's a closed pull request on the void-packages repository
ladish: remove (python2)
https://github.com/void-linux/void-packages/pull/46307
Description:
- ladish: remove
- cadence: remove ladish support
- calf: remove ladish support
- muse: remove ladish support
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly** (former dependents build without ladish)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-06 13:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-28 9:14 [PR PATCH] ladish: remove (python2) classabbyamp
2023-09-28 9:22 ` classabbyamp
2023-10-06 13:37 ` sgn
2023-10-06 13:55 ` [PR PATCH] [Closed]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).