From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/files/, app-admin/xstow/
Date: Mon, 5 Apr 2021 15:09:23 +0000 (UTC) [thread overview]
Message-ID: <1617635351.b9f6cb57e9884e9a1505561d52ab59ed98a54eb0.sam@gentoo> (raw)
commit: b9f6cb57e9884e9a1505561d52ab59ed98a54eb0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 5 15:09:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 15:09:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f6cb57
app-admin/xstow: drop duplicate patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/xstow/files/xstow-1.0.2-ncurses.patch | 56 -------------------------
app-admin/xstow/xstow-1.0.2.ebuild | 2 +-
2 files changed, 1 insertion(+), 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 b7d29f287e7..00000000000
--- 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 d041f7daf68..30abbbbc0dd 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() {
next reply other threads:[~2021-04-05 15:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-05 15:09 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-27 8:18 [gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/files/, app-admin/xstow/ Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1617635351.b9f6cb57e9884e9a1505561d52ab59ed98a54eb0.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox