gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

net-irc/rhapsody: respect flags, fix gcc15

Browse Source 
update SRC_URI (redirect)

use the custom 'cc' compiler defined in configure
set variables to respect userflags
the patch for tinfo is no longer needed

Closes: https://bugs.gentoo.org/335593
Closes: https://bugs.gentoo.org/724970
Closes: https://bugs.gentoo.org/884269
Closes: https://bugs.gentoo.org/945178
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43710
Closes: https://github.com/gentoo/gentoo/pull/43710
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Nicolas PARLANT 2025-09-08 10:56:48 +02:00 committed by Sam James
parent 8dd63a3ef7
commit 594b69ee1b
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
3 changed files with 53 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
net-irc/rhapsody/files/rhapsody-0.28b-fix_gcc15.patch Normal file
View File

@ -0,0 +1,46 @@
https://bugs.gentoo.org/884269
https://bugs.gentoo.org/945178
--- a/src/main.c
+++ b/src/main.c
@@ -584,7 +584,7 @@ int main(int argc, char *argv[]){
else print_all("Error saving configuration.\n");
}
}
- end_run();
+ end_run(key);
return(0);
}
--- a/src/main.h
+++ b/src/main.h
@@ -50,7 +50,7 @@ int resize_occured;
/* main finctions */
void parse_message(server *currentserver, char *buffer);
int parse_input(server *currentserver, char *buffer);
-int end_run();
+int end_run(int key);
// menu *build_window_menu(int startx, int starty);
/* handler functions */
--- a/src/option.h
+++ b/src/option.h
@@ -189,7 +189,7 @@ form *create_favorite_dccsend_form();
/** fav/ban user edit **********************************************************************/
int edit_users(int key, int listnum);
-form *create_edit_user_form();
+form *create_edit_user_form(char *, config_user *);
form *create_new_user_form(char *title);
form *create_change_user_form(char *title, char *user);
--- a/src/screen.h
+++ b/src/screen.h
@@ -155,7 +155,7 @@ int create_transfer_screen(transfer *T);
int redraw_transfer_screen(transfer *T);
void refresh_transfer_screen(transfer *T);
-transfer *add_transfer();
+transfer *add_transfer(char *);
int transfer_update_status(transfer *S);
void set_transfer_update_status(transfer *S, int update);

147
net-irc/rhapsody/files/rhapsody-0.28b-tinfo.patch
View File

