From 8934a8d81618fa1f545ac2259ace5067df614d0d Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Sat, 28 Jan 2023 03:08:04 +0200 Subject: [PATCH] media-sound/ladish: remove patches --- .../ladish-1-add-includes-for-getrlimit.patch | 25 ---- .../ladish/files/ladish-1-configure-libdir.patch | 23 --- .../ladish/files/ladish-1-disable-gladish.patch | 47 ------ media-sound/ladish/files/ladish-1-python3.patch | 160 --------------------- .../ladish/files/ladish-9999-disable-gladish.patch | 47 ------ .../ladish/files/ladish-configure-gladish.patch | 22 --- media-sound/ladish/ladish-1.9999.ebuild | 1 - media-sound/ladish/ladish-9999.ebuild | 1 - 8 files changed, 326 deletions(-) delete mode 100644 media-sound/ladish/files/ladish-1-add-includes-for-getrlimit.patch delete mode 100644 media-sound/ladish/files/ladish-1-configure-libdir.patch delete mode 100644 media-sound/ladish/files/ladish-1-disable-gladish.patch delete mode 100644 media-sound/ladish/files/ladish-1-python3.patch delete mode 100644 media-sound/ladish/files/ladish-9999-disable-gladish.patch delete mode 100644 media-sound/ladish/files/ladish-configure-gladish.patch diff --git a/media-sound/ladish/files/ladish-1-add-includes-for-getrlimit.patch b/media-sound/ladish/files/ladish-1-add-includes-for-getrlimit.patch deleted file mode 100644 index 28c596d..0000000 --- a/media-sound/ladish/files/ladish-1-add-includes-for-getrlimit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a2a17cd39220e2013d3402b06a53f5a46492aa00 Mon Sep 17 00:00:00 2001 -From: Nedko Arnaudov -Date: Sun, 7 Oct 2012 14:06:04 +0300 -Subject: [PATCH] add includes for getrlimit - ---- - daemon/loader.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/daemon/loader.c b/daemon/loader.c -index b9fe6f1c..37fb94fa 100644 ---- a/daemon/loader.c -+++ b/daemon/loader.c -@@ -34,6 +34,8 @@ - #include - #include /* forkpty() */ - #include -+#include -+#include - - #include "loader.h" - #include "../proxies/conf_proxy.h" --- -2.13.0 - diff --git a/media-sound/ladish/files/ladish-1-configure-libdir.patch b/media-sound/ladish/files/ladish-1-configure-libdir.patch deleted file mode 100644 index 3f94c55..0000000 --- a/media-sound/ladish/files/ladish-1-configure-libdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/wscript b/wscript -index 333522e9..a7594716 100644 ---- a/wscript -+++ b/wscript -@@ -54,6 +54,7 @@ def options(opt): - opt.add_option('--distname', type='string', default=None, help="Name for the distribution tarball") - opt.add_option('--distsuffix', type='string', default="", help="String to append to the distribution tarball name") - opt.add_option('--tagdist', action='store_true', default=False, help='Create of git tag for distname') -+ opt.add_option('--libdir', type='string', default=None, help='Define lib dir') - if parallel_debug: - opt.load('parallel_debug') - -@@ -132,7 +133,10 @@ def configure(conf): - else: - conf.env['DBUS_SERVICES_DIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'share', 'dbus-1', 'services') - -- conf.env['LIBDIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'lib') -+ if Options.options.libdir: -+ conf.env['LIBDIR'] = Options.options.libdir -+ else: -+ conf.env['LIBDIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'lib') - - conf.env['BUILD_DOXYGEN_DOCS'] = Options.options.doxygen diff --git a/media-sound/ladish/files/ladish-1-disable-gladish.patch b/media-sound/ladish/files/ladish-1-disable-gladish.patch deleted file mode 100644 index 16e4119..0000000 --- a/media-sound/ladish/files/ladish-1-disable-gladish.patch +++ /dev/null @@ -1,47 +0,0 @@ -From edbef85f6334e8dcffcaf3492e95bca8c4fe0f51 Mon Sep 17 00:00:00 2001 -From: Simon van der Veldt -Date: Sun, 28 Feb 2021 12:07:37 +0100 -Subject: [PATCH] Disable gladish - ---- - wscript | 17 +---------------- - 1 file changed, 1 insertion(+), 16 deletions(-) - -diff --git a/wscript b/wscript -index 5dedddf1..ff5a804c 100644 ---- a/wscript -+++ b/wscript -@@ -148,7 +148,7 @@ def configure(conf): - - conf.env['LIB_EXPAT'] = ['expat'] - -- build_gui = True -+ build_gui = False - - if build_gui and not conf.check_cfg( - package = 'glib-2.0', -@@ -594,21 +594,6 @@ def build(bld): - - bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0o0755) - -- # 'Desktop' file (menu entry, icon, etc) -- bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0o0644) -- -- # Icons -- icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256'] -- for icon_size in icon_sizes: -- bld.path.ant_glob('art/' + icon_size + '/apps/*.png') -- bld.install_files('${PREFIX}/share/icons/hicolor/' + icon_size + '/apps/', 'art/' + icon_size + '/apps/gladish.png') -- -- status_images = [] -- for status in ["down", "unloaded", "started", "stopped", "warning", "error"]: -- status_images.append("art/status_" + status + ".png") -- -- bld.install_files('${DATA_DIR}', status_images) -- bld.install_files('${DATA_DIR}', "art/ladish-logo-128x128.png") - bld.install_files('${DATA_DIR}', ["AUTHORS", "README", "NEWS"]) - bld.install_as('${DATA_DIR}/COPYING', "gpl2.txt") - --- -2.26.2 - diff --git a/media-sound/ladish/files/ladish-1-python3.patch b/media-sound/ladish/files/ladish-1-python3.patch deleted file mode 100644 index 7e01d2a..0000000 --- a/media-sound/ladish/files/ladish-1-python3.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 2a2c3a50dec5a39742e74804a9caba8fd9cf3c8a Mon Sep 17 00:00:00 2001 -From: Simon van der Veldt -Date: Sun, 28 Feb 2021 11:59:02 +0100 -Subject: [PATCH] Fix Python 3 compatibility - -Uses parts of the patch from the openSUSE package https://build.opensuse.org/package/show/multimedia:apps/ladish ---- - ladish_control | 2 +- - wscript | 49 ++++++++++++++++++++++++------------------------- - 2 files changed, 25 insertions(+), 26 deletions(-) - -diff --git a/ladish_control b/ladish_control -index 4303f70b..3f5f8a96 100755 ---- a/ladish_control -+++ b/ladish_control -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # - # LADI Session Handler (ladish) - # -diff --git a/wscript b/wscript -index 296a8522..5dedddf1 100644 ---- a/wscript -+++ b/wscript -@@ -1,13 +1,8 @@ - #! /usr/bin/env python - # encoding: utf-8 - --import os --import Options --import Utils --import shutil --import re --import waflib --from waflib.Scripting import Dist -+from __future__ import with_statement -+ - - parallel_debug = False - -@@ -20,19 +15,23 @@ RELEASE = True - top = '.' - out = 'build' - --from Logs import pprint -+import os, sys, re, io, optparse, shutil, tokenize -+from hashlib import md5 -+ -+from waflib import Errors, Utils, Options, Logs, Scripting -+from waflib import Configure - - def display_msg(conf, msg="", status = None, color = None): - if status: - conf.msg(msg, status, color) - else: -- pprint('NORMAL', msg) -+ Logs.pprint('NORMAL', msg) - - def display_raw_text(conf, text, color = 'NORMAL'): -- pprint(color, text, sep = '') -+ Logs.pprint(color, text, sep = '') - - def display_line(conf, text, color = 'NORMAL'): -- pprint(color, text, sep = os.linesep) -+ Logs.pprint(color, text, sep = os.linesep) - - def yesno(bool): - if bool: -@@ -216,10 +215,10 @@ def configure(conf): - #print "optimize force enable is required" - if not check_gcc_optimizations_enabled(conf.env['CFLAGS']): - if Options.options.debug: -- print "C optimization must be forced in order to enable -Wuninitialized" -- print "However this will not be made because debug compilation is enabled" -+ print ("C optimization must be forced in order to enable -Wuninitialized") -+ print ("However this will not be made because debug compilation is enabled") - else: -- print "C optimization forced in order to enable -Wuninitialized" -+ print ("C optimization forced in order to enable -Wuninitialized") - conf.env.append_unique('CFLAGS', "-O") - except: - pass -@@ -249,7 +248,7 @@ def configure(conf): - version_msg = APPNAME + "-" + VERSION - - if os.access('version.h', os.R_OK): -- data = file('version.h').read() -+ data = open('version.h').read() - m = re.match(r'^#define GIT_VERSION "([^"]*)"$', data) - if m != None: - version_msg += " exported from " + m.group(1) -@@ -295,11 +294,11 @@ def git_ver(self): - if os.access('./version.h', os.R_OK): - header = os.path.join(os.getcwd(), out, "version.h") - shutil.copy('./version.h', header) -- data = file(header).read() -+ data = open(header).read() - m = re.match(r'^#define GIT_VERSION "([^"]*)"$', data) - if m != None: - self.ver = m.group(1) -- pprint('BLUE', "tarball from git revision " + self.ver) -+ Logs.pprint('BLUE', "tarball from git revision " + self.ver) - else: - self.ver = "tarball" - return -@@ -309,7 +308,7 @@ def git_ver(self): - if bld.cmd_and_log("LANG= git diff-index --name-only HEAD", quiet=waflib.Context.BOTH).splitlines(): - self.ver += "-dirty" - -- pprint('BLUE', "git revision " + self.ver) -+ Logs.pprint('BLUE', "git revision " + self.ver) - else: - self.ver = "unknown" - -@@ -592,11 +591,11 @@ def build(bld): - - # GtkBuilder UI definitions (XML) - bld.install_files('${DATA_DIR}', 'gui/gladish.ui') -- -- bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755) -+ -+ bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0o0755) - - # 'Desktop' file (menu entry, icon, etc) -- bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0644) -+ bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0o0644) - - # Icons - icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256'] -@@ -617,14 +616,14 @@ def build(bld): - html_docs_source_dir = "build/default/html" - if bld.cmd == 'clean': - if os.access(html_docs_source_dir, os.R_OK): -- pprint('CYAN', "Removing doxygen generated documentation...") -+ Logs.pprint('CYAN', "Removing doxygen generated documentation...") - shutil.rmtree(html_docs_source_dir) -- pprint('CYAN', "Removing doxygen generated documentation done.") -+ Logs.pprint('CYAN', "Removing doxygen generated documentation done.") - elif bld.cmd == 'build': - if not os.access(html_docs_source_dir, os.R_OK): - os.popen("doxygen").read() - else: -- pprint('CYAN', "doxygen documentation already built.") -+ Logs.pprint('CYAN', "doxygen documentation already built.") - - bld(features='intltool_po', appname=APPNAME, podir='po', install_path="${LOCALE_DIR}") - -@@ -657,7 +656,7 @@ def etags(ctx): - os.system(cmd) - os.system("stat -c '%y' TAGS") - --class ladish_dist(waflib.Scripting.Dist): -+class ladish_dist(Scripting.Dist): - cmd = 'dist' - fun = 'dist' - --- -2.26.2 - diff --git a/media-sound/ladish/files/ladish-9999-disable-gladish.patch b/media-sound/ladish/files/ladish-9999-disable-gladish.patch deleted file mode 100644 index e308775..0000000 --- a/media-sound/ladish/files/ladish-9999-disable-gladish.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8e9214859af07e6c13827d79e4f12e21386dcbd2 Mon Sep 17 00:00:00 2001 -From: Simon van der Veldt -Date: Sat, 27 Feb 2021 13:28:40 +0100 -Subject: [PATCH] Disable gladish - ---- - wscript | 17 +---------------- - 1 file changed, 1 insertion(+), 16 deletions(-) - -diff --git a/wscript b/wscript -index 0ea49c44..bc3817e8 100644 ---- a/wscript -+++ b/wscript -@@ -161,7 +161,7 @@ def configure(conf): - - conf.env['LIB_EXPAT'] = ['expat'] - -- build_gui = True -+ build_gui = False - - if build_gui and not conf.check_cfg( - package = 'glib-2.0', -@@ -648,21 +648,6 @@ def build(bld): - - bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0o0755) - -- # 'Desktop' file (menu entry, icon, etc) -- bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0o0644) -- -- # Icons -- icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256'] -- for icon_size in icon_sizes: -- bld.path.ant_glob('art/' + icon_size + '/apps/*.png') -- bld.install_files('${PREFIX}/share/icons/hicolor/' + icon_size + '/apps/', 'art/' + icon_size + '/apps/gladish.png') -- -- status_images = [] -- for status in ["down", "unloaded", "started", "stopped", "warning", "error"]: -- status_images.append("art/status_" + status + ".png") -- -- bld.install_files('${DATA_DIR}', status_images) -- bld.install_files('${DATA_DIR}', "art/ladish-logo-128x128.png") - bld.install_files('${DOCDIR}', ["AUTHORS", "README", "NEWS"]) - bld.install_as('${DATA_DIR}/COPYING', "gpl2.txt") - --- -2.26.2 - diff --git a/media-sound/ladish/files/ladish-configure-gladish.patch b/media-sound/ladish/files/ladish-configure-gladish.patch deleted file mode 100644 index d2e9a37..0000000 --- a/media-sound/ladish/files/ladish-configure-gladish.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/wscript b/wscript -index a7594716..5f96cd30 100644 ---- a/wscript -+++ b/wscript -@@ -46,6 +46,7 @@ def options(opt): - opt.load('boost') - opt.load('python') - opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config') -+ opt.add_option('--enable-gladish', action='store_true', default=False, help='Build gladish') - opt.add_option('--enable-liblash', action='store_true', default=False, help='Build LASH compatibility library') - opt.add_option('--enable-pylash', action='store_true', default=False, help='Build python bindings for LASH compatibility library') - opt.add_option('--debug', action='store_true', default=False, dest='debug', help="Build debuggable binaries") -@@ -205,8 +206,7 @@ def configure(conf): - mandatory = False, - errmsg="not found, see http://boost.org/") - -- conf.env['BUILD_GLADISH'] = build_gui -- -+ conf.env['BUILD_GLADISH'] = Options.options.enable_gladish - conf.env['BUILD_LIBLASH'] = Options.options.enable_liblash - conf.env['BUILD_PYLASH'] = Options.options.enable_pylash - if conf.env['BUILD_PYLASH'] and not conf.env['BUILD_LIBLASH']: diff --git a/media-sound/ladish/ladish-1.9999.ebuild b/media-sound/ladish/ladish-1.9999.ebuild index abd1f28..2291e33 100644 --- a/media-sound/ladish/ladish-1.9999.ebuild +++ b/media-sound/ladish/ladish-1.9999.ebuild @@ -45,7 +45,6 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS README NEWS ) PATCHES=( - "${FILESDIR}/${PN}-configure-gladish.patch" ) src_prepare() diff --git a/media-sound/ladish/ladish-9999.ebuild b/media-sound/ladish/ladish-9999.ebuild index 144b4ed..498c7f1 100644 --- a/media-sound/ladish/ladish-9999.ebuild +++ b/media-sound/ladish/ladish-9999.ebuild @@ -44,7 +44,6 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS README NEWS ) PATCHES=( - "${FILESDIR}/${PN}-configure-gladish.patch" ) src_prepare() -- 2.11.4.GIT