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 <[email protected]> -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 <[email protected]> ---- - 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)" -}
