From 7a514ac190e56eaa886431c8962720af999d774f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 12 Oct 2015 01:22:41 -0300 Subject: doublecmd: update libre.patch --- libre/doublecmd/PKGBUILD | 2 +- libre/doublecmd/libre.patch | 248 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 209 insertions(+), 41 deletions(-) diff --git a/libre/doublecmd/PKGBUILD b/libre/doublecmd/PKGBUILD index 7d09320cc..c334784a7 100644 --- a/libre/doublecmd/PKGBUILD +++ b/libre/doublecmd/PKGBUILD @@ -110,5 +110,5 @@ mksha256sums=('40172d410b7f37608e702edcb36bdaf3b13ae65f065bf01bc99082c0b01f8610' sha256sums=('69bb7c14ba0b2477ee0c80c7eb4902fc4a6af98445487b6f41ddda7b676f35f4' 'd50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39' '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20' - '0575053fadc51453ad2a491d8cd05e0232b883ce44031e92fb55d50b875395d3' + 'a23303f1719be08a59038ce7a256d582868cdd3e19cda2537c4a23d3480a40f9' '62bc9fd628ca8dc11446f2f3b44ebf86bbf1776a7e8def11fbeb77589e9a5a6e') diff --git a/libre/doublecmd/libre.patch b/libre/doublecmd/libre.patch index 97fa697e1..e9fa4604f 100644 --- a/libre/doublecmd/libre.patch +++ b/libre/doublecmd/libre.patch @@ -1,6 +1,6 @@ -diff -Nur doublecmd-0.6.0.orig/clean.bat doublecmd-0.6.0/clean.bat ---- doublecmd-0.6.0.orig/clean.bat 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/clean.bat 2015-02-11 02:09:39.165026926 -0200 +diff -Nur doublecmd-0.6.6.orig/clean.bat doublecmd-0.6.6/clean.bat +--- doublecmd-0.6.6.orig/clean.bat 2013-03-02 06:11:56.000000000 -0200 ++++ doublecmd-0.6.6/clean.bat 2015-10-12 00:42:35.563106419 -0300 @@ -22,7 +22,6 @@ @del /Q /S plugins\wcx\lzma\lib\*.* @del /Q /S plugins\wcx\rpm\lib\*.* @@ -32,9 +32,9 @@ diff -Nur doublecmd-0.6.0.orig/clean.bat doublecmd-0.6.0/clean.bat -@echo Done. \ No newline at end of file +@echo Done. -diff -Nur doublecmd-0.6.0.orig/doublecmd.ext.example doublecmd-0.6.0/doublecmd.ext.example ---- doublecmd-0.6.0.orig/doublecmd.ext.example 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/doublecmd.ext.example 2015-02-11 02:09:39.165026926 -0200 +diff -Nur doublecmd-0.6.6.orig/doublecmd.ext.example doublecmd-0.6.6/doublecmd.ext.example +--- doublecmd-0.6.6.orig/doublecmd.ext.example 2011-07-10 14:42:16.000000000 -0300 ++++ doublecmd-0.6.6/doublecmd.ext.example 2015-10-12 00:42:35.563106419 -0300 @@ -236,13 +236,6 @@ Extract={!SHELL} lharc x %f '*' #Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi @@ -75,9 +75,9 @@ diff -Nur doublecmd-0.6.0.orig/doublecmd.ext.example doublecmd-0.6.0/doublecmd.e # Source RPMs (SuSE uses *.spm, others use *.src.rpm) [spm|srcm] Open={!VFS} -diff -Nur doublecmd-0.6.0.orig/install/darwin/install.sh doublecmd-0.6.0/install/darwin/install.sh ---- doublecmd-0.6.0.orig/install/darwin/install.sh 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/install/darwin/install.sh 2015-02-11 02:09:39.168360283 -0200 +diff -Nur doublecmd-0.6.6.orig/install/darwin/install.sh doublecmd-0.6.6/install/darwin/install.sh +--- doublecmd-0.6.6.orig/install/darwin/install.sh 2014-11-15 16:05:41.000000000 -0200 ++++ doublecmd-0.6.6/install/darwin/install.sh 2015-10-12 00:42:35.563106419 -0300 @@ -17,7 +17,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb @@ -94,16 +94,16 @@ diff -Nur doublecmd-0.6.0.orig/install/darwin/install.sh doublecmd-0.6.0/install install -m 644 plugins/wcx/zip/lib/zip.wcx $DC_INSTALL_DIR/plugins/wcx/zip/ # WDX install -m 644 plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx $DC_INSTALL_DIR/plugins/wdx/rpm_wdx/ -diff -Nur doublecmd-0.6.0.orig/install/darwin/lib/readme.txt doublecmd-0.6.0/install/darwin/lib/readme.txt ---- doublecmd-0.6.0.orig/install/darwin/lib/readme.txt 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/install/darwin/lib/readme.txt 2015-02-11 02:09:39.168360283 -0200 +diff -Nur doublecmd-0.6.6.orig/install/darwin/lib/readme.txt doublecmd-0.6.6/install/darwin/lib/readme.txt +--- doublecmd-0.6.6.orig/install/darwin/lib/readme.txt 2012-08-19 12:11:56.000000000 -0300 ++++ doublecmd-0.6.6/install/darwin/lib/readme.txt 2015-10-12 00:42:35.563106419 -0300 @@ -1,2 +1 @@ Before create packages (before run create_packages.mac) copy in this directory third-party libraries: -- libunrar.dylib - needed for unrar plugin \ No newline at end of file -diff -Nur doublecmd-0.6.0.orig/install/linux/install.sh doublecmd-0.6.0/install/linux/install.sh ---- doublecmd-0.6.0.orig/install/linux/install.sh 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/install/linux/install.sh 2015-02-11 02:09:39.168360283 -0200 +diff -Nur doublecmd-0.6.6.orig/install/linux/install.sh doublecmd-0.6.6/install/linux/install.sh +--- doublecmd-0.6.6.orig/install/linux/install.sh 2015-06-13 05:30:48.000000000 -0300 ++++ doublecmd-0.6.6/install/linux/install.sh 2015-10-12 00:42:35.563106419 -0300 @@ -49,7 +49,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb @@ -120,18 +120,18 @@ diff -Nur doublecmd-0.6.0.orig/install/linux/install.sh doublecmd-0.6.0/install/ install -m 644 plugins/wcx/zip/lib/zip.wcx $DC_INSTALL_DIR/plugins/wcx/zip/ # WDX install -m 644 plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx $DC_INSTALL_DIR/plugins/wdx/rpm_wdx/ -diff -Nur doublecmd-0.6.0.orig/install/linux/lib/readme.txt doublecmd-0.6.0/install/linux/lib/readme.txt ---- doublecmd-0.6.0.orig/install/linux/lib/readme.txt 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/install/linux/lib/readme.txt 2015-02-11 02:09:39.168360283 -0200 +diff -Nur doublecmd-0.6.6.orig/install/linux/lib/readme.txt doublecmd-0.6.6/install/linux/lib/readme.txt +--- doublecmd-0.6.6.orig/install/linux/lib/readme.txt 2012-08-19 12:11:56.000000000 -0300 ++++ doublecmd-0.6.6/install/linux/lib/readme.txt 2015-10-12 00:42:35.563106419 -0300 @@ -1,3 +1,2 @@ Before create packages (before run create_packages.sh) copy in this directory third-party libraries: -- libunrar.so - needed for unrar plugin -- libqt4intf.so - needed for qt4 version of Double Commander \ No newline at end of file +- libqt4intf.so - needed for qt4 version of Double Commander -diff -Nur doublecmd-0.6.0.orig/install/windows/install.bat doublecmd-0.6.0/install/windows/install.bat ---- doublecmd-0.6.0.orig/install/windows/install.bat 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/install/windows/install.bat 2015-02-11 02:17:31.728521613 -0200 +diff -Nur doublecmd-0.6.6.orig/install/windows/install.bat doublecmd-0.6.6/install/windows/install.bat +--- doublecmd-0.6.6.orig/install/windows/install.bat 2015-01-12 17:43:57.000000000 -0200 ++++ doublecmd-0.6.6/install/windows/install.bat 2015-10-12 00:42:35.563106419 -0300 @@ -12,7 +12,6 @@ mkdir %DC_INSTALL_DIR%\plugins\wcx\deb mkdir %DC_INSTALL_DIR%\plugins\wcx\rpm @@ -148,16 +148,16 @@ diff -Nur doublecmd-0.6.0.orig/install/windows/install.bat doublecmd-0.6.0/insta copy plugins\wcx\zip\lib\zip.wcx %DC_INSTALL_DIR%\plugins\wcx\zip\ rem WDX copy plugins\wdx\rpm_wdx\lib\rpm_wdx.wdx %DC_INSTALL_DIR%\plugins\wdx\rpm_wdx\ -diff -Nur doublecmd-0.6.0.orig/install/windows/lib/readme.txt doublecmd-0.6.0/install/windows/lib/readme.txt ---- doublecmd-0.6.0.orig/install/windows/lib/readme.txt 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/install/windows/lib/readme.txt 2015-02-11 02:09:39.168360283 -0200 +diff -Nur doublecmd-0.6.6.orig/install/windows/lib/readme.txt doublecmd-0.6.6/install/windows/lib/readme.txt +--- doublecmd-0.6.6.orig/install/windows/lib/readme.txt 2012-08-19 12:11:56.000000000 -0300 ++++ doublecmd-0.6.6/install/windows/lib/readme.txt 2015-10-12 00:42:35.563106419 -0300 @@ -1,2 +1 @@ Before create packages (before run create_packages.bat) copy in this directory third-party libraries: -- unrar.dll - needed for unrar plugin \ No newline at end of file -diff -Nur doublecmd-0.6.0.orig/multiarc.ini doublecmd-0.6.0/multiarc.ini ---- doublecmd-0.6.0.orig/multiarc.ini 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/multiarc.ini 2015-02-11 02:11:23.775797782 -0200 +diff -Nur doublecmd-0.6.6.orig/multiarc.ini doublecmd-0.6.6/multiarc.ini +--- doublecmd-0.6.6.orig/multiarc.ini 2015-03-03 18:01:15.000000000 -0200 ++++ doublecmd-0.6.6/multiarc.ini 2015-10-12 00:42:35.563106419 -0300 @@ -37,89 +37,6 @@ Output=0 Debug=0 @@ -248,9 +248,9 @@ diff -Nur doublecmd-0.6.0.orig/multiarc.ini doublecmd-0.6.0/multiarc.ini [TXZ] Archiver=tar Description=Compressed tar file (tar.xz) -diff -Nur doublecmd-0.6.0.orig/plugins/build.bat doublecmd-0.6.0/plugins/build.bat ---- doublecmd-0.6.0.orig/plugins/build.bat 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/plugins/build.bat 2015-02-11 02:15:27.420933227 -0200 +diff -Nur doublecmd-0.6.6.orig/plugins/build.bat doublecmd-0.6.6/plugins/build.bat +--- doublecmd-0.6.6.orig/plugins/build.bat 2015-01-12 17:43:57.000000000 -0200 ++++ doublecmd-0.6.6/plugins/build.bat 2015-10-12 00:42:35.563106419 -0300 @@ -13,7 +13,6 @@ lazbuild wcx\deb\src\deb.lpi %DC_ARCH% lazbuild wcx\rpm\src\rpm.lpi %DC_ARCH% @@ -259,9 +259,9 @@ diff -Nur doublecmd-0.6.0.orig/plugins/build.bat doublecmd-0.6.0/plugins/build.b lazbuild wcx\zip\src\zip.lpi %DC_ARCH% rem WDX plugins -diff -Nur doublecmd-0.6.0.orig/plugins/build.sh doublecmd-0.6.0/plugins/build.sh ---- doublecmd-0.6.0.orig/plugins/build.sh 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/plugins/build.sh 2015-02-11 02:09:39.168360283 -0200 +diff -Nur doublecmd-0.6.6.orig/plugins/build.sh doublecmd-0.6.6/plugins/build.sh +--- doublecmd-0.6.6.orig/plugins/build.sh 2015-01-02 13:06:45.000000000 -0200 ++++ doublecmd-0.6.6/plugins/build.sh 2015-10-12 00:42:35.563106419 -0300 @@ -15,7 +15,6 @@ $lazbuild wcx/cpio/src/cpio.lpi $DC_ARCH $lazbuild wcx/deb/src/deb.lpi $DC_ARCH @@ -270,9 +270,159 @@ diff -Nur doublecmd-0.6.0.orig/plugins/build.sh doublecmd-0.6.0/plugins/build.sh $lazbuild wcx/zip/src/Zip.lpi $DC_ARCH # WDX plugins -diff -Nur doublecmd-0.6.0.orig/plugins/wcx/zip/lzma/Methods.txt doublecmd-0.6.0/plugins/wcx/zip/lzma/Methods.txt ---- doublecmd-0.6.0.orig/plugins/wcx/zip/lzma/Methods.txt 1989-12-31 22:00:00.000000000 -0200 -+++ doublecmd-0.6.0/plugins/wcx/zip/lzma/Methods.txt 2015-02-11 02:09:45.885075770 -0200 +diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas doublecmd-0.6.6/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas +--- doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas 2015-05-01 05:03:02.000000000 -0300 ++++ doublecmd-0.6.6/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas 2015-10-12 01:15:43.454754161 -0300 +@@ -50,10 +50,6 @@ + RsCompressionBZip2Name = 'BZIP2 format'; + RsCompressionBZip2Extensions = '*.bz2;*.bzip2;*.tbz2;*.tbz'; + RsCompressionBZip2SubExtensions = '.tbz2=.tar;.tbz=.tar'; +- RsCompressionRarName = 'RAR format'; +- RsCompressionRarExtensions = '*.rar;*.r00'; +- RsCompressionArjName = 'ARJ format'; +- RsCompressionArjExtensions = '*.arj'; + RsCompressionZName = 'Z format'; + RsCompressionZExtensions = '*.z;*.taz'; + RsCompressionZSubExtensions = '.taz=.tar'; +diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas doublecmd-0.6.6/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas +--- doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas 2015-09-07 09:12:21.000000000 -0300 ++++ doublecmd-0.6.6/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas 2015-10-12 01:15:16.399385454 -0300 +@@ -122,8 +122,6 @@ + | | + | |-- TJclZipDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ + | |-- TJclBZ2DecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ +- | |-- TJclRarDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ +- | |-- TJclArjDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ + | |-- TJclZDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ + | |-- TJclLzhDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ + | |-- TJcl7zDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ +@@ -1490,22 +1488,6 @@ + procedure SetNumberOfThreads(Value: Cardinal); + end; + +- TJclRarDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface) +- public +- class function MultipleItemContainer: Boolean; override; +- class function ArchiveExtensions: string; override; +- class function ArchiveName: string; override; +- class function ArchiveCLSID: TGUID; override; +- end; +- +- TJclArjDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface) +- public +- class function MultipleItemContainer: Boolean; override; +- class function ArchiveExtensions: string; override; +- class function ArchiveName: string; override; +- class function ArchiveCLSID: TGUID; override; +- end; +- + TJclZDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface) + public + class function MultipleItemContainer: Boolean; override; +@@ -4356,8 +4338,6 @@ + // register decompression archives + RegisterFormat(TJclZipDecompressArchive); + RegisterFormat(TJclBZ2DecompressArchive); +- RegisterFormat(TJclRarDecompressArchive); +- RegisterFormat(TJclArjDecompressArchive); + RegisterFormat(TJclZDecompressArchive); + RegisterFormat(TJclLzhDecompressArchive); + RegisterFormat(TJcl7zDecompressArchive); +@@ -7923,50 +7903,6 @@ + FNumberOfThreads := Value; + end; + +-//=== { TJclRarDecompressArchive } =========================================== +- +-class function TJclRarDecompressArchive.ArchiveExtensions: string; +-begin +- Result := LoadResString(@RsCompressionRarExtensions); +-end; +- +-class function TJclRarDecompressArchive.ArchiveName: string; +-begin +- Result := LoadResString(@RsCompressionRarName); +-end; +- +-class function TJclRarDecompressArchive.ArchiveCLSID: TGUID; +-begin +- Result := CLSID_CFormatRar; +-end; +- +-class function TJclRarDecompressArchive.MultipleItemContainer: Boolean; +-begin +- Result := True; +-end; +- +-//=== { TJclArjDecompressArchive } =========================================== +- +-class function TJclArjDecompressArchive.ArchiveExtensions: string; +-begin +- Result := LoadResString(@RsCompressionArjExtensions); +-end; +- +-class function TJclArjDecompressArchive.ArchiveName: string; +-begin +- Result := LoadResString(@RsCompressionArjName); +-end; +- +-class function TJclArjDecompressArchive.ArchiveCLSID: TGUID; +-begin +- Result := CLSID_CFormatArj; +-end; +- +-class function TJclArjDecompressArchive.MultipleItemContainer: Boolean; +-begin +- Result := True; +-end; +- + //=== { TJclZDecompressArchive } ============================================= + + class function TJclZDecompressArchive.ArchiveExtensions: string; +diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas doublecmd-0.6.6/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas +--- doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas 2015-05-01 05:03:02.000000000 -0300 ++++ doublecmd-0.6.6/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas 2015-10-12 01:11:49.932620714 -0300 +@@ -22,20 +22,6 @@ + { library; if not, write to } + { the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } + { } +-{ unRAR restriction } +-{ ----------------- } +-{ } +-{ The decompression engine for RAR archives was developed using source code of unRAR program. } +-{ All copyrights to original unRAR code are owned by Alexander Roshal. } +-{ } +-{ The license for original unRAR code has the following restriction: } +-{ } +-{ The unRAR sources cannot be used to re-create the RAR compression algorithm, } +-{ which is proprietary. Distribution of modified unRAR sources in separate form } +-{ or as a part of other software is permitted, provided that it is clearly } +-{ stated in the documentation and source comments that the code may } +-{ not be used to develop a RAR (WinRAR) compatible archiver. } +-{ } + {**************************************************************************************************} + { } + { Translation 2007-2008 Florent Ouchet for the JEDI Code Library } +@@ -91,16 +77,11 @@ + CLSID_CCodecDEFREG : TGUID = '{23170F69-40C1-2790-0801-040000000000}'; // deflate register 040108 + CLSID_CCodecLZMA : TGUID = '{23170F69-40C1-2790-0101-030000000000}'; // lzma 030101 + CLSID_CCodecPPMD : TGUID = '{23170F69-40C1-2790-0104-030000000000}'; // ppmd 030401 +- CLSID_CCodecRAR1 : TGUID = '{23170F69-40C1-2790-0103-040000000000}'; // rar1 040301 +- CLSID_CCodecRAR2 : TGUID = '{23170F69-40C1-2790-0203-040000000000}'; // rar2 040302 +- CLSID_CCodecRAR3 : TGUID = '{23170F69-40C1-2790-0303-040000000000}'; // rar3 040303 + CLSID_CAESCodec : TGUID = '{23170F69-40C1-2790-0107-F10600000000}'; // AES 06F10701 + + CLSID_CArchiveHandler : TGUID = '{23170F69-40C1-278A-1000-000110000000}'; + CLSID_CFormatZip : TGUID = '{23170F69-40C1-278A-1000-000110010000}'; + CLSID_CFormatBZ2 : TGUID = '{23170F69-40C1-278A-1000-000110020000}'; +- CLSID_CFormatRar : TGUID = '{23170F69-40C1-278A-1000-000110030000}'; +- CLSID_CFormatArj : TGUID = '{23170F69-40C1-278A-1000-000110040000}'; + CLSID_CFormatZ : TGUID = '{23170F69-40C1-278A-1000-000110050000}'; + CLSID_CFormatLzh : TGUID = '{23170F69-40C1-278A-1000-000110060000}'; + CLSID_CFormat7z : TGUID = '{23170F69-40C1-278A-1000-000110070000}'; +diff -Nur doublecmd-0.6.6.orig/plugins/wcx/zip/lzma/Methods.txt doublecmd-0.6.6/plugins/wcx/zip/lzma/Methods.txt +--- doublecmd-0.6.6.orig/plugins/wcx/zip/lzma/Methods.txt 2012-08-19 12:11:56.000000000 -0300 ++++ doublecmd-0.6.6/plugins/wcx/zip/lzma/Methods.txt 2015-10-12 00:42:35.563106419 -0300 @@ -73,13 +73,6 @@ 12 - BZip2 (not used). Use {04 02 02} instead 02 - BZip @@ -306,18 +456,36 @@ diff -Nur doublecmd-0.6.0.orig/plugins/wcx/zip/lzma/Methods.txt doublecmd-0.6.0/ 07 - 7z 01 - SHA-256 Password Hashing -diff -Nur doublecmd-0.6.5.orig/src/platform/udefaultplugins.pas doublecmd-0.6.5/src/platform/udefaultplugins.pas ---- doublecmd-0.6.5.orig/src/platform/udefaultplugins.pas 2015-08-12 15:40:55.000000000 -0300 -+++ doublecmd-0.6.5/src/platform/udefaultplugins.pas 2015-09-12 18:17:31.253684044 -0300 -@@ -251,12 +251,6 @@ +diff -Nur doublecmd-0.6.6.orig/src/platform/udefaultplugins.pas doublecmd-0.6.6/src/platform/udefaultplugins.pas +--- doublecmd-0.6.6.orig/src/platform/udefaultplugins.pas 2015-09-26 14:02:18.000000000 -0300 ++++ doublecmd-0.6.6/src/platform/udefaultplugins.pas 2015-10-12 01:12:57.716037187 -0300 +@@ -170,10 +170,6 @@ + gWCXPlugins.FileName[I]:= Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx'; + end; + +- I:= gWCXPlugins.IndexOfName('arj'); +- if I < 0 then +- gWCXPlugins.Add('arj', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx'); +- + I:= gWCXPlugins.IndexOfName('cab'); + if I < 0 then + gWCXPlugins.Add('cab', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx'); +@@ -253,19 +249,6 @@ else gWCXPlugins.Flags[I]:= 4; - I:= gWCXPlugins.IndexOfName('rar'); +- {$IF DEFINED(MSWINDOWS)} +- if I < 0 then +- gWCXPlugins.Add('rar', 607, Folder + 'unrar' + PathDelim + 'unrar.wcx') +- else +- gWCXPlugins.Flags[I]:= 607; +- {$ELSE} - if I < 0 then - gWCXPlugins.Add('rar', 68, Folder + 'unrar' + PathDelim + 'unrar.wcx') - else - gWCXPlugins.Flags[I]:= 68; +- {$ENDIF} - // Wdx plugins Folder:= '%commander_path%' + PathDelim + 'plugins' + PathDelim + 'wdx' + PathDelim; -- cgit v1.2.3