From 6ffac324fc2b4e417beb9156164a5ada8b877ca4 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 12 Feb 2022 09:34:13 +0100 Subject: development/jasspa: Patch for glibc >= 2.32. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- development/jasspa/20091011-glibc-2.32.patch | 57 ++++++++++++++++++++++++++++ development/jasspa/jasspa.SlackBuild | 5 ++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 development/jasspa/20091011-glibc-2.32.patch (limited to 'development/jasspa') diff --git a/development/jasspa/20091011-glibc-2.32.patch b/development/jasspa/20091011-glibc-2.32.patch new file mode 100644 index 000000000000..7e2f57c934bf --- /dev/null +++ b/development/jasspa/20091011-glibc-2.32.patch @@ -0,0 +1,57 @@ +Fix compilation with glibc-2.32. + +--- me091011-orig/src/file.c ++++ me091011/src/file.c +@@ -1325,7 +1325,7 @@ + ) + { + /* READ ONLY DIR */ +- mlwrite(MWPAUSE,(meUByte *)"%s: %s", dirbuf, sys_errlist[errno]); ++ mlwrite(MWPAUSE,(meUByte *)"%s: %s", dirbuf, strerror(errno)); + /* Zap the filename - it is invalid. + We only want a buffer */ + mlwrite (0,(meUByte *)"[New buffer %s]", getFileBaseName(fname)); +@@ -1355,7 +1355,7 @@ + { + /* We are not allowed to read the file */ + #if ((defined _UNIX) || (defined _DOS)) +- mlwrite(MWABORT,(meUByte *)"[%s: %s]", fn, sys_errlist[errno]) ; ++ mlwrite(MWABORT,(meUByte *)"[%s: %s]", fn, strerror(errno)) ; + #else + mlwrite(MWABORT,"[cannot read: %s]", fn) ; + #endif +--- me091011-orig/src/fileio.c ++++ me091011/src/fileio.c +@@ -2331,7 +2331,7 @@ + if(meRename(filename,filename2) && (ffFileOp(filename,filename2,meRWFLAG_DELETE,-1) <= 0)) + { + mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to backup file to %s (%d - %s)]", +- filename2,errno,sys_errlist[errno]) ; ++ filename2,errno,strerror(errno)) ; + if(meUnlink(filename)) + { + mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to remove backup file %s]", filename) ; +@@ -2346,7 +2346,7 @@ + mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to remove backup file %s]", filename) ; + else if(meRename(filenameOld,filename) && (ffFileOp(filenameOld,filename,meRWFLAG_DELETE,-1) <= 0)) + mlwrite(MWABORT|MWPAUSE,(meUByte *)"[Unable to backup file to %s (%d - %s)]", +- filename,errno,sys_errlist[errno]) ; ++ filename,errno,strerror(errno)) ; + else if(bp != NULL) + { + meUShort ss; +--- me091011-orig/src/spawn.c ++++ me091011/src/spawn.c +@@ -219,10 +219,10 @@ + case 0: + /* we want the children to die on interrupt */ + execlp("xterm", "xterm", "-sl", "200", "-sb", NULL); +- mlwrite(MWABORT,(meUByte *)"exec failed, %s", sys_errlist[errno]); ++ mlwrite(MWABORT,(meUByte *)"exec failed, %s", strerror(errno)); + meExit(127); + case -1: +- ss = mlwrite(MWABORT,(meUByte *)"exec failed, %s", sys_errlist[errno]); ++ ss = mlwrite(MWABORT,(meUByte *)"exec failed, %s", strerror(errno)); + default: + ss = meTRUE ; + } diff --git a/development/jasspa/jasspa.SlackBuild b/development/jasspa/jasspa.SlackBuild index c52bcfd44c9b..6d9160e02800 100644 --- a/development/jasspa/jasspa.SlackBuild +++ b/development/jasspa/jasspa.SlackBuild @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf me$VERSION -tar xzf $CWD/$PRGNAM-mesrc-20$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-mesrc-20$VERSION.tar.gz cd me$VERSION chown -R root:root . find -L . \ @@ -79,6 +79,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thnx Gentoo! +patch -p1 < $CWD/20091011-glibc-2.32.patch + cd src sed -i -e "s/\\(COPTIMISE\\s*=\\s*\\)-O3\\(.*\\)/\\1$SLKCFLAGS\\2/" linux2.gmk sed -i -e "s/\\(COPTIMISE\\s*=\\s*\\)-O3\\(.*\\)/\\1$SLKCFLAGS\\2/" linux26.gmk -- cgit v1.2.3