From 78faf1823016e665fb44e7ea8f881d04ddd8720a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 11:29:31 +0700 Subject: [PATCH] ladish: normalise patches --- srcpkgs/ladish/patches/aarch64.patch | 4 ++-- srcpkgs/ladish/patches/musl-no-dlvsym.patch | 4 ++-- srcpkgs/ladish/patches/musl-no-execinfo.patch | 4 ++-- srcpkgs/ladish/patches/musl-pid_t.patch | 8 ++++---- srcpkgs/ladish/patches/musl-stdout.patch | 4 ++-- srcpkgs/ladish/patches/rlimit.patch | 4 ++-- srcpkgs/ladish/template | 1 + 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/srcpkgs/ladish/patches/aarch64.patch b/srcpkgs/ladish/patches/aarch64.patch index 99d321406ae..3385f41871e 100644 --- a/srcpkgs/ladish/patches/aarch64.patch +++ b/srcpkgs/ladish/patches/aarch64.patch @@ -1,5 +1,5 @@ ---- sigsegv.c 2017-10-21 17:29:14.166064983 +0200 -+++ daemon/sigsegv.c 2017-10-21 17:28:45.685063897 +0200 +--- 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 diff --git a/srcpkgs/ladish/patches/musl-no-dlvsym.patch b/srcpkgs/ladish/patches/musl-no-dlvsym.patch index 966d62679b7..c63709f4361 100644 --- a/srcpkgs/ladish/patches/musl-no-dlvsym.patch +++ b/srcpkgs/ladish/patches/musl-no-dlvsym.patch @@ -1,5 +1,5 @@ ---- alsapid/lib.c.orig 2016-06-06 16:35:46.734195397 +0200 -+++ alsapid/lib.c 2016-06-06 16:35:54.209195783 +0200 +--- 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); diff --git a/srcpkgs/ladish/patches/musl-no-execinfo.patch b/srcpkgs/ladish/patches/musl-no-execinfo.patch index 15e2e6d022b..6711cf125c9 100644 --- a/srcpkgs/ladish/patches/musl-no-execinfo.patch +++ b/srcpkgs/ladish/patches/musl-no-execinfo.patch @@ -1,5 +1,5 @@ ---- daemon/sigsegv.c.orig 2016-06-06 16:11:21.506119807 +0200 -+++ daemon/sigsegv.c 2016-06-06 16:11:26.667120074 +0200 +--- 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 #include diff --git a/srcpkgs/ladish/patches/musl-pid_t.patch b/srcpkgs/ladish/patches/musl-pid_t.patch index 8dbc596f9bd..76a697b36fe 100644 --- a/srcpkgs/ladish/patches/musl-pid_t.patch +++ b/srcpkgs/ladish/patches/musl-pid_t.patch @@ -1,5 +1,5 @@ ---- proxies/graph_proxy.h.orig 2016-06-06 16:05:42.186102302 +0200 -+++ proxies/graph_proxy.h 2016-06-06 16:06:09.741103724 +0200 +--- 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 @@ -9,8 +9,8 @@ typedef struct graph_proxy_tag { int unused; } * graph_proxy_handle; #ifdef __cplusplus ---- alsapid/alsapid.h.orig 2016-06-06 16:26:09.314165609 +0200 -+++ alsapid/alsapid.h 2016-06-06 16:26:23.903166361 +0200 +--- 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 diff --git a/srcpkgs/ladish/patches/musl-stdout.patch b/srcpkgs/ladish/patches/musl-stdout.patch index b5829993a6f..6a881fc20a0 100644 --- a/srcpkgs/ladish/patches/musl-stdout.patch +++ b/srcpkgs/ladish/patches/musl-stdout.patch @@ -1,5 +1,5 @@ ---- daemon/loader.c.orig 2016-06-06 16:42:34.970216458 +0200 -+++ daemon/loader.c 2016-06-06 16:42:42.293216836 +0200 +--- 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; diff --git a/srcpkgs/ladish/patches/rlimit.patch b/srcpkgs/ladish/patches/rlimit.patch index 7614980b039..58d244fdcfb 100644 --- a/srcpkgs/ladish/patches/rlimit.patch +++ b/srcpkgs/ladish/patches/rlimit.patch @@ -1,7 +1,7 @@ diff --git daemon/loader.c daemon/loader.c index 777d7cb..d7b8a21 100644 ---- daemon/loader.c -+++ daemon/loader.c +--- a/daemon/loader.c ++++ b/daemon/loader.c @@ -34,6 +34,8 @@ #include #include /* forkpty() */ diff --git a/srcpkgs/ladish/template b/srcpkgs/ladish/template index f0b36f188b2..b9e2ac3bc80 100644 --- a/srcpkgs/ladish/template +++ b/srcpkgs/ladish/template @@ -17,6 +17,7 @@ homepage="http://ladish.org" distfiles="${DEBIAN_SITE}/main/l/ladish/ladish_1+dfsg0.orig.tar.bz2" checksum=39b09d5a4c2f2d65d37374eb8b53f35039f2229d96ea6ddef7b1ce154403383a python_version=2 +patch_args=-Np1 CXXFLAGS=-std=c++11