From 8009b39933d27c43cea5b19c1ab2ebd3ced933d3 Mon Sep 17 00:00:00 2001 From: Martin Oberzalek Date: Sun, 4 Apr 2021 21:31:38 +0200 Subject: app-admin/xstow: Bumped to version xstow-1.0.2 update to EAP7, fixes EPREFIX glitches Assigned Martin Oberzalek as proxy maintainer Signed-off-by: Martin Oberzalek Package-Manager: Portage-3.0.18, Repoman-3.0.3 Closes: https://github.com/gentoo/gentoo/pull/20255 Signed-off-by: Sam James --- app-admin/xstow/files/xstow-1.0.2-ncurses.patch | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 app-admin/xstow/files/xstow-1.0.2-ncurses.patch (limited to 'app-admin/xstow/files/xstow-1.0.2-ncurses.patch') diff --git a/app-admin/xstow/files/xstow-1.0.2-ncurses.patch b/app-admin/xstow/files/xstow-1.0.2-ncurses.patch new file mode 100644 index 000000000000..b7d29f287e7f --- /dev/null +++ b/app-admin/xstow/files/xstow-1.0.2-ncurses.patch @@ -0,0 +1,56 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -91,11 +91,12 @@ + AC_MSG_RESULT(disabled) + support_curses=0 + else ++ AC_MSG_RESULT(enabled) + support_curses=1 + fi + ], +- [ +- AC_MSG_RESULT(enabled) ++ []) ++if test $support_curses -eq 1; then + AC_CHECK_HEADER([curses.h], + [ + # test which libraray to use +@@ -146,7 +147,7 @@ + fi + + if test $support_curses -eq 1; then +- AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib") ++ AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib") + AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used]) + fi + +@@ -154,8 +155,7 @@ + [ + support_curses=0 + ]) +- ]) +- ++fi + + NO_STL_SSTREAM=0 + NO_STL_STRSTREAM=0 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -46,7 +46,7 @@ + backtrace.h \ + backtrace.cpp + +-xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC) ++xstow_LDADD= $(LDFLAGS_DYNAMIC) + + if ENABLE_MERGE + +@@ -63,7 +63,7 @@ + backtrace.h \ + backtrace.cpp + +-merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC) ++merge_info_LDADD= $(LDFLAGS_DYNAMIC) + + endif + -- cgit v1.2.3-65-gdbad