* [gentoo-commits] repo/gentoo:master commit in: net-p2p/ncdc/, net-p2p/ncdc/files/
@ 2021-01-07 11:33 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-01-07 11:33 UTC (permalink / raw
To: gentoo-commits
commit: 63ba5a24824757a21e46b4a3069a87982e34c850
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 11:21:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 11:33:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ba5a24
net-p2p/ncdc: cleanup old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/ncdc/Manifest | 1 -
net-p2p/ncdc/files/ncdc-1.21-tinfo.patch | 53 ----------------------------
net-p2p/ncdc/ncdc-1.21.ebuild | 60 --------------------------------
3 files changed, 114 deletions(-)
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 6d3f20791f1..e3553ce0116 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,2 +1 @@
-DIST ncdc-1.21.tar.gz 370452 BLAKE2B 55ee9943a7adec4c60d17a8782ed9b2337796c0875c3c316e4f1627015520c5b8b23673b183a0f1d7e4c7a367eac5d908fb30e6b2d08caa324d19caf93efc7a4 SHA512 de182e190e3fb26451aad403975ec232b14ce908633cb2d9713582e2af8555fb55e2ea7de160b5b7faa05558f25dac0700dabbf5b7d1acd1aaa26d1bfe033c0c
DIST ncdc-1.22.1.tar.gz 371572 BLAKE2B 22125062a42f77e8a7a8afc699523b27a2b7ec566891676ca13b415e93cdae8e2d8d38f303070c7f098408f537266404a875b9ed7f9931a39933916a0ba576ab SHA512 b084ee28a799705009600c450016719ebb992cb0bf7e026513f4cd7e93b2566e7bf8e352eec92f3d69612ce06c930587759d7f7d20d14ee9fe1d5c4b8c4393af
diff --git a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
deleted file mode 100644
index 0e5acac59d5..00000000000
--- a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 16466392884a623fd93907f4d1071211e8ba48a4 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 8 Apr 2019 13:58:42 +0200
-Subject: [PATCH] Fix build against ncurses with separate libtinfo
-
-by using PKG_CHECK_MODULES instead of AC_CHECK_LIB
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 20 +++++---------------
- 1 file changed, 5 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c774316..d0c0430 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,12 +30,6 @@ AM_CONDITIONAL([HAVE_MH], [test "x$have_mh" = "xyes"])
- # Check for header files.
- AC_CHECK_HEADERS([zlib.h bzlib.h],[], AC_MSG_ERROR([Required header file not found]))
-
--have_nch=no
--AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h],[have_nch=yes])
--if test "x$have_nch" = "xno"; then
-- AC_MSG_ERROR([Could not find a header files for ncurses.])
--fi
--
-
- # Check for posix_fadvise()
- AC_CHECK_FUNCS([posix_fadvise])
-@@ -95,15 +89,11 @@ esac
-
-
- # Check for ncurses
--AC_CHECK_LIB([ncursesw], [get_wch], [
-- AC_SUBST([NCURSES_LIBS],[-lncursesw])
-- ], [
-- AC_CHECK_LIB([ncurses],
-- [get_wch],
-- [AC_SUBST([NCURSES_LIBS],[-lncurses])],
-- [AC_MSG_ERROR(ncursesw library is required)])
-- ]
--)
-+PKG_CHECK_MODULES(NCURSES, ncursesw,,[
-+ PKG_CHECK_MODULES(NCURSES, ncurses,,[
-+ AC_MSG_ERROR(ncurses library is required)
-+ ])
-+])
-
- # Check for zlib
- AC_CHECK_LIB([z],
---
-2.21.0
-
diff --git a/net-p2p/ncdc/ncdc-1.21.ebuild b/net-p2p/ncdc/ncdc-1.21.ebuild
deleted file mode 100644
index 33a396fa7dc..00000000000
--- a/net-p2p/ncdc/ncdc-1.21.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="https://dev.yorhel.nl/ncdc"
-if [[ "${PV}" == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
-else
- SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
- KEYWORDS="amd64 ~ppc ~sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="geoip"
-
-RDEPEND="
- app-arch/bzip2
- dev-db/sqlite:3
- dev-libs/glib:2
- net-libs/gnutls:=
- sys-libs/ncurses:0=[unicode]
- sys-libs/zlib:=
- geoip? (
- dev-libs/geoip
- dev-libs/libmaxminddb
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/makeheaders
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.21-tinfo.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with geoip)
- )
- if [[ "${PV}" == *9999 ]] ; then
- myeconfargs+=( --enable-git-version )
- fi
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/ncdc/, net-p2p/ncdc/files/
@ 2024-11-23 16:12 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-11-23 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 947c79bd8d17d79bf4e6a0ed5785cd037308fc04
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Fri Nov 15 13:46:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 16:11:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947c79bd
net-p2p/ncdc: drop 1.24-r1
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/38817
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/ncdc/Manifest | 2 -
.../files/ncdc-1.24-fix-clang16-c99-errors.patch | 72 ----------------------
net-p2p/ncdc/ncdc-1.24-r1.ebuild | 54 ----------------
3 files changed, 128 deletions(-)
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 8b0034b8ed6f..2a711e57eaa5 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,4 +1,2 @@
DIST ncdc-1.24.1.tar.gz 377704 BLAKE2B a9b72f9721c875d063482ede52836b30c125567e673024921d75c32c0b29a8697237cd0c95afa0671ba14b036b9857e0003990958e82d5d4e9d855fc92df274f SHA512 5b77badc3c2f0db546526fe02827bc1b907f07e2a7c095e6019ff68b08e303ec5c4b1e1a53d395ebd12f15a66c0b7892ec13ab370f5af67ca3df2b2cabcd16ec
DIST ncdc-1.24.1.tar.gz.asc 833 BLAKE2B bf0f83d9a6e33d103f027757700450d71f691b5c9bc07e326685f1ed39cc6af32fb2a764c20a39982dce61a31764ed9983fc3728c82588efe6aad0342e191800 SHA512 cfa55378449a8875aa7ffb5c18e7c5274f4c3b500906f23cd906736722697ee96ea5d7c6e15549a33d09351523a4492b8cef3c281376b91778e28bbe33b53b86
-DIST ncdc-1.24.tar.gz 377617 BLAKE2B 8528de13d6ee12358c335b921c7edc0f7df719245d23f4fb4a94512f4812249e3294f822452e3b1f508e8c7446bcd01bd347ad7745a63fbd360f1233c9e8be64 SHA512 332fd467d10d3acb2a2171395c41112280cadfea06369820dcc4481eae3c24602c98aa5056f479d3a2e80b3992a02b280819933b43ae5bc39885696703d46b39
-DIST ncdc-1.24.tar.gz.asc 833 BLAKE2B 1729293836f2e414ca19c4cbe25cf23099666b5f7eed6787717ee2c39f425ced147b02c2eb10da5d17093f7381ba9668b2a5567d13df862a9a809c5e7523b1ff SHA512 148353be0b899c18427abe0a33c6788324a80e83ecb1ef6f59f008debc9c20ad48403e145ed865c0d9e73d14ab6d082525ab7eb60fe05a7893946b1c414d039e
diff --git a/net-p2p/ncdc/files/ncdc-1.24-fix-clang16-c99-errors.patch b/net-p2p/ncdc/files/ncdc-1.24-fix-clang16-c99-errors.patch
deleted file mode 100644
index 4be7472e00fd..000000000000
--- a/net-p2p/ncdc/files/ncdc-1.24-fix-clang16-c99-errors.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Upstream PR: https://code.blicky.net/yorhel/ncdc/pulls/108 .
-
-From 42590da4741baf93889773df96e0f3546d2e7f20 Mon Sep 17 00:00:00 2001
-From: Eric Joldasov <bratishkaerik@landless-city.net>
-Date: Tue, 9 Apr 2024 00:09:53 +0500
-Subject: [PATCH] Fix Clang 16 errors for invalid C99 constructs
- (-Wincompatible-pointer-types)
-
-These errors were caused by `t_title` function having "void" parameter
-instead of "ui_tab_t *tab", like everywhere else:
-
-```
-src/uit_conn.c:398:41: error: initialization of char * (*)(ui_tab_t *) from incompatible pointer type char * (*)(void) [-Wincompatible-pointer-types]
- 398 | ui_tab_type_t uit_conn[1] = { { t_draw, t_title, t_key, t_close } };
- | ^~~~~~~
-```
-
-Also renamed `t` param in `t_title` of "src/uit_main.c" to `tab`,
-for consistency with other functions.
-
-This error appeared only in 1.24 release cycle, because changing
-prototypes from "()" to "(void)" in 2cf47a7ec9f35d1afaf24a6f9644fbecf6df92df
-changed meaning of the type from "any parameters, including ui_tab_t *"
-to "no parameters at all", and this is where Clang starts to complain.
-
-Bug: https://bugs.gentoo.org/928946
-Signed-off-by: Eric Joldasov <bratishkaerik@landless-city.net>
----
- src/uit_conn.c | 2 +-
- src/uit_dl.c | 2 +-
- src/uit_main.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/uit_conn.c b/src/uit_conn.c
-index f0fa171..ba00cb3 100644
---- a/src/uit_conn.c
-+++ b/src/uit_conn.c
-@@ -97,7 +97,7 @@ static void t_close(ui_tab_t *tab) {
- }
-
-
--static char *t_title(void) {
-+static char *t_title(ui_tab_t *tab) {
- return g_strdup("Connection list");
- }
-
-diff --git a/src/uit_dl.c b/src/uit_dl.c
-index 118f323..f8cda84 100644
---- a/src/uit_dl.c
-+++ b/src/uit_dl.c
-@@ -124,7 +124,7 @@ static void t_close(ui_tab_t *tab) {
- }
-
-
--static char *t_title(void) {
-+static char *t_title(ui_tab_t *tab) {
- return g_strdup("Download queue");
- }
-
-diff --git a/src/uit_main.c b/src/uit_main.c
-index e3fdfad..79b3ffa 100644
---- a/src/uit_main.c
-+++ b/src/uit_main.c
-@@ -65,7 +65,7 @@ static void t_draw(ui_tab_t *t) {
- }
-
-
--static char *t_title(ui_tab_t *t) {
-+static char *t_title(ui_tab_t *tab) {
- return g_strdup_printf("Welcome to ncdc %s!", main_version);
- }
-
diff --git a/net-p2p/ncdc/ncdc-1.24-r1.ebuild b/net-p2p/ncdc/ncdc-1.24-r1.ebuild
deleted file mode 100644
index 2f1a8db13b65..000000000000
--- a/net-p2p/ncdc/ncdc-1.24-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="Lightweight direct connect client with a friendly ncurses interface"
-HOMEPAGE="https://dev.yorhel.nl/ncdc"
-SRC_URI="
- https://dev.yorhel.nl/download/${P}.tar.gz
- verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-IUSE="geoip"
-
-RDEPEND="
- app-arch/bzip2
- dev-db/sqlite:3
- >=dev-libs/glib-2.74:2
- >=net-libs/gnutls-3:=
- sys-libs/ncurses:=[unicode(+)]
- sys-libs/zlib
- geoip? ( dev-libs/libmaxminddb:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/perl
- dev-util/makeheaders
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-PATCHES=(
- "${FILESDIR}/ncdc-1.24-fix-clang16-c99-errors.patch"
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_with geoip)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-23 16:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-23 16:12 [gentoo-commits] repo/gentoo:master commit in: net-p2p/ncdc/, net-p2p/ncdc/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-01-07 11:33 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox