!28 fix: depends missing, close #I5P37B
From: @malacology Reviewed-by: @reganhe_xx Signed-off-by: @reganhe_xx
This commit is contained in:
parent
260c2732a4
commit
04fb4d2fdb
@ -1,40 +0,0 @@
|
|||||||
From e9e8dd148b9454abb5a7704d6f6249f7aa7aeded Mon Sep 17 00:00:00 2001
|
|
||||||
From: herengui <herengui@uniontech.com>
|
|
||||||
Date: Thu, 10 Mar 2022 18:14:43 +0800
|
|
||||||
Subject: [PATCH] Replace Curses mvprintw() with va_list-based equivalent
|
|
||||||
|
|
||||||
Instead of allocating a buffer for the formatted string and printing
|
|
||||||
it with mvprintw() -- which should have a "%s" format argument to guard
|
|
||||||
against '%' characters in the formatted string, hat tip Andreas Tille --,
|
|
||||||
use vw_printw() which takes a va_list so can do the formatting itself.
|
|
||||||
|
|
||||||
Signed-off-by: herengui <herengui@uniontech.com>
|
|
||||||
---
|
|
||||||
bam_tview_curses.c | 8 ++------
|
|
||||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/bam_tview_curses.c b/bam_tview_curses.c
|
|
||||||
index 11db0da..37fb033 100644
|
|
||||||
--- a/bam_tview_curses.c
|
|
||||||
+++ b/bam_tview_curses.c
|
|
||||||
@@ -78,15 +78,11 @@ static void curses_destroy(tview_t* base) {
|
|
||||||
*/
|
|
||||||
|
|
||||||
static void curses_mvprintw(struct AbstractTview* tv,int y ,int x,const char* fmt,...) {
|
|
||||||
- unsigned int size=tv->mcol+2;
|
|
||||||
- char* str=malloc(size);
|
|
||||||
- if(str==0) exit(EXIT_FAILURE);
|
|
||||||
va_list argptr;
|
|
||||||
va_start(argptr, fmt);
|
|
||||||
- vsnprintf(str,size, fmt, argptr);
|
|
||||||
+ if (wmove(stdscr, y, x) != ERR)
|
|
||||||
+ vw_printw(stdscr, fmt, argptr);
|
|
||||||
va_end(argptr);
|
|
||||||
- mvprintw(y,x,str);
|
|
||||||
- free(str);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void curses_mvaddch(struct AbstractTview* tv,int y,int x,int ch) {
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
samtools-1.17.tar.bz2
Normal file
BIN
samtools-1.17.tar.bz2
Normal file
Binary file not shown.
@ -1,13 +1,11 @@
|
|||||||
Name: samtools
|
Name: samtools
|
||||||
Version: 1.12
|
Version: 1.17
|
||||||
Release: 5
|
Release: 1
|
||||||
Summary: Tools (written in C using htslib) for manipulating next-generation sequencing data
|
Summary: Tools (written in C using htslib) for manipulating next-generation sequencing data
|
||||||
License: MIT and BSD
|
License: MIT and BSD
|
||||||
URL: http://www.htslib.org
|
URL: http://www.htslib.org
|
||||||
Source0: https://github.com/samtools/samtools/archive/%{name}-%{version}.tar.bz2
|
Source0: https://github.com/samtools/samtools/archive/%{name}-%{version}.tar.bz2
|
||||||
|
|
||||||
Patch0: Replace-Curses-mvprintw-with-va_list-based-equivalen.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc autoconf automake make zlib-devel htslib-devel ncurses-devel bzip2-devel xz-devel
|
BuildRequires: gcc autoconf automake make zlib-devel htslib-devel ncurses-devel bzip2-devel xz-devel
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -26,7 +24,7 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
Header files and libraries for compiling against %{name}
|
Header files and libraries for compiling against %{name}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoheader
|
autoheader
|
||||||
@ -38,14 +36,6 @@ autoconf -Wno-syntax
|
|||||||
%make_install
|
%make_install
|
||||||
install -d -m 0755 %{buildroot}%{_includedir}/bam
|
install -d -m 0755 %{buildroot}%{_includedir}/bam
|
||||||
install -p -m 0644 *.h %{buildroot}%{_includedir}/bam
|
install -p -m 0644 *.h %{buildroot}%{_includedir}/bam
|
||||||
install -D -p -m 0755 libbam.a %{buildroot}%{_libdir}/libbam.a
|
|
||||||
|
|
||||||
%pre
|
|
||||||
%preun
|
|
||||||
%post
|
|
||||||
%postun
|
|
||||||
|
|
||||||
%check
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
@ -56,9 +46,11 @@ install -D -p -m 0755 libbam.a %{buildroot}%{_libdir}/libbam.a
|
|||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_includedir}/bam
|
%{_includedir}/bam
|
||||||
%{_libdir}/libbam.a
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 25 2023 guoyizhang <kuoi@bioarchlinux.org> - 1.17-1
|
||||||
|
- update: 1.17
|
||||||
|
|
||||||
* Thu Mar 10 2022 herengui <herengui@uniontech.com> - 1.12-5
|
* Thu Mar 10 2022 herengui <herengui@uniontech.com> - 1.12-5
|
||||||
- fix build error
|
- fix build error
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user