commit: dfdebbfb4e686ab2ffe9d86e6ffe71230d59517a Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Mon Feb 24 09:25:51 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 10 03:00:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfdebbfb
www-client/w3mmee: fix build failure on modern compiler 0. update to EAPI 8 1. w3mmee-boehm-gc.patch is merged into w3mmee-configure.patch 2. fix errors and warnings reported by modern compiler 3. fix QA warning on uninitialized variable 4. fix error on -Wincompatible-pointer-types Closes: https://bugs.gentoo.org/875125 Closes: https://bugs.gentoo.org/883735 Closes: https://bugs.gentoo.org/887329 Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40730 Signed-off-by: Sam James <sam <AT> gentoo.org> www-client/w3mmee/files/w3mmee-configure.patch | 773 +++++++++++++++++++++++++ www-client/w3mmee/files/w3mmee-display.patch | 26 + www-client/w3mmee/files/w3mmee-linein.patch | 23 + www-client/w3mmee/w3mmee-0.3.2_p24-r13.ebuild | 160 +++++ 4 files changed, 982 insertions(+) diff --git a/www-client/w3mmee/files/w3mmee-configure.patch b/www-client/w3mmee/files/w3mmee-configure.patch new file mode 100644 index 000000000000..9856bf6ec972 --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-configure.patch @@ -0,0 +1,773 @@ +Fixes following error: + +1. error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] +2. error: call to undeclared library function '...' with type '...'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +3. error: call to undeclared function '...'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +4. error: incompatible function pointer types initializing 'void (*)()' with an expression of type 'int (FILE *)' (aka 'int (struct _IO_FILE *)') [-Wincompatible-function-pointer-types] +5. error: incompatible pointer to integer conversion assigning to 'int' from 'char *' [-Wint-conversion] +6. error: undefined reference to `GC_version' +7. warning: unused variable '*** [-Wunused-variable] +8. warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result] +9. warning: variable '*' set but not used [-Wunused-but-set-variable] + +diff --git a/configure b/configure +index 14ff1d2..5fc2f74 100755 +--- a/configure ++++ b/configure +@@ -4,7 +4,7 @@ + # + + # +-if ./which uname > /dev/null ; then ++if ./which uname ; then + sysname=`uname -s` + sysversion=`uname -r` + platform=`uname -m` +@@ -256,12 +256,20 @@ do_sigtest() { + echo "#include <signal.h>" > _zmachdep.c + + if [ "$2" = void ]; then +- echo "$1 _handler($2) {}" >> _zmachdep.c ++ if [ "$1" = int ] ; then ++ echo "$1 _handler($2) {return 0;}" >> _zmachdep.c ++ else ++ echo "$1 _handler($2) {}" >> _zmachdep.c ++ fi + else +- echo "$1 _handler($2 x) {}" >> _zmachdep.c ++ if [ "$1" = int ] ; then ++ echo "$1 _handler($2 x) {return 0;}" >> _zmachdep.c ++ else ++ echo "$1 _handler($2 x) {}" >> _zmachdep.c ++ fi + fi + +- echo "int main(void) { $1 (*hdl)($2); hdl = signal(SIGINT,_handler); return 0; }" >> _zmachdep.c ++ echo "int main(void) { $1 (*hdl)($2); hdl = signal(SIGINT,_handler); (void)hdl; return 0; }" >> _zmachdep.c + $cc $cflags -o _zmachdep _zmachdep.c > _zwarning 2>&1 + stat=$? + warning=`cat _zwarning` +@@ -283,7 +291,7 @@ return 0; + } + EOF + +- if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You don't need \"-lintl\"" + else + echo "You need \"-lintl\"" +@@ -1346,7 +1354,10 @@ fi + termlib='' + + cat > _zmachdep.c << EOF +-main() ++#include <stdlib.h> ++#include <curses.h> ++#include <term.h> ++int main() + { + char bp[100]; + tgetent(bp,getenv("TERM")); +@@ -1362,7 +1373,7 @@ if [ -z "$dtermlib" ]; then + # check if the lib works... + Echo "Terminal library -l$lib found at $tlibdir, " + +- if $cc $cflags -o _zmachdep _zmachdep.c -l$lib > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c -l$lib 2>&1; then + echo "and it seems to work." + termlib=-l$lib + else +@@ -1500,15 +1511,16 @@ done + + if [ -n "$gclib" -a -n "$gcinclude" ]; then + cat > _zmachdep.c << EOF ++#include <stdio.h> + #include <gc.h> +-main() ++int main() + { +- extern unsigned GC_version; ++ unsigned GC_version = GC_get_version(); + printf("%d%02d%03d\n",(GC_version>>16)&0xff,(GC_version>>8)&0xff,GC_version&0xff); + } + EOF + +- if $cc $cflags $gc_cflags -I$gcinclude -o _zmachdep _zmachdep.c $gclib > /dev/null 2>&1; then ++ if $cc $cflags $gc_cflags -I$gcinclude -o _zmachdep _zmachdep.c $gclib 2>&1; then + echo "and it seems to work." + gcversion=`./_zmachdep` + fi +@@ -1644,24 +1656,26 @@ def_param use_help_cgi $have_perl + + ####### long long + cat > _zmachdep.c <<EOF +-main() ++int main() + { + int i = sizeof(unsigned long long); ++ (void)i; + } + EOF +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1 + then + echo "You have long long" + def_have_long_long="typedef long long clen_t;" + cat > _zmachdep.c <<EOF + #include <stdlib.h> +-main() ++int main() + { + const char *s = "1"; + long long ll = strtoll(s, NULL, 10); ++ (void)ll; + } + EOF +- if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 ++ if $cc $cflags -o _zmachdep _zmachdep.c 2>&1 + then + echo "You have strtoll()" + def_have_strtoll="#define HAVE_STRTOLL" +@@ -1673,13 +1687,14 @@ EOF + #include <sys/types.h> + #include <stdlib.h> + #include <limits.h> +-main() ++int main() + { + const char *s = "1"; + quad_t q = strtoq(s, NULL, 10); ++ (void)q; + } + EOF +- if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 ++ if $cc $cflags -o _zmachdep _zmachdep.c 2>&1 + then + echo "You have strtoq()" + def_have_strtoq="#define HAVE_STRTOQ" +@@ -1695,15 +1710,16 @@ fi + ####### strcasecmp + + cat > _zmachdep.c << EOF +-#include <string.h> +-main() ++#include <strings.h> ++int main() + { + int i; + i = strcasecmp("abc","def"); ++ (void)i; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have strcasecmp()." + def_have_strcasecmp="#define HAVE_STRCASECMP" + else +@@ -1714,13 +1730,14 @@ fi + ####### strcasestr + cat > _zmachdep.c << EOF + #include <string.h> +-main() ++int main() + { +- int i; +- i = strcasestr("abc","def"); ++ char *p; ++ p = strcasestr("abc","def"); ++ (void)p; + } + EOF +-if $cc $cflags -D_GNU_SOURCE -o _zmachdep _zmachdep.c > /dev/null 2>&1 ++if $cc $cflags -D_GNU_SOURCE -o _zmachdep _zmachdep.c 2>&1 + then + echo "You have strcasestr()." + def_have_strcasestr="#define HAVE_STRCASESTR" +@@ -1733,14 +1750,15 @@ fi + + cat > _zmachdep.c << EOF + #include <string.h> +-main() ++int main() + { + char *p, *q = "abc"; + p = strchr(q,'c'); ++ (void)p; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have strchr()." + def_have_strchr="#define HAVE_STRCHR" + else +@@ -1751,14 +1769,16 @@ fi + ####### strerror + + cat > _zmachdep.c << EOF +-main() ++#include <string.h> ++int main() + { +- int i; +- i = strerror(0); ++ char *p; ++ p = strerror(0); ++ (void)p; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have strerror()." + def_have_strerror="#define HAVE_STRERROR" + else +@@ -1769,13 +1789,13 @@ fi + ####### sys_errlist + + cat > _zmachdep.c << EOF +-main() ++int main() + { + extern char sys_errlist[]; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have sys_errlist[]." + def_have_syserrlist="#define HAVE_SYS_ERRLIST" + else +@@ -1786,7 +1806,8 @@ fi + ####### bcopy + + cat > _zmachdep.c << EOF +-main() ++#include <string.h> ++int main() + { + char x[1],y[1]; + bzero(x,1); +@@ -1794,7 +1815,7 @@ main() + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have bcopy()." + def_have_bcopy="#define HAVE_BCOPY" + else +@@ -1805,10 +1826,12 @@ fi + ####### waitpid + + cat > _zmachdep.c << EOF ++#include <unistd.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/wait.h> + +-main() ++int main() + { + pid_t pid; + int status; +@@ -1820,7 +1843,7 @@ main() + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have waitpid()." + def_have_waitpid="#define HAVE_WAITPID" + else +@@ -1831,6 +1854,8 @@ fi + ####### wait3 + + cat > _zmachdep.c << EOF ++#include <unistd.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <time.h> + #include <sys/time.h> +@@ -1840,7 +1865,7 @@ cat > _zmachdep.c << EOF + #define NULL 0 + #endif + +-main() ++int main() + { + int pid; + int status; +@@ -1852,12 +1877,12 @@ main() + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have wait3()." + def_have_wait3="#define HAVE_WAIT3" + else + echo "You don't have wait3()." +- def_have_wait3="#undef HAVE_WAITPID" ++ def_have_wait3="#undef HAVE_WAIT3" + fi + + ####### strftime +@@ -1865,17 +1890,18 @@ fi + cat > _zmachdep.c << EOF + #include <time.h> + +-main() ++int main() + { + time_t ct; + struct tm *tm; + char t[80]; + time(&ct); + strftime(t, 80, "%a, %d %b %Y %H:%M:%S GMT",gmtime(&ct)); ++ (void)tm; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have strftime()." + def_have_strftime="#define HAVE_STRFTIME" + else +@@ -1888,18 +1914,19 @@ fi + cat > _zmachdep.c << EOF + #include <sys/param.h> + #include <unistd.h> +-main() ++int main() + { + #ifdef MAXPATHLEN + char path[MAXPATHLEN]; +- getcwd(path,MAXPATHLEN); ++ char *p = getcwd(path,MAXPATHLEN); ++ (void)p; + #else + gwtcwd(NULL, 0); + #endif + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have getcwd()." + def_have_getcwd="#define HAVE_GETCWD" + else +@@ -1910,14 +1937,16 @@ fi + ####### getwd + + cat > _zmachdep.c << EOF +-main() ++#include <unistd.h> ++int main() + { + char path[64]; +- getwd(path); ++ char *p = getwd(path); ++ (void)p; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have getwd()." + def_have_getwd="#define HAVE_GETWD" + else +@@ -1927,13 +1956,15 @@ fi + + ####### symlink + cat > _zmachdep.c << EOF +-main() ++#include <unistd.h> ++int main() + { + char path[64],lpath[64]; +- symlink(path,lpath); ++ int i = symlink(path,lpath); ++ (void)i; + } + EOF +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1 + then + echo "You have symlink()." + def_have_symlink="#define HAVE_SYMLINK" +@@ -1945,14 +1976,16 @@ fi + ####### readlink + + cat > _zmachdep.c << EOF +-main() ++#include <unistd.h> ++int main() + { + char path[64],lpath[64]; +- readlink(path,lpath,64); ++ ssize_t l = readlink(path,lpath,64); ++ (void)l; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have readlink()." + def_have_readlink="#define HAVE_READLINK" + else +@@ -1964,14 +1997,14 @@ fi + cat > _zmachdep.c << EOF + #include <sys/types.h> + #include <sys/stat.h> +-main() ++int main() + { + struct stat st; + char path[64]; + lstat(path,&st); + } + EOF +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1 ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1 + then + echo "You have lstat()." + def_have_lstat="#define HAVE_LSTAT" +@@ -1984,13 +2017,13 @@ fi + + cat > _zmachdep.c << EOF + #include <stdlib.h> +-main() ++int main() + { + setenv("HOGE","hoge",1); + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have setenv()." + def_have_setenv="#define HAVE_SETENV" + else +@@ -2002,13 +2035,13 @@ fi + + cat > _zmachdep.c << EOF + #include <stdlib.h> +-main() ++int main() + { + putenv("HOGE=hoge"); + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have putenv()." + def_have_putenv="#define HAVE_PUTENV" + else +@@ -2019,8 +2052,9 @@ fi + ####### sigsetjmp + + cat > _zmachdep.c << EOF ++#include <stdlib.h> + #include <setjmp.h> +-main() ++int main() + { + jmp_buf env; + if (sigsetjmp(env,1) != 0) { +@@ -2030,7 +2064,7 @@ main() + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have sigsetjmp()." + def_setjmp="#define SETJMP(env) sigsetjmp(env,1)" + def_longjmp="#define LONGJMP(env,val) siglongjmp(env,val)" +@@ -2046,13 +2080,13 @@ fi + + cat > _zmachdep.c << EOF + #include <stdlib.h> +-main() ++int main() + { + srand48(0); + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have srand48()." + def_have_srand48="#define HAVE_SRAND48" + else +@@ -2064,13 +2098,13 @@ fi + + cat > _zmachdep.c << EOF + #include <stdlib.h> +-main() ++int main() + { + srandom(0); + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have srandom()." + def_have_srandom="#define HAVE_SRANDOM" + else +@@ -2082,13 +2116,13 @@ fi + + cat > _zmachdep.c << EOF + #include <unistd.h> +-main() ++int main() + { + getpassphrase(""); + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have getpassphrase()." + def_have_getpassphrase="#define HAVE_GETPASSPHRASE" + else +@@ -2101,13 +2135,14 @@ fi + cat > _zmachdep.c <<EOF + #include <stdio.h> + #include <unistd.h> +-main() ++int main() + { +- int (*c)() = chdir; ++ int (*c)(const char *) = chdir; ++ (void)c; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have chdir()." + def_have_chdir="#define HAVE_CHDIR" + else +@@ -2120,13 +2155,14 @@ fi + cat > _zmachdep.c << EOF + #include <stdio.h> + #include <stdlib.h> +-main() ++int main() + { +- void (*c)() = fclose; ++ int (*c)(FILE *) = fclose; ++ (void)c; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "fclose() is declared." + dcl_fclose='' + else +@@ -2139,13 +2175,14 @@ fi + cat > _zmachdep.c << EOF + #include <stdio.h> + #include <stdlib.h> +-main() ++int main() + { +- void (*c)() = pclose; ++ int (*c)(FILE *) = pclose; ++ (void)c; + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "pclose() is declared." + dcl_pclose='' + else +@@ -2248,13 +2285,13 @@ fi + + cat > _zmachdep.c << EOF + #include <float.h> +-main() ++int main() + { + ; + } + EOF + +-if $cc $cflags -c _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -c _zmachdep.c 2>&1; then + echo "You have float.h." + def_have_float_h='#define HAVE_FLOAT_H' + else +@@ -2265,13 +2302,13 @@ fi + + cat > _zmachdep.c <<EOF + #include <sys/select.h> +-main() ++int main() + { + ; + } + EOF + +-if $cc $cflags -c _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -c _zmachdep.c 2>&1; then + echo "You have sys/select.h." + def_sys_select_h='#define HAVE_SYS_SELECT_H' + else +@@ -2289,7 +2326,7 @@ int main(){ + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have setpgrp()." + def_have_setpgrp='#define HAVE_SETPGRP' + else +@@ -2302,7 +2339,7 @@ int main(){ + } + EOF + +- if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c $extlib 2>&1; then + echo "You have setpgrp( pid, pgrp )." + def_have_setpgrp='#define HAVE_SETPGRP' + def_setpgrp='#define SETPGRP() setpgrp( 0, 0 )' +@@ -2318,7 +2355,7 @@ cat > _zmachdep.c <<EOF + #include <stdarg.h> + #include <stdio.h> + +-main() ++int main() + { + va_list a, b; + +@@ -2327,7 +2364,7 @@ main() + } + EOF + +-if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have va_copy()." + def_have_va_copy='#define HAVE_VA_COPY' + def_va_copy= +@@ -2339,7 +2376,7 @@ cat > _zmachdep.c <<EOF + #include <stdarg.h> + #include <stdio.h> + +-main() ++int main() + { + va_list a, b; + +@@ -2348,7 +2385,7 @@ main() + } + EOF + +- if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "You have __va_copy()." + def_va_copy='#define va_copy(dest, src) __va_copy(dest, src)' + else +@@ -2357,7 +2394,7 @@ cat > _zmachdep.c <<EOF + #include <stdarg.h> + #include <stdio.h> + +-main() ++int main() + { + va_list a, b; + +@@ -2366,7 +2403,7 @@ main() + } + EOF + +- if $cc $cflags -o _zmachdep _zmachdep.c > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c 2>&1; then + echo "Your va_list is not an array." + def_va_copy='#define va_copy(dest, src) ((dest) = (src))' + else +@@ -2379,9 +2416,10 @@ fi + ###### IPv6 support check + + cat > _zmachdep.c <<EOF ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/socket.h> +-main() ++int main() + { + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); +@@ -2394,7 +2432,7 @@ def_ipv6="#undef INET6" + v6_ss_family="" + v6lib='' + +-if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1; then ++if $cc $cflags -o _zmachdep _zmachdep.c $extlib 2>&1; then + if ./_zmachdep; then + def_ipv6="#define INET6" + else +@@ -2421,7 +2459,7 @@ int main() { + } + EOF + +- if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c $extlib 2>&1; then + echo "You have getaddrinfo() in libc." + else + for tlibdir in /usr/local/v6/lib /usr/local/lib /usr/lib; do +@@ -2432,7 +2470,7 @@ EOF + + v6lib="$v6lib -linet6" + +- if $cc $cflags -o _zmachdep _zmachdep.c $extlib $v6lib > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c $extlib $v6lib 2>&1; then + echo "You have getaddrinfo() in libinet6." + fi + +@@ -2461,10 +2499,11 @@ if [ "$def_ipv6" = "#define INET6" ]; then + int main() { + struct sockaddr_storage ss; + int i = ss.ss_family; ++ (void)i; + } + EOF + +- if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c $extlib 2>&1; then + echo "You have ss_family." + else + cat > _zmachdep.c <<EOF +@@ -2475,7 +2514,7 @@ int main() { + } + EOF + +- if $cc $cflags -o _zmachdep _zmachdep.c $extlib > /dev/null 2>&1; then ++ if $cc $cflags -o _zmachdep _zmachdep.c $extlib 2>&1; then + echo "You have __ss_family." + def_ipv6_ss_family="#define ss_family __ss_family" + else +@@ -2996,7 +3035,7 @@ cat > extrvers.c << EOF + #include <stdio.h> + #include <string.h> + #include "version.c" +-main() ++int main() + { + char *p = strchr(w3m_version,'/'); + if (p == NULL) +@@ -3006,7 +3045,7 @@ main() + } + EOF + +-$cc $cflags $mb_cflag -o extrvers$extension extrvers.c > /dev/null 2>&1 ++$cc $cflags $mb_cflag -o extrvers$extension extrvers.c 2>&1 + w3mversion=`./extrvers` + echo "Current w3m version is $w3mversion." + rm -f extrvers.c extrvers$extension diff --git a/www-client/w3mmee/files/w3mmee-display.patch b/www-client/w3mmee/files/w3mmee-display.patch new file mode 100644 index 000000000000..fe7e7efc2c6d --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-display.patch @@ -0,0 +1,26 @@ +Fixes QA warning, pr is unused, so it's safe to remove + + * QA Notice: Package triggers severe warnings which indicate that it + * may exhibit random runtime failures. + * display.c:1253:2: warning: variable 'pr' is uninitialized when used here [-Wuninitialized] +diff --git a/display.c b/display.c +index c8640a9..5c48e17 100644 +--- a/display.c ++++ b/display.c +@@ -1132,7 +1132,7 @@ redrawForm(Buffer *buf, Anchor *a, Line *l, int pos, + FormItemList *fi; + int i, j, n, ctype, delta, bcol, ncol, epos; + char *p; +- Lineprop *pr, prop; ++ Lineprop prop; + #ifdef USE_ANSI_COLOR + Linecolor *pc; + #endif +@@ -1250,7 +1250,6 @@ redrawForm(Buffer *buf, Anchor *a, Line *l, int pos, + #endif + j = ncol; + p += delta; +- pr += delta; + #ifdef USE_ANSI_COLOR + pc += delta; + #endif diff --git a/www-client/w3mmee/files/w3mmee-linein.patch b/www-client/w3mmee/files/w3mmee-linein.patch new file mode 100644 index 000000000000..ba3186560794 --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-linein.patch @@ -0,0 +1,23 @@ +gcc report following error: +linein.c:889:51: error: passing argument 2 of ��mb_mem_to_wchar�� from incompatible pointer type [-Wincompatible-pointer-types] + 889 | first = mb_mem_to_wchar(env->strBuf->ptr, &word, &e); + | ^~~~~ + | | + | int * +In file included from fm.h:51: +/usr/include/moe/mb.h:634:58: note: expected ��size_t *�� {aka ��long unsigned int *��} but argument is of type ��int *�� + 634 | extern mb_wchar_t mb_mem_to_wchar(const char *s, size_t *p_b, size_t *p_e); + | ~~~~~~~~^~~ +diff --git a/linein.c b/linein.c +index 4179957..753c61a 100644 +--- a/linein.c ++++ b/linein.c +@@ -881,7 +881,7 @@ find_Lw(InputLineEnv *env) + #else + int b, first, cur; + #endif +- int word; ++ size_t word; + + word = env->CPos - 1; + #ifdef MANY_CHARSET diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r13.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r13.ebuild new file mode 100644 index 000000000000..2d9632d400ee --- /dev/null +++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r13.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit alternatives toolchain-funcs + +MY_PV="${PV##*_}-23" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="A variant of w3m with support for multiple character encodings" +HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"; +SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"; +S="${WORKDIR}/${MY_P}" + +LICENSE="w3m" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~x86" +IUSE="gpm nls ssl" + +DEPEND=">=dev-libs/boehm-gc-7.2 + dev-libs/libmoe + dev-lang/perl + sys-libs/ncurses:0= + sys-libs/zlib + gpm? ( sys-libs/gpm ) + nls? ( sys-devel/gettext ) + ssl? ( + dev-libs/openssl:0= + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-gcc-4.4.patch + "${FILESDIR}"/${PN}-gcc-4.5.patch + "${FILESDIR}"/${PN}-gcc-10.patch + "${FILESDIR}"/${PN}-glibc-2.14.patch + "${FILESDIR}"/${PN}-openssl-1.1.patch + "${FILESDIR}"/${PN}-rc_name.patch + "${FILESDIR}"/${PN}-time.patch + "${FILESDIR}"/${PN}-tinfo.patch + "${FILESDIR}"/${PN}-w3mman.patch + "${FILESDIR}"/${PN}-configure.patch + "${FILESDIR}"/${PN}-display.patch + "${FILESDIR}"/${PN}-linein.patch +) +DOCS=( ChangeLog NEWS{,.mee} README ) +HTML_DOCS=( 00INCOMPATIBLE.html ) + +QA_CONFIG_IMPL_DECL_SKIP=( getpassphrase ) + +src_prepare() { + default + + sed -i "s:/lib\([^a-z$]\):/$(get_libdir)\1:g" configure || die + sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile || die +} + +src_configure() { + local myconf=( + -locale_dir=$(usex nls "${EPREFIX}/usr/share/locale" '(NONE)') + ) + local myuse=( + display_code=E + system_code=E + use_ansi_color=y + use_cookie=y + use_history=y + use_mouse=$(usex gpm y n) + ) + + if use ssl; then + myconf+=( + --ssl-includedir="${EPREFIX}/usr/include/openssl" + --ssl-libdir="${EPREFIX}/usr/$(get_libdir)" + ) + myuse+=( + use_digest_auth=y + use_ssl=y + use_ssl_verify=y + ) + else + myuse+=( use_ssl=n ) + fi + # bug #678910 + myuse+=( use_image=n ) + + cat <<-EOF >> config.param + lang=MANY + accept_lang=en + EOF + + env CC="$(tc-getCC)" "${myuse[@]}" ./configure \ + -nonstop \ + -prefix="${EPREFIX}/usr" \ + -suffix=mee \ + -auxbindir="${EPREFIX}/usr/$(get_libdir)/${PN}" \ + -libdir="${EPREFIX}/usr/$(get_libdir)/${PN}/cgi-bin" \ + -helpdir="${EPREFIX}/usr/share/${PN}" \ + -mandir="${EPREFIX}/usr/share/man" \ + -sysconfdir="${EPREFIX}/etc/${PN}" \ + -model=custom \ + -libmoe="${EPREFIX}/usr/$(get_libdir)" \ + -mb_h="${EPREFIX}/usr/include/moe" \ + -mk_btri="${EPREFIX}/usr/libexec/moe" \ + -cflags="${CFLAGS}" \ + -ldflags="${LDFLAGS}" \ + "${myconf[@]}" 2>&1 | tee config.log \ + || die +} + +src_install() { + emake DESTDIR="${D}" install + einstalldocs + + # w3mman and manpages conflict with those from w3m + mv "${ED}"/usr/share/man/man1/w3m{,mee}.1 || die + mv "${ED}"/usr/share/man/ja/man1/w3m{,mee}.1 || die + + docinto html/en + dodoc doc/*.html + rm -f doc/*.html + docinto en + dodoc doc/{HISTORY,README,keymap,menu}* + + docinto html/ja + dodoc doc-jp/*.html + rm -f doc-jp/*.html + docinto ja + dodoc doc-jp/{HISTORY,README,keymap,menu}* +} + +pkg_postinst() { + w3m_alternatives + einfo + einfo "If you want to render multilingual text, please refer to" + einfo "/usr/share/doc/${PF}/en/README.mee or" + einfo "/usr/share/doc/${PF}/jp/README.mee" + einfo "and set W3MLANG variable respectively." + einfo +} + +pkg_postrm() { + w3m_alternatives +} + +w3m_alternatives() { + if [[ ! -f /usr/bin/w3m ]]; then + alternatives_makesym /usr/bin/w3m \ + /usr/bin/w3m{m17n,mee} + alternatives_makesym /usr/bin/w3mman \ + /usr/bin/w3m{man-m17n,meeman} + alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \ + /usr/share/man/ja/man1/w3m{m17n,mee}.1.gz + alternatives_makesym /usr/share/man/man1/w3m.1.gz \ + /usr/share/man/man1/w3m{m17n,mee}.1.gz + alternatives_makesym /usr/share/man/man1/w3mman.1.gz \ + /usr/share/man/man1/w3m{man-m17n,meeman}.1.gz + fi +}
