mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2024-09-20 11:23:16 +00:00
main/sc: fix build with gcc 14
This commit is contained in:
parent
e27b3f2b0d
commit
df58d136ac
2 changed files with 65 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
|||
# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
|
||||
pkgname=sc
|
||||
pkgver=7.16
|
||||
pkgrel=8
|
||||
pkgrel=9
|
||||
pkgdesc="Speadsheet Calculator"
|
||||
url="https://github.com/erithmetic/sc"
|
||||
arch="all"
|
||||
|
@ -12,6 +12,7 @@ subpackages="$pkgname-doc"
|
|||
source="http://ibiblio.org/pub/linux/apps/financial/spreadsheet/sc-$pkgver.tar.gz
|
||||
format-security.patch
|
||||
sc_7.16-2.patch
|
||||
gcc-14.patch
|
||||
"
|
||||
options="!check"
|
||||
|
||||
|
@ -36,4 +37,5 @@ sha512sums="
|
|||
efa495ba21d01b578a53f09101ccc28b564437317e0860904ad59136a24df9619dfc8715339296ae1567eaa8d620cdabc9bc2784962bc1c93e3bbd086856407b sc-7.16.tar.gz
|
||||
c5298dc9a7debf185027df30144efdc7ab4db425ff672b4466a542f1d376d28346ef82b6b5ba7e7d6e777420217724f8f474f495d558bbaa8164d4a6beb10de1 format-security.patch
|
||||
cb025e84148085e37bfb0ee02bdda60e5ab146ded14f5f0da2f17b3dbf0ba330eef87e534f8a0085265e53295591de222350eb918bb0d1d2994894ce19b16862 sc_7.16-2.patch
|
||||
f18099c1b2b6ecf169ea0cf377b15264ea20d3804256af29b7b0b05d2b0d940f02ce6690e940b5886c20936dee7eac5870a06558a3f8d19c23808ae9446cbbb9 gcc-14.patch
|
||||
"
|
||||
|
|
62
main/sc/gcc-14.patch
Normal file
62
main/sc/gcc-14.patch
Normal file
|
@ -0,0 +1,62 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 3780755..a2ccd42 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -336,7 +336,7 @@ LN=ln
|
||||
# real effect on the reliability of the program, but may concern some
|
||||
# people who don't understand them.
|
||||
#CFLAGS=-DSYSV3 -O2 -Wall -pipe
|
||||
-CFLAGS=-DSYSV3 -O2 -pipe
|
||||
+CFLAGS=-DSYSV3 -O2 -pipe -fpermissive
|
||||
LIB=-lm -lncurses
|
||||
|
||||
# All of the source files
|
||||
diff --git a/cmds.c b/cmds.c
|
||||
index fdb591f..c9fe37b 100644
|
||||
--- a/cmds.c
|
||||
+++ b/cmds.c
|
||||
@@ -1468,7 +1468,7 @@ doformat(int c1, int c2, int w, int p, int r)
|
||||
}
|
||||
|
||||
void
|
||||
-formatcol(arg)
|
||||
+formatcol(int arg)
|
||||
{
|
||||
int c, i;
|
||||
int mf = modflg;
|
||||
@@ -1603,7 +1603,7 @@ formatcol(arg)
|
||||
}
|
||||
|
||||
void
|
||||
-ljustify(sr, sc, er, ec)
|
||||
+ljustify(int sr, int sc, int er, int ec)
|
||||
{
|
||||
struct ent *p;
|
||||
int i, j;
|
||||
@@ -1632,7 +1632,7 @@ ljustify(sr, sc, er, ec)
|
||||
}
|
||||
|
||||
void
|
||||
-rjustify(sr, sc, er, ec)
|
||||
+rjustify(int sr, int sc, int er, int ec)
|
||||
{
|
||||
struct ent *p;
|
||||
int i, j;
|
||||
@@ -1661,7 +1661,7 @@ rjustify(sr, sc, er, ec)
|
||||
}
|
||||
|
||||
void
|
||||
-center(sr, sc, er, ec)
|
||||
+center(int sr, int sc, int er, int ec)
|
||||
{
|
||||
struct ent *p;
|
||||
int i, j;
|
||||
@@ -2562,7 +2562,7 @@ openfile(char *fname, int *rpid, int *rfd)
|
||||
(void) dup(pipefd[3]); /* connect to second pipe */
|
||||
}
|
||||
(void) signal(SIGINT, SIG_DFL); /* reset */
|
||||
- (void) execl("/bin/sh", "sh", "-c", efname, 0);
|
||||
+ (void) execl("/bin/sh", "sh", "-c", efname, NULL);
|
||||
exit (-127);
|
||||
} else { /* else parent */
|
||||
*rpid = pid;
|
Loading…
Reference in a new issue