some fixes

niXman · Dec 27, 2015 · b73bc3c · b73bc3c
1 parent b9a068c
commit b73bc3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/functions.sh b/library/functions.sh
@@ -502,7 +502,7 @@ function func_uncompress {
 					.zip) _unpack_cmd="unzip $SRCS_DIR/$_filename -d $_lib_name > $_log_name 2>&1" ;;
 					*) die " error. bad archive type: $_ext" ;;
 				esac
-				eval ${_unpack_cmd}
+				eval ${_unpack_cmd} || true
 				_result=$?
 				[[ $_result == 0 ]] && {
 					echo " done"

diff --git a/patches/ncurses/work_around_changed_output_of_GNU_cpp_5.x.patch b/patches/ncurses/work_around_changed_output_of_GNU_cpp_5.x.patch
@@ -8,7 +8,7 @@
 +# Work around "unexpected" output of GCC 5.1.0's cpp w.r.t. #line directives
 +# by simply suppressing them:
 +case `$1 -dumpversion 2>/dev/null` in
-+    5.[012].*)  # assume a "broken" one
++    5.[0123].*)  # assume a "broken" one
 +        preprocessor="$1 -P -DNCURSES_INTERNALS -I../include"
 +        ;;
 +    *)