diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-arch/arj/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-arch/arj/files')
-rw-r--r-- | app-arch/arj/files/arj-3.10.22-darwin.patch | 41 | ||||
-rw-r--r-- | app-arch/arj/files/arj-3.10.22-glibc2.10.patch | 12 | ||||
-rw-r--r-- | app-arch/arj/files/arj-3.10.22-implicit-declarations.patch | 33 | ||||
-rw-r--r-- | app-arch/arj/files/arj-3.10.22-interix.patch | 45 |
4 files changed, 0 insertions, 131 deletions
diff --git a/app-arch/arj/files/arj-3.10.22-darwin.patch b/app-arch/arj/files/arj-3.10.22-darwin.patch deleted file mode 100644 index a09c30d3126d..000000000000 --- a/app-arch/arj/files/arj-3.10.22-darwin.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- arj-3.10.22/environ.c -+++ arj-3.10.22/environ.c -@@ -58,7 +58,7 @@ - #include <sys/ioctl.h> - #include <sys/statfs.h> - #include <sys/statvfs.h> -- #elif defined(__FreeBSD__)||defined(__NetBSD__) -+ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) - #include <sys/param.h> - #include <sys/mount.h> - #elif defined(__QNXNTO__) ---- arj-3.10.22/gnu/configure.in -+++ arj-3.10.22/gnu/configure.in -@@ -62,6 +62,11 @@ - DLL_FLAGS="-shared -export-dynamic" - LD_STRIP="gnu/stripgcc.lnk" - ;; -+*darwin*) -+ # not ELF -+ DLL_EXT=".dylib" -+ DLL_FLAGS="" -+ ;; - interix3*) - # not ELF - DLL_FLAGS="-shared" ---- arj-3.10.22/arjcrypt.c -+++ arj-3.10.22/arjcrypt.c -@@ -329,6 +329,13 @@ - } - #endif - -+#if defined(__APPLE__) -+int main() -+{ -+ return(0); -+} -+#endif -+ - /* External entry */ - - #if TARGET==DOS diff --git a/app-arch/arj/files/arj-3.10.22-glibc2.10.patch b/app-arch/arj/files/arj-3.10.22-glibc2.10.patch deleted file mode 100644 index 4de45e1ea568..000000000000 --- a/app-arch/arj/files/arj-3.10.22-glibc2.10.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN arj-3.10.22.orig/fardata.c arj-3.10.22/fardata.c ---- arj-3.10.22.orig/fardata.c 2004-04-17 04:39:42.000000000 -0700 -+++ arj-3.10.22/fardata.c 2009-05-27 19:21:42.000000000 -0700 -@@ -13,7 +13,7 @@ - /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp - correctly */ - #if SFX_LEVEL>=ARJ -- #define CUSTOM_PRINTF -+/* #define CUSTOM_PRINTF */ - #define CHUNK_SIZE 512 /* Size of the output block */ - #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */ - #endif diff --git a/app-arch/arj/files/arj-3.10.22-implicit-declarations.patch b/app-arch/arj/files/arj-3.10.22-implicit-declarations.patch deleted file mode 100644 index a23429e7bd99..000000000000 --- a/app-arch/arj/files/arj-3.10.22-implicit-declarations.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up arj-3.10.22/environ.c~ arj-3.10.22/environ.c ---- arj-3.10.22/environ.c~ 2008-03-31 15:19:36.000000000 +0200 -+++ arj-3.10.22/environ.c 2008-03-31 15:19:36.000000000 +0200 -@@ -12,6 +12,8 @@ - #include <conio.h> - #include <io.h> - #include <process.h> -+#else -+#include <sys/wait.h> - #endif - - #include <fcntl.h> -diff -up arj-3.10.22/arjsfx.c~ arj-3.10.22/arjsfx.c ---- arj-3.10.22/arjsfx.c~ 2008-03-31 15:17:45.000000000 +0200 -+++ arj-3.10.22/arjsfx.c 2008-03-31 15:17:45.000000000 +0200 -@@ -5,6 +5,7 @@ - * - */ - -+#define _GNU_SOURCE - #include <stdio.h> - #include <signal.h> - -diff -up arj-3.10.22/arj.c~ arj-3.10.22/arj.c ---- arj-3.10.22/arj.c~ 2008-03-31 15:17:14.000000000 +0200 -+++ arj-3.10.22/arj.c 2008-03-31 15:17:14.000000000 +0200 -@@ -5,6 +5,7 @@ - * - */ - -+#define _GNU_SOURCE - #include <stdio.h> - #include <signal.h>
\ No newline at end of file diff --git a/app-arch/arj/files/arj-3.10.22-interix.patch b/app-arch/arj/files/arj-3.10.22-interix.patch deleted file mode 100644 index 8294f1e96bb4..000000000000 --- a/app-arch/arj/files/arj-3.10.22-interix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ru arj-3.10.22.orig/environ.c arj-3.10.22/environ.c ---- arj-3.10.22.orig/environ.c 2008-03-30 16:51:40 +0200 -+++ arj-3.10.22/environ.c 2008-03-30 16:50:16 +0200 -@@ -61,7 +61,7 @@ - #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) - #include <sys/param.h> - #include <sys/mount.h> -- #elif defined(__QNXNTO__) -+ #elif defined(__QNXNTO__) || defined(__INTERIX) - #include <sys/statvfs.h> - #else - #include <sys/statfs.h> -@@ -2286,7 +2286,7 @@ - else - return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu); - #elif TARGET==UNIX -- #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS) -+ #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX) - struct statvfs vfs; - - if(statvfs(name, &vfs)==-1) -@@ -3802,7 +3802,9 @@ - #elif TARGET==WIN32 - return(0); - #elif TARGET==UNIX -+ #ifndef __INTERIX - sync(); -+ #endif - return(0); - #endif - } -diff -ru arj-3.10.22.orig/gnu/configure.in arj-3.10.22/gnu/configure.in ---- arj-3.10.22.orig/gnu/configure.in 2008-03-30 16:51:40 +0200 -+++ arj-3.10.22/gnu/configure.in 2008-03-30 16:41:37 +0200 -@@ -67,8 +67,9 @@ - DLL_EXT=".dylib" - DLL_FLAGS="" - ;; --interix3*) -+interix*) - # not ELF -+ DYN_LIBS="-ldl" - DLL_FLAGS="-shared" - DLL_CFLAGS="" - ;; |