@ -1,147 +0,0 @@
https://bugs.gentoo.org/690088
--- rhapsody-0.28b/configure
+++ rhapsody-0.28b/configure
@@ -66,6 +66,7 @@
OSNAME=`uname -o 2>/dev/null`
OSVER=`uname -r 2>/dev/null`
USER=`whoami 2>/dev/null`
+PKGCONFIG="${PKGCONFIG:-pkg-config}"
echo "The OS appears to be $OS ($OSNAME) version $OSVER."
echo ""
@@ -75,7 +76,7 @@
CCPATH="/usr/bin /usr/local/bin"
CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/usr/lib"
GCCBASEINCPATHS="-I/usr/include"
GCCBASEFLAGS="-g -Wall -Wno-unused"
@@ -86,12 +87,12 @@
CCPATH="/usr/bin /usr/local/bin"
CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses -lnsl -lsocket"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lnsl -lsocket"
GCCBASELIBPATHS=""
GCCBASEINCPATHS="-I/usr/local/include"
GCCBASEFLAGS="-g -Wall -Wno-unused"
- CCBASELIBS="-lncurses -lnsl -lsocket"
+ CCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lnsl -lsocket"
CCBASELIBPATHS=""
CCBASEINCPATHS="-I/usr/local/include"
CCBASEFLAGS="-g -Wall"
@@ -102,7 +103,7 @@
CCPATH="/usr/bin /usr/local/bin"
CURSESPATH="/sw/include /usr/include /sw/include/ncurses /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/sw/lib"
GCCBASEINCPATHS="/usr/include /usr/local/include"
GCCBASEFLAGS="-g -Wall -Wno-unused -no-cpp-precomp"
@@ -113,7 +114,7 @@
CCPATH="/usr/bin /usr/local/bin"
CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/usr/lib"
GCCBASEINCPATHS="-I/usr/include"
GCCBASEFLAGS="-g -Wall -Wno-unused"
@@ -124,12 +125,12 @@
CCPATH="/usr/freeware/bin /usr/bin"
CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/usr/freeware/lib64"
GCCBASEINCPATHS=""
GCCBASEFLAGS="-mabi=64 -g -Wall -Wno-unused"
- CCBASELIBS="-lncurses"
+ CCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
CCBASELIBPATHS=""
CCBASEINCPATHS=""
CCBASEFLAGS="-mabi=64"
@@ -140,12 +141,12 @@
CCPATH="/usr/freeware/bin /usr/bin"
CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/usr/freeware/lib32"
GCCBASEINCPATHS=""
GCCBASEFLAGS="-mabi=n32 -g -Wall -Wno-unused"
- CCBASELIBS="-lncurses"
+ CCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
CCBASELIBPATHS=""
CCBASEINCPATHS=""
CCBASEFLAGS="-mabi=n32 -g -Wall"
@@ -156,7 +157,7 @@
CCPATH="/boot/develop/bin /bin /usr/bin /usr/local/bin"
CURSESPATH="/boot/develop/headers /boot/develop/headers/gnu /boot/home/config/include"
- GCCBASELIBS="-lncurses -lsocket -lbind"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lsocket -lbind"
GCCBASELIBPATHS="-L/boot/home/config/lib"
GCCBASEINCPATHS="-I/boot/home/config/include"
GCCBASEFLAGS="-g -Wall -Wno-unused"
@@ -172,12 +173,12 @@
CCPATH="/bin /usr/bin /usr/local/bin"
CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
GCCBASEINCPATHS="-I/usr/local/include"
GCCBASEFLAGS="-g -Wall -Wno-unused"
- CCBASELIBS="-lncurses"
+ CCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
CCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
CCBASEINCPATHS="-I/usr/local/include"
CCBASEFLAGS="-g"
@@ -188,12 +189,12 @@
CCPATH="/bin /usr/bin /usr/local/bin"
CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
GCCBASEINCPATHS="-I/usr/include -I/usr/local/include"
GCCBASEFLAGS="-g -Wall -Wno-unused"
- CCBASELIBS="-lncurses"
+ CCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
CCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
CCBASEINCPATHS="-I/usr/include -I/usr/local/include"
CCBASEFLAGS="-g"
@@ -204,7 +205,7 @@
CCPATH="/usr/bin /usr/local/bin"
CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/usr/lib -L/lib"
GCCBASEINCPATHS=""
GCCBASEFLAGS="-g -Wall -Wno-unused"
@@ -217,12 +218,12 @@
CCPATH="/bin /sbin /usr/bin /usr/sbin/ /usr/local/bin/ /usr/local/sbin"
CURSESPATH="/include /usr/include /include/ncurses /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
- GCCBASELIBS="-lncurses"
+ GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
GCCBASELIBPATHS="-L/usr/lib"
GCCBASEINCPATHS="-I/usr/include -I/include"
GCCBASEFLAGS=""
- CCBASELIBS="-lncurses"
+ CCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
CCBASELIBPATHS="-L/usr/lib"
CCBASEINCPATHS="-I/usr/include -I/include"
CCBASEFLAGS=""

17
net-irc/rhapsody/rhapsody-0.28b-r1.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -7,8 +7,7 @@ inherit toolchain-funcs
DESCRIPTION="IRC client intended to be displayed on a text console"
HOMEPAGE="https://rhapsody.sourceforge.net/"
SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}_${PV}.tgz"
SRC_URI="https://downloads.sourceforge.net/project/rhapsody/rhapsody/Rhapsody%20IRC%20${PV}/${PN}_${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~riscv x86"
@ -19,16 +18,14 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-uclibc.patch
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${P}-fix_gcc15.patch
)
src_configure() {
PKGCONFIG="$(tc-getPKG_CONFIG)" \
./configure -i /usr/share/rhapsody || die "configure failed"
}
src_compile() {
emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS} -fcommon"
CC="$(tc-getCC)" \
CCBASEFLAGS="${CFLAGS} -fcommon" \
CCBASELIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs ncurses)" \
./configure -c cc || die "configure failed"
}
src_install() {