* [gentoo-commits] repo/gentoo:master commit in: net-p2p/ncdc/files/, net-p2p/ncdc/
@ 2019-04-08 12:40 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2019-04-08 12:40 UTC (permalink / raw
To: gentoo-commits
commit: c00425ee6e741ecb382bf71a10979b1c1a9d68f4
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 12:39:28 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 12:39:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00425ee
net-p2p/ncdc: Bump to version 1.21
Fixed compilation against sys-libs/ncurses[tinfo]
Closes: https://bugs.gentoo.org/677820
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <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 | 57 ++++++++++++++++++++++++++++++++
3 files changed, 111 insertions(+)
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 58e4a8f4c40..c8cb651a864 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1 +1,2 @@
DIST ncdc-1.20.tar.gz 367688 BLAKE2B 33bf6cd92146b0cf3d188cec4b5c29f0860f91cbdf7a1ab33789985a61b706647591513fb596f89b21d3d8aebf683316397b94f184aac928a93e23fc17030e82 SHA512 0f20d6584aab1e69bcb3a93271a8542c5968adee5fd198b375dc258996b60ee5f642eac5d5e91c5513e367bbfd42eda80ede9e6e93ab38279c33e8da557010a7
+DIST ncdc-1.21.tar.gz 370452 BLAKE2B 55ee9943a7adec4c60d17a8782ed9b2337796c0875c3c316e4f1627015520c5b8b23673b183a0f1d7e4c7a367eac5d908fb30e6b2d08caa324d19caf93efc7a4 SHA512 de182e190e3fb26451aad403975ec232b14ce908633cb2d9713582e2af8555fb55e2ea7de160b5b7faa05558f25dac0700dabbf5b7d1acd1aaa26d1bfe033c0c
diff --git a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
new file mode 100644
index 00000000000..0e5acac59d5
--- /dev/null
+++ b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
@@ -0,0 +1,53 @@
+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
new file mode 100644
index 00000000000..ee8caa14759
--- /dev/null
+++ b/net-p2p/ncdc/ncdc-1.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 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 )"
+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/files/, net-p2p/ncdc/
@ 2024-07-03 11:57 Florian Schmaus
0 siblings, 0 replies; 2+ messages in thread
From: Florian Schmaus @ 2024-07-03 11:57 UTC (permalink / raw
To: gentoo-commits
commit: 6f2cf69b4c38e3e43c274a2741274d21dc41d6f1
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Mon Apr 8 19:39:17 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 11:54:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f2cf69b
net-p2p/ncdc: fix building with Clang 16 for 1.24
Release 1.23.1 is unaffected. All information is in the patch.
Upstream PR: https://code.blicky.net/yorhel/ncdc/pulls/108 .
Closes: https://bugs.gentoo.org/928946
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Closes: https://github.com/gentoo/gentoo/pull/36167
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../files/ncdc-1.24-fix-clang16-c99-errors.patch | 72 ++++++++++++++++++++++
.../ncdc/{ncdc-1.24.ebuild => ncdc-1.24-r1.ebuild} | 9 ++-
2 files changed, 79 insertions(+), 2 deletions(-)
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
new file mode 100644
index 000000000000..4be7472e00fd
--- /dev/null
+++ b/net-p2p/ncdc/files/ncdc-1.24-fix-clang16-c99-errors.patch
@@ -0,0 +1,72 @@
+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.ebuild b/net-p2p/ncdc/ncdc-1.24-r1.ebuild
similarity index 93%
rename from net-p2p/ncdc/ncdc-1.24.ebuild
rename to net-p2p/ncdc/ncdc-1.24-r1.ebuild
index cff76b11e27f..f3f6d1e46814 100644
--- a/net-p2p/ncdc/ncdc-1.24.ebuild
+++ b/net-p2p/ncdc/ncdc-1.24-r1.ebuild
@@ -11,10 +11,11 @@ SRC_URI="
https://dev.yorhel.nl/download/${P}.tar.gz
verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
LICENSE="MIT"
SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
IUSE="geoip"
RDEPEND="
@@ -36,6 +37,10 @@ BDEPEND="
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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-03 11:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-08 12:40 [gentoo-commits] repo/gentoo:master commit in: net-p2p/ncdc/files/, net-p2p/ncdc/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2024-07-03 11:57 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox