diff options
Diffstat (limited to 'app-arch/zoo/files')
-rw-r--r-- | app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch | 10 | ||||
-rw-r--r-- | app-arch/zoo/files/zoo-2.10-implicit-int.patch | 75 | ||||
-rw-r--r-- | app-arch/zoo/files/zoo-2.10-makefile.patch | 32 |
3 files changed, 112 insertions, 5 deletions
diff --git a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch index ba7d31e4a47d..b1e598359f6c 100644 --- a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch +++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch @@ -1,5 +1,5 @@ ---- a/sysv.c 2007-06-16 15:01:53 +0200 -+++ b/sysv.c.new 2007-06-16 14:38:38 +0200 +--- a/sysv.c ++++ b/sysv.c @@ -63,8 +63,8 @@ return (fname); /* default is no-op */ } @@ -11,8 +11,8 @@ struct tm *localtime (); /* Function gettz(), returns the offset from GMT in seconds of the ---- a/zoo.h 2007-06-16 15:01:53 +0200 -+++ /zoo.h.new 2007-06-16 14:57:58 +0200 +--- a/zoo.h ++++ b/zoo.h @@ -95,6 +95,9 @@ #endif @@ -22,4 +22,4 @@ +typedef unsigned short ushort; /* WARNING: Static initialization in zooadd.c or zooext.c depends on the - order of fields in struct zoo_header */
\ No newline at end of file + order of fields in struct zoo_header */ diff --git a/app-arch/zoo/files/zoo-2.10-implicit-int.patch b/app-arch/zoo/files/zoo-2.10-implicit-int.patch new file mode 100644 index 000000000000..e29f3dff8f1f --- /dev/null +++ b/app-arch/zoo/files/zoo-2.10-implicit-int.patch @@ -0,0 +1,75 @@ +Clang 16 will not allow implicit int function defitions by default. +This patch gives all functions a proper definitons. + +See also: https://wiki.gentoo.org/wiki/Modern_C_porting + +Bug: https://bugs.gentoo.org/878611 +Upstream PR: https://github.com/jduerstock/zoo/pull/1 + +--- a/fiz.c ++++ b/fiz.c +@@ -24,6 +24,7 @@ file by supplying the offset of the file. + void prtctrl (); + void prtch (); + ++int + main(argc,argv) + register int argc; + register char **argv; +--- a/mstime.i ++++ b/mstime.i +@@ -12,6 +12,7 @@ static char mstimeid[]="@(#) mstime.i 2.2 88/01/24 12:47:58"; + Function mstime() converts time in seconds since January 1 of BASEYEAR + to MS-DOS format date and time. + */ ++void + mstime(longtime, date, time) + long longtime; /* input: seconds since Jan 1, BASEYEAR */ + int *date, *time; /* output: MS-DOS format date and time */ +--- a/zoo.c ++++ b/zoo.c +@@ -44,6 +44,7 @@ int next_arg = FIRST_ARG; /* filenames start at this position */ + int arg_count; /* count of arguments supplied to program */ + char **arg_vector; /* vector of arguments supplied to program */ + ++int + main(argc,argv) + register int argc; + register char **argv; +--- a/zoofilt.c ++++ b/zoofilt.c +@@ -41,8 +41,10 @@ char *option; + unsigned int filetag; /* tag stored in input */ + int stat1, stat2, stat3; /* status codes */ + int use_lzh = 0; /* use lzh instead */ +- extern lzc(), lzh_encode(); /* possible encoders */ +- extern lzd(), lzh_decode(); /* and decoders */ ++ extern int lzc(); /* possible encoders */ ++ extern int lzh_encode(); ++ extern int lzd(); /* and decoders */ ++ extern int lzh_decode(); + + while (*++option) { + switch (*option) { +--- a/nixtime.i ++++ b/nixtime.i +@@ -20,7 +20,7 @@ + Function gettime() gets the date and time of the file handle supplied. + Date and time is in MSDOS format. + */ +-int gettime (file, date, time) ++void gettime (file, date, time) + ZOOFILE file; + unsigned *date, *time; + { +--- a/zoofns.h ++++ b/zoofns.h +@@ -46,7 +46,7 @@ + int exists PARMS ((char *)); + int getfile PARMS ((ZOOFILE, ZOOFILE, long, int)); + int getutime PARMS ((char *, unsigned *, unsigned *)); +-int gettime PARMS ((ZOOFILE, unsigned *, unsigned *)); ++void gettime PARMS ((ZOOFILE, unsigned *, unsigned *)); + T_SIGNAL handle_break PARMS ((int)); + + #ifdef USE_ASCII diff --git a/app-arch/zoo/files/zoo-2.10-makefile.patch b/app-arch/zoo/files/zoo-2.10-makefile.patch new file mode 100644 index 000000000000..89269b480457 --- /dev/null +++ b/app-arch/zoo/files/zoo-2.10-makefile.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/726376 +https://bugs.gentoo.org/721888 +https://bugs.gentoo.org/729126 +--- a/makefile ++++ b/makefile +@@ -18,15 +18,12 @@ + + MAKE = make # needed for some systems e.g. older BSD + +-CC = cc +-CFLAGS = + MODEL = + EXTRA = -DBIG_MEM -DNDEBUG + LINTFLAGS = -DLINT +-OPTIM = `dpkg-buildflags --get CFLAGS` ++OPTIM = $(CFLAGS) + OPTIM += -Wall +-OPTIM += `dpkg-buildflags --get CPPFLAGS` +-LDFLAGS = `dpkg-buildflags --get LDFLAGS` ++OPTIM += $(CPPFLAGS) + + DESTDIR = /usr/local/bin + +@@ -102,7 +99,7 @@ bsd: + + # Linux + linux: +- $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS) ++ $(MAKE) CC="$(CC)" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS) + + # Linux64 + linux64: |