diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-05 15:09:11 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-05 15:09:11 +0000 |
| commit | b9f6cb57e9884e9a1505561d52ab59ed98a54eb0 (patch) | |
| tree | 6ef522a1b0dc14e49203428d72b06199941bbc13 /app-admin | |
| parent | app-admin/xstow: Capitalise DESCRIPTION, change 'default' usage (diff) | |
| download | gentoo-b9f6cb57e9884e9a1505561d52ab59ed98a54eb0.tar.gz gentoo-b9f6cb57e9884e9a1505561d52ab59ed98a54eb0.tar.bz2 gentoo-b9f6cb57e9884e9a1505561d52ab59ed98a54eb0.zip | |
app-admin/xstow: drop duplicate patch
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/xstow/files/xstow-1.0.2-ncurses.patch | 56 | ||||
| -rw-r--r-- | app-admin/xstow/xstow-1.0.2.ebuild | 2 |
2 files changed, 1 insertions, 57 deletions
diff --git a/app-admin/xstow/files/xstow-1.0.2-ncurses.patch b/app-admin/xstow/files/xstow-1.0.2-ncurses.patch deleted file mode 100644 index b7d29f287e7f..000000000000 --- a/app-admin/xstow/files/xstow-1.0.2-ncurses.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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 - diff --git a/app-admin/xstow/xstow-1.0.2.ebuild b/app-admin/xstow/xstow-1.0.2.ebuild index d041f7daf686..30abbbbc0dd2 100644 --- a/app-admin/xstow/xstow-1.0.2.ebuild +++ b/app-admin/xstow/xstow-1.0.2.ebuild @@ -18,7 +18,7 @@ DEPEND="ncurses? ( sys-libs/ncurses:0= )" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${P}-ncurses.patch + "${FILESDIR}"/${PN}-1.0.1-ncurses.patch ) src_prepare() { |