diff options
author | Suren A. Chilingaryan <csa@suren.me> | 2019-09-01 00:00:32 +0200 |
---|---|---|
committer | Suren A. Chilingaryan <csa@suren.me> | 2019-09-01 00:00:32 +0200 |
commit | ca9627e70852f6b2e835660df870fe3ab405882d (patch) | |
tree | 0a008b1d5b16fa0679a195ed7b5662c7891f591c /app-arch/unrar/files | |
download | darklin4-ca9627e70852f6b2e835660df870fe3ab405882d.tar.gz darklin4-ca9627e70852f6b2e835660df870fe3ab405882d.tar.bz2 darklin4-ca9627e70852f6b2e835660df870fe3ab405882d.tar.xz darklin4-ca9627e70852f6b2e835660df870fe3ab405882d.zip |
Initial import
Diffstat (limited to 'app-arch/unrar/files')
-rw-r--r-- | app-arch/unrar/files/ftello_unrar_fix.patch | 16 | ||||
-rw-r--r-- | app-arch/unrar/files/unrar-3.4.3_fix.patch | 71 | ||||
-rw-r--r-- | app-arch/unrar/files/unrar-3.5.3_fix.patch | 60 |
3 files changed, 147 insertions, 0 deletions
diff --git a/app-arch/unrar/files/ftello_unrar_fix.patch b/app-arch/unrar/files/ftello_unrar_fix.patch new file mode 100644 index 0000000..a5f0d62 --- /dev/null +++ b/app-arch/unrar/files/ftello_unrar_fix.patch @@ -0,0 +1,16 @@ +diff -ruN unrar.orig/dll.cpp unrar/dll.cpp +--- unrar.orig/dll.cpp 2005-08-03 20:34:30.000000000 +0400 ++++ unrar/dll.cpp 2006-01-11 12:13:33.000000000 +0300 +@@ -271,8 +271,10 @@ + strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T"); + Data->Cmd.Test=Operation!=RAR_EXTRACT; + bool Repeat=false; +- Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat); +- ++ ++ if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false) ++ return (ERAR_UNKNOWN); ++ + while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD) + { + Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat); diff --git a/app-arch/unrar/files/unrar-3.4.3_fix.patch b/app-arch/unrar/files/unrar-3.4.3_fix.patch new file mode 100644 index 0000000..aaa768e --- /dev/null +++ b/app-arch/unrar/files/unrar-3.4.3_fix.patch @@ -0,0 +1,71 @@ +diff -ruN unrar.orig/consio.hpp unrar/consio.hpp +--- unrar.orig/consio.hpp 2004-09-08 17:57:20.000000000 +0400 ++++ unrar/consio.hpp 2004-10-22 10:43:08.000000000 +0400 +@@ -21,12 +21,16 @@ + void OutComment(char *Comment,int Size); + + #ifdef SILENT ++/* + inline void mprintf(const char *fmt,const char *a=NULL,const char *b=NULL) {} + inline void eprintf(const char *fmt,const char *a=NULL,const char *b=NULL) {} + inline void mprintf(const char *fmt,int b) {} + inline void eprintf(const char *fmt,int b) {} + inline void mprintf(const char *fmt,const char *a,int b) {} + inline void eprintf(const char *fmt,const char *a,int b) {} ++*/ ++inline void mprintf(const char *fmt,...) {} ++inline void eprintf(const char *fmt,...) {} + inline void Alarm() {} + inline void GetPasswordText(char *Str,int MaxLength) {} + inline unsigned int GetKey() {return(0);} +diff -ruN unrar.orig/dll.hpp unrar/dll.hpp +--- unrar.orig/dll.hpp 2004-09-08 17:57:20.000000000 +0400 ++++ unrar/dll.hpp 2004-10-22 10:43:08.000000000 +0400 +@@ -26,13 +26,13 @@ + + #define RAR_DLL_VERSION 4 + +-#ifdef _UNIX ++//#ifdef _UNIX + #define CALLBACK + #define PASCAL + #define LONG long + #define HANDLE void * + #define UINT unsigned int +-#endif ++//#endif + + struct RARHeaderData + { +diff -ruN unrar.orig/makefile.unix unrar/makefile.unix +--- unrar.orig/makefile.unix 2004-07-26 11:57:26.000000000 +0400 ++++ unrar/makefile.unix 2004-10-22 10:44:09.000000000 +0400 +@@ -7,9 +7,10 @@ + + # Linux using GCC + CXX=g++ +-CXXFLAGS=-O2 +-DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE ++CXXFLAGS=-O2 -fPIC -DPIC ++DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DGUI -DSILENT + STRIP=strip ++RANLIB=ranlib + + # Linux using LCC + #CXX=lcc +@@ -114,6 +115,12 @@ + $(STRIP) default.sfx + + lib: WHAT=RARDLL +-lib: $(OBJECTS) $(LIB_OBJ) +- @rm -f libunrar.so +- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) ++lib: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ @rm -f libunrar3.so ++ $(LINK) -shared -o libunrar3.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ ++liba: WHAT=RARDLL ++liba: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ @rm -f libunrar3.a ++ $(AR) rc libunrar3.a $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ $(RANLIB) libunrar3.a diff --git a/app-arch/unrar/files/unrar-3.5.3_fix.patch b/app-arch/unrar/files/unrar-3.5.3_fix.patch new file mode 100644 index 0000000..aedb98c --- /dev/null +++ b/app-arch/unrar/files/unrar-3.5.3_fix.patch @@ -0,0 +1,60 @@ +diff -ruN unrar.orig/makefile.unix unrar/makefile.unix +--- unrar.orig/makefile.unix 2005-04-30 11:00:12.000000000 +0400 ++++ unrar/makefile.unix 2005-05-19 16:13:53.000000000 +0400 +@@ -7,9 +7,10 @@ + + # Linux using GCC + CXX=g++ +-CXXFLAGS=-O2 +-DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE ++CXXFLAGS=-O2 -fPIC -DPIC ++DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DGUI -DSILENT + STRIP=strip ++RANLIB=ranlib + + # Linux using LCC + #CXX=lcc +@@ -86,7 +87,7 @@ + LINK=$(CXX) + + UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o +-LIB_OBJ=filestr.o scantree.o dll.o ++LIB_OBJ=dll.o + + OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \ + archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \ +@@ -114,6 +115,12 @@ + $(STRIP) default.sfx + + lib: WHAT=RARDLL +-lib: $(OBJECTS) $(LIB_OBJ) +- @rm -f libunrar.so +- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) ++lib: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ @rm -f libunrar3.so ++ $(LINK) -shared -o libunrar3.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ ++liba: WHAT=RARDLL ++liba: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ @rm -f libunrar3.a ++ $(AR) rc libunrar3.a $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ $(RANLIB) libunrar3.a +diff -ruN unrar.orig/dll.hpp unrar/dll.hpp +--- unrar.orig/dll.hpp 2004-09-08 17:57:20.000000000 +0400 ++++ unrar/dll.hpp 2004-10-22 10:43:08.000000000 +0400 +@@ -26,13 +26,13 @@ + + #define RAR_DLL_VERSION 4 + +-#ifdef _UNIX ++//#ifdef _UNIX + #define CALLBACK + #define PASCAL + #define LONG long + #define HANDLE void * + #define UINT unsigned int +-#endif ++//#endif + + struct RARHeaderData + { |