summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-biology/libgtextutils/files')
-rw-r--r--sci-biology/libgtextutils/files/libgtextutils-0.6.1-fix-build-system.patch61
-rw-r--r--sci-biology/libgtextutils/files/libgtextutils-0.6.1-gcc6.patch22
2 files changed, 83 insertions, 0 deletions
diff --git a/sci-biology/libgtextutils/files/libgtextutils-0.6.1-fix-build-system.patch b/sci-biology/libgtextutils/files/libgtextutils-0.6.1-fix-build-system.patch
new file mode 100644
index 00000000000..f7f608b792d
--- /dev/null
+++ b/sci-biology/libgtextutils/files/libgtextutils-0.6.1-fix-build-system.patch
@@ -0,0 +1,61 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,7 @@
+
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([dist-bzip2])
+
+ # dynamic library version
+@@ -25,12 +25,12 @@
+
+ AC_PROG_CC
+ AC_PROG_CXX
+-AC_PROG_LIBTOOL
++LT_INIT
+
+ dnl --enable-wall
+-EXTRA_CHECKS="-Wall -Wextra -Wformat-nonliteral -Wformat-security -Wswitch-default -Wswitch-enum -Wunused-parameter -Wfloat-equal -Werror"
++EXTRA_CHECKS="-Wall -Wextra -Wformat-nonliteral -Wformat-security -Wswitch-default -Wswitch-enum -Wunused-parameter -Wfloat-equal"
+ AC_ARG_ENABLE(wall,
+-[ --enable-wall Enable many common GCC warnings (-Wall,-Wextra, -Werror etc., default enabled)],
++[ --enable-wall Enable many common GCC warnings (-Wall,-Wextra etc., default enabled)],
+ [case "${enableval}" in
+ yes) wall=true ;;
+ no) wall=false ;;
+@@ -42,22 +42,6 @@
+ CXXFLAGS="${CXXFLAGS} ${EXTRA_CHECKS}"
+ fi
+
+-dnl --enable-debug
+-AC_ARG_ENABLE(debug,
+-[ --enable-debug Enable debug mode (default enabled)],
+-[case "${enableval}" in
+- yes) debug=true ;;
+- no) debug=false ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+-esac],[debug=true])
+-if test "$debug" = "true"
+-then
+- CFLAGS="${CFLAGS} -DDEBUG -g -O1"
+- CXXFLAGS="${CFLAGS} -DDEBUG -g -O1"
+-else
+- CFLAGS="${CFLAGS} -O3"
+- CXXFLAGS="${CFLAGS} -O3"
+-fi
+
+
+ dnl --enable-tuple-parser-check
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,7 +9,7 @@
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ EXTRA_DIST = reconf configure
+-SUBDIRS = m4 src doc tests
++SUBDIRS = src doc tests
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gtextutils.pc
diff --git a/sci-biology/libgtextutils/files/libgtextutils-0.6.1-gcc6.patch b/sci-biology/libgtextutils/files/libgtextutils-0.6.1-gcc6.patch
new file mode 100644
index 00000000000..490b4be9b91
--- /dev/null
+++ b/sci-biology/libgtextutils/files/libgtextutils-0.6.1-gcc6.patch
@@ -0,0 +1,22 @@
+From d8bb66d26288293ebde7f8d88979c13c208ffce5 Mon Sep 17 00:00:00 2001
+From: Assaf Gordon <assafgordon@gmail.com>
+Date: Mon, 14 Aug 2017 11:52:09 -0600
+Subject: [PATCH] text_line_reader: adjust to new compilers
+
+Fixes https://github.com/agordon/libgtextutils/issues/10 .
+---
+ src/gtextutils/text_line_reader.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gtextutils/text_line_reader.cpp b/src/gtextutils/text_line_reader.cpp
+index fede933..f0984d5 100644
+--- a/src/gtextutils/text_line_reader.cpp
++++ b/src/gtextutils/text_line_reader.cpp
+@@ -44,6 +44,6 @@ bool TextLineReader::next_line()
+ if (input_stream.eof())
+ return false;
+
+- return input_stream ;
++ return input_stream.good() ;
+ }
+