You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
p7zip/p7zip_4.65-norar.patch

103 lines
3.1 KiB

16 years ago
diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile
--- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-02-09 21:47:24.000000000 +0100
+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile 2009-04-12 20:47:44.973127047 +0200
@@ -172,14 +172,6 @@ NSIS_OBJS = \
NsisIn.o \
NsisRegister.o \
-RAR_OBJS = \
- RarHandler.o \
- RarHeader.o \
- RarIn.o \
- RarItem.o \
- RarVolumeInStream.o \
- RarRegister.o \
-
# SplitHandlerOut.o
SPLIT_OBJS = \
SplitHandler.o \
@@ -257,13 +249,6 @@ COMPRESS_OBJS = \
ZlibDecoder.o \
ZDecoder.o \
-COMPRESS_OBJS_NON_FREE = \
- Rar1Decoder.o \
- Rar2Decoder.o \
- Rar3Decoder.o \
- Rar3Vm.o \
- RarCodecsRegister.o \
-
CRYPTO_OBJS = \
7zAes.o \
7zAesRegister.o \
@@ -271,8 +256,6 @@ CRYPTO_OBJS = \
MyAes.o \
Pbkdf2HmacSha1.o \
RandGen.o \
- Rar20Crypto.o \
- RarAes.o \
Sha1.o \
WzAes.o \
ZipCrypto.o \
@@ -315,7 +298,6 @@ OBJS = \
$(LZH_OBJS) \
$(LZM_OBJS) \
$(NSIS_OBJS) \
- $(RAR_OBJS) \
$(SPLIT_OBJS) \
$(TAR_OBJS) \
$(UDF_OBJS) \
diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list
--- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-02-09 21:04:32.000000000 +0100
+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-04-12 20:47:04.713126284 +0200
@@ -141,13 +141,6 @@ SRCS=\
../../Archive/Nsis/NsisIn.cpp \
../../Archive/Nsis/NsisRegister.cpp \
\
- ../../Archive/Rar/RarHandler.cpp \
- ../../Archive/Rar/RarHeader.cpp \
- ../../Archive/Rar/RarIn.cpp \
- ../../Archive/Rar/RarItem.cpp \
- ../../Archive/Rar/RarVolumeInStream.cpp \
- ../../Archive/Rar/RarRegister.cpp \
- \
../../Archive/Split/SplitHandler.cpp \
../../Archive/Split/SplitRegister.cpp \
\
@@ -229,8 +222,6 @@ SRCS=\
../../Crypto/RandGen.cpp \
../../Crypto/Sha1.cpp \
../../Crypto/WzAes.cpp \
- ../../Crypto/Rar20Crypto.cpp \
- ../../Crypto/RarAes.cpp \
../../Crypto/ZipCrypto.cpp \
../../Crypto/ZipStrong.cpp
diff -Naupr p7zip_4.65.orig/makefile p7zip_4.65/makefile
--- p7zip_4.65.orig/makefile 2009-02-14 17:03:50.000000000 +0100
+++ p7zip_4.65/makefile 2009-04-12 20:48:21.342256593 +0200
@@ -41,7 +41,6 @@ depend:
cd CPP/7zip/UI/Client7z ; $(MAKE) depend
cd CPP/7zip/UI/Console ; $(MAKE) depend
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
- cd CPP/7zip/Compress/Rar ; $(MAKE) depend
cd CPP/7zip/UI/GUI ; $(MAKE) depend
sfx: common
@@ -51,7 +50,6 @@ sfx: common
common7z:common
$(MKDIR) bin/Codecs
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
- cd CPP/7zip/Compress/Rar ; $(MAKE) all
7z: common7z
cd CPP/7zip/UI/Console ; $(MAKE) all
@@ -71,7 +69,6 @@ clean:
cd CPP/7zip/UI/FileManager ; $(MAKE) clean
cd CPP/7zip/UI/GUI ; $(MAKE) clean
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
- cd CPP/7zip/Compress/Rar ; $(MAKE) clean
cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean
cd CPP/7zip/Compress/PPMD_Alone ; $(MAKE) clean
cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean