diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/patches/htslib-for-stringtie.patch | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/patches/htslib-for-stringtie.patch')
| -rw-r--r-- | gnu/packages/patches/htslib-for-stringtie.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/htslib-for-stringtie.patch b/gnu/packages/patches/htslib-for-stringtie.patch new file mode 100644 index 0000000000..3e6cd5bb63 --- /dev/null +++ b/gnu/packages/patches/htslib-for-stringtie.patch @@ -0,0 +1,26 @@ +These changes are commits d7e357946ead219b81cc1becbe0de8a99d96ca84 and +8ed0daa39bc662defa99507f926815431056543a in +https://github.com/samtools/htscodecs. The stringtie package expects these +changes to have been applied. + +diff -ru htslib-1.12/htscodecs/htscodecs/tokenise_name3.c stringtie-2.2.0/htslib/htscodecs/htscodecs/tokenise_name3.c +--- a/htscodecs/htscodecs/tokenise_name3.c 2021-02-22 13:07:06.000000000 +0100 ++++ b/htscodecs/htscodecs/tokenise_name3.c 2021-12-04 19:27:39.000000000 +0100 +@@ -211,7 +211,7 @@ + if (!ctx) return NULL; + ctx->max_names = max_names; + pthread_setspecific(tok_key, ctx); +- } else if (ctx->max_names < max_names) { ++ } else if (ctx->max_names < max_names+1) { + ctx = realloc(ctx, sizeof(*ctx) + ++max_names*sizeof(*ctx->lc)); + if (!ctx) return NULL; + ctx->max_names = max_names; +@@ -1058,6 +1058,8 @@ + tok = decode_token_type(ctx, ntok); + //fprintf(stderr, "Tok %d = %d\n", ntok, tok); + ++ ctx->lc[cnum].last_ntok = 0; ++ + switch (tok) { + case N_CHAR: + if (len+1 >= name_len) return -1;
\ No newline at end of file |