summaryrefslogtreecommitdiff
path: root/libre/doublecmd/libre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/doublecmd/libre.patch')
-rw-r--r--libre/doublecmd/libre.patch407
1 files changed, 407 insertions, 0 deletions
diff --git a/libre/doublecmd/libre.patch b/libre/doublecmd/libre.patch
new file mode 100644
index 000000000..83c017125
--- /dev/null
+++ b/libre/doublecmd/libre.patch
@@ -0,0 +1,407 @@
+diff --git a/clean.bat b/clean.bat
+index 910f591..0989998 100644
+--- a/clean.bat
++++ b/clean.bat
+@@ -22,7 +22,6 @@
+ @del /Q /S plugins\wcx\lzma\lib\*.*
+ @del /Q /S plugins\wcx\rpm\lib\*.*
+ @del /Q /S plugins\wcx\unbz2\lib\*.*
+-@del /Q /S plugins\wcx\unrar\lib\*.*
+ @del /Q /S plugins\wcx\zip\lib\*.*
+
+ @del /Q /S plugins\wdx\deb_wdx\lib\*.*
+@@ -45,7 +44,6 @@
+ @del /Q plugins\wcx\lzma\src\*.bak
+ @del /Q plugins\wcx\zip\src\*.bak
+ @del /Q plugins\wcx\unbz2\src\*.bak
+-@del /Q plugins\wcx\unrar\src\*.bak
+
+ @del /Q plugins\wcx\cpio\src\*.*~
+ @del /Q plugins\wcx\rpm\src\*.*~
+@@ -53,7 +51,6 @@
+ @del /Q plugins\wcx\lzma\src\*.*~
+ @del /Q plugins\wcx\zip\src\*.*~
+ @del /Q plugins\wcx\unbz2\src\*.*~
+-@del /Q plugins\wcx\unrar\src\*.*~
+
+ @echo Clean up components output directories
+
+@@ -66,4 +63,4 @@
+ @del /Q /S components\viewer\lib\*.*
+ @del /Q /S components\ZVDateTimeCtrls\lib\*.*
+
+-@echo Done.
+\ No newline at end of file
++@echo Done.
+diff --git a/doublecmd.ext.example b/doublecmd.ext.example
+index 24f4f9b..4e4307d 100644
+--- a/doublecmd.ext.example
++++ b/doublecmd.ext.example
+@@ -236,13 +236,6 @@ View={!VIEWER} <?lharc l %f?>
+ Extract={!SHELL} lharc x %f '*'
+ #Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi
+
+-# arj
+-[arj]
+-Open={!VFS}
+-View={!VIEWER} <?unarj l %p?>
+-Extract={!SHELL} unarj x %f '*'
+-#Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi
+-
+ # ha
+ [ha]
+ Open={!VFS}
+@@ -250,13 +243,6 @@ View={!VIEWER} <?ha lf %p?>
+ Extract={!SHELL} ha xy %f '*'
+ # Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I %f; fi
+
+-# rar
+-[rar|r00|r02|r02|r03|r04|r05|r06|r07|r08|r09]
+-Open={!VFS}
+-View={!VIEWER} <?rar v -c- %p?>
+-Extract={!SHELL} rar x -c- %f '*'
+-# Extract (with flags)=I=%{Enter any RAR flags:}; if test -n "$I";then rar x $I %f; fi
+-
+ #compress
+ [Z]
+ Open={!VFS}
+@@ -287,11 +273,6 @@ Open={!VFS}
+ View={!VIEWER} <?bzip -dc %f 2>/dev/null?>
+ Uncompress={!SHELL} bunzip %f
+
+-# ace
+-[ace]
+-Open={!VFS}
+-Uncompress={!SHELL} unace e %p
+-
+ # Source RPMs (SuSE uses *.spm, others use *.src.rpm)
+ [spm|srcm]
+ Open={!VFS}
+diff --git a/install/darwin/doublecmd.xml b/install/darwin/doublecmd.xml
+index 3fffe77..4c2b8a4 100644
+--- a/install/darwin/doublecmd.xml
++++ b/install/darwin/doublecmd.xml
+@@ -92,11 +92,6 @@
+ <Path>%commander_path%/plugins/wcx/rpm/rpm.wcx</Path>
+ <Flags>4</Flags>
+ </WcxPlugin>
+- <WcxPlugin Enabled="True">
+- <ArchiveExt>rar</ArchiveExt>
+- <Path>%commander_path%/plugins/wcx/unrar/unrar.wcx</Path>
+- <Flags>68</Flags>
+- </WcxPlugin>
+ </WcxPlugins>
+ <WdxPlugins>
+ <WdxPlugin>
+diff --git a/install/darwin/install.sh b/install/darwin/install.sh
+index 48ca896..db3093c 100755
+--- a/install/darwin/install.sh
++++ b/install/darwin/install.sh
+@@ -18,7 +18,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio
+ mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
+ mkdir -p $DC_INSTALL_DIR/plugins/wcx/lzma
+ mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
+-mkdir -p $DC_INSTALL_DIR/plugins/wcx/unrar
+ mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
+ # WDX plugins directories
+ mkdir -p $DC_INSTALL_DIR/plugins/wdx
+@@ -45,7 +44,6 @@ install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/
+ install -m 644 plugins/wcx/deb/lib/deb.wcx $DC_INSTALL_DIR/plugins/wcx/deb/
+ install -m 644 plugins/wcx/lzma/lib/lzma.wcx $DC_INSTALL_DIR/plugins/wcx/lzma/
+ install -m 644 plugins/wcx/rpm/lib/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/
+-install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
+ 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 --git a/install/darwin/lib/readme.txt b/install/darwin/lib/readme.txt
+index 5b81e6e..830ba48 100644
+--- a/install/darwin/lib/readme.txt
++++ b/install/darwin/lib/readme.txt
+@@ -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 --git a/install/linux/doublecmd.xml b/install/linux/doublecmd.xml
+index 8822d35..43a0e39 100644
+--- a/install/linux/doublecmd.xml
++++ b/install/linux/doublecmd.xml
+@@ -84,11 +84,6 @@
+ <Path>%commander_path%/plugins/wcx/rpm/rpm.wcx</Path>
+ <Flags>4</Flags>
+ </WcxPlugin>
+- <WcxPlugin Enabled="True">
+- <ArchiveExt>rar</ArchiveExt>
+- <Path>%commander_path%/plugins/wcx/unrar/unrar.wcx</Path>
+- <Flags>68</Flags>
+- </WcxPlugin>
+ </WcxPlugins>
+ <WdxPlugins>
+ <WdxPlugin>
+diff --git a/install/linux/install.sh b/install/linux/install.sh
+index a759335..2b19802 100755
+--- a/install/linux/install.sh
++++ b/install/linux/install.sh
+@@ -48,7 +48,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio
+ mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
+ mkdir -p $DC_INSTALL_DIR/plugins/wcx/lzma
+ mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
+-mkdir -p $DC_INSTALL_DIR/plugins/wcx/unrar
+ mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
+ # WDX plugins directories
+ mkdir -p $DC_INSTALL_DIR/plugins/wdx
+@@ -80,7 +79,6 @@ install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/
+ install -m 644 plugins/wcx/deb/lib/deb.wcx $DC_INSTALL_DIR/plugins/wcx/deb/
+ install -m 644 plugins/wcx/lzma/lib/lzma.wcx $DC_INSTALL_DIR/plugins/wcx/lzma/
+ install -m 644 plugins/wcx/rpm/lib/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/
+-install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
+ 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 --git a/install/linux/lib/readme.txt b/install/linux/lib/readme.txt
+index 901d6b4..54df3a8 100644
+--- a/install/linux/lib/readme.txt
++++ b/install/linux/lib/readme.txt
+@@ -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 --git a/install/windows/doublecmd.xml b/install/windows/doublecmd.xml
+index ad9b8c3..8105eef 100644
+--- a/install/windows/doublecmd.xml
++++ b/install/windows/doublecmd.xml
+@@ -72,11 +72,6 @@
+ <Path>%commander_path%\plugins\wcx\rpm\rpm.wcx</Path>
+ <Flags>4</Flags>
+ </WcxPlugin>
+- <WcxPlugin Enabled="True">
+- <ArchiveExt>rar</ArchiveExt>
+- <Path>%commander_path%\plugins\wcx\unrar\unrar.wcx</Path>
+- <Flags>68</Flags>
+- </WcxPlugin>
+ </WcxPlugins>
+ <WdxPlugins>
+ <WdxPlugin>
+diff --git a/install/windows/install.bat b/install/windows/install.bat
+index 5d55c99..ed32bf2 100644
+--- a/install/windows/install.bat
++++ b/install/windows/install.bat
+@@ -13,7 +13,6 @@ mkdir %DC_INSTALL_DIR%\plugins\wcx\cpio
+ mkdir %DC_INSTALL_DIR%\plugins\wcx\deb
+ mkdir %DC_INSTALL_DIR%\plugins\wcx\lzma
+ mkdir %DC_INSTALL_DIR%\plugins\wcx\rpm
+-mkdir %DC_INSTALL_DIR%\plugins\wcx\unrar
+ mkdir %DC_INSTALL_DIR%\plugins\wcx\zip
+ rem WDX plugins directories
+ mkdir %DC_INSTALL_DIR%\plugins\wdx
+@@ -45,7 +44,6 @@ copy plugins\wcx\cpio\lib\cpio.wcx %DC_INSTALL_DIR%\plugins\wcx\cpio\
+ copy plugins\wcx\deb\lib\deb.wcx %DC_INSTALL_DIR%\plugins\wcx\deb\
+ copy plugins\wcx\lzma\lib\lzma.wcx %DC_INSTALL_DIR%\plugins\wcx\lzma\
+ copy plugins\wcx\rpm\lib\rpm.wcx %DC_INSTALL_DIR%\plugins\wcx\rpm\
+-copy plugins\wcx\unrar\lib\unrar.wcx %DC_INSTALL_DIR%\plugins\wcx\unrar\
+ 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 --git a/install/windows/lib/readme.txt b/install/windows/lib/readme.txt
+index 3aa11d8..5223b9d 100644
+--- a/install/windows/lib/readme.txt
++++ b/install/windows/lib/readme.txt
+@@ -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 --git a/multiarc.ini b/multiarc.ini
+index 7cad464..a837e36 100644
+--- a/multiarc.ini
++++ b/multiarc.ini
+@@ -37,89 +37,6 @@ Enabled=0
+ Output=0
+ Debug=0
+
+-[ACE]
+-Archiver=ace
+-Description=ACE v2.0.4
+-Extension=ace
+-Start=^Date
+-End=^listed:
+-Format0=dd.tt.yy hh:mm ppppppppppp zzzzzzzzz nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+-List=%P v -y %AQA
+-Extract=%P x -y {-p%W} {%S} %AQA @%LQA
+-ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQA
+-Test=%P t -y %AQA
+-Delete=%P d -y %AQA @%LQA
+-Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQA
+-AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQA
+-Enabled=0
+-Output=0
+-Debug=0
+-
+-[ARJ]
+-Description=ARJ 3.15 by ARJ Software, Inc.
+-Archiver=arj
+-ID=60 EA
+-IDPos=0
+-Extension=arj
+-Start=^------------
+-End=^------------
+-Format0=* nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+-Format1=???????????? zzzzzzzzzz pppppppppp yy-tt-dd hh:mm:ss aaaaaa
+-Format2=?
+-Format3=?
+-List=%P v %AQA
+-Extract=%P x -y {-g%W} {%S} %AQA !%LQA
+-ExtractWithoutPath=%P e -y {-g%W} {%S} %AQA !%LQA
+-Test=%P t -y {%S} %AQA
+-Delete=%P d -y {%S} %AQA !%LQA
+-Add=%P a -y {-g%W} {-v%V} {%S} %AQA !%LQA
+-Enabled=0
+-Output=0
+-Debug=0
+-
+-[RAR]
+-Description=RAR 4.00 - http://www.rarlab.com
+-Extension=rar
+-Archiver=rar
+-Start=^------------
+-End=^------------
+-Format0=?nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+-Format1=zzzzzzzzzzzzzzzzzzzzzz pppppppp dd-tt-yy hh:mm aaaaaaa
+-List=%P v %AQA
+-Extract=%P x -y {-p%W} {%S} %AQA @%LQ
+-ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQ
+-Test=%P t -y {%S} %AQA
+-Delete=%P d -y {%S} %AQA @%LQ
+-Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQ
+-AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQ
+-PasswordQuery=Enter password
+-Enabled=0
+-Output=0
+-Debug=0
+-
+-[RAR (5)]
+-Archiver=rar
+-Description=RAR 5.x - http://www.rarlab.com
+-ID=52 61 72 21
+-IDPos=<SeekID>
+-IDSeekRange=
+-Extension=rar
+-Start=^-----------
+-End=^-----------
+-Format0=aaaaaaaaaaa zzzzzzzzz dd-tt-yy hh:mm nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+-List=%P l %AQA
+-Extract=%P x -y {-p%W} {%S} %AQA @%LQA
+-ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQA
+-Test=%P t -y {%S} %AQA
+-Delete=%P d -y {%S} %AQA @%LQA
+-Add=%P a -y {-p%W} {-v%V} {%S} %AQA @%LQA
+-AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQA @%LQA
+-PasswordQuery=Enter password
+-FormMode=0
+-Enabled=0
+-Output=0
+-Debug=0
+-
+ [TXZ]
+ Archiver=tar
+ Description=Compressed tar file (tar.xz)
+diff --git a/plugins/build.bat b/plugins/build.bat
+index bc52bb4..44688ad 100644
+--- a/plugins/build.bat
++++ b/plugins/build.bat
+@@ -14,7 +14,6 @@ lazbuild wcx\cpio\src\cpio.lpi %DC_ARCH%
+ lazbuild wcx\deb\src\deb.lpi %DC_ARCH%
+ lazbuild wcx\lzma\src\lzma.lpi %DC_ARCH%
+ lazbuild wcx\rpm\src\rpm.lpi %DC_ARCH%
+-lazbuild wcx\unrar\src\unrar.lpi %DC_ARCH%
+ lazbuild wcx\zip\src\zip.lpi %DC_ARCH%
+
+ rem WDX plugins
+@@ -43,10 +42,6 @@ pushd wcx\rpm\lib\
+ strip --strip-all rpm.wcx
+ popd
+
+-pushd wcx\unrar\lib\
+-strip --strip-all unrar.wcx
+-popd
+-
+ pushd wcx\zip\lib\
+ strip --strip-all zip.wcx
+ popd
+diff --git a/plugins/build.sh b/plugins/build.sh
+index a9c34ba..fc34b91 100755
+--- a/plugins/build.sh
++++ b/plugins/build.sh
+@@ -14,7 +14,6 @@ $lazbuild wcx/cpio/src/cpio.lpi $DC_ARCH
+ $lazbuild wcx/deb/src/deb.lpi $DC_ARCH
+ $lazbuild wcx/lzma/src/lzma.lpi $DC_ARCH
+ $lazbuild wcx/rpm/src/rpm.lpi $DC_ARCH
+-$lazbuild wcx/unrar/src/unrar.lpi $DC_ARCH
+ $lazbuild wcx/zip/src/Zip.lpi $DC_ARCH
+
+ # WDX plugins
+@@ -50,10 +49,6 @@ cd wcx/rpm/lib/
+ strip --strip-all rpm.wcx
+ cd $pluginsdir
+
+-cd wcx/unrar/lib/
+-strip --strip-all unrar.wcx
+-cd $pluginsdir
+-
+ cd wcx/zip/lib/
+ strip --strip-all zip.wcx
+ cd $pluginsdir
+diff --git a/plugins/wcx/lzma/LZMA/Methods.txt b/plugins/wcx/lzma/LZMA/Methods.txt
+index 393e1b0..9426718 100644
+--- a/plugins/wcx/lzma/LZMA/Methods.txt
++++ b/plugins/wcx/lzma/LZMA/Methods.txt
+@@ -73,13 +73,6 @@ List of defined IDs
+ 12 - BZip2 (not used). Use {04 02 02} instead
+ 02 - BZip
+ 02 - BZip2
+- 03 - Rar
+- 01 - Rar15
+- 02 - Rar20
+- 03 - Rar29
+- 04 - Arj
+- 01 - Arj (1,2,3)
+- 02 - Arj 4
+ 05 - Z
+ 06 - Lzh
+ 07 - Reserved for 7z
+@@ -109,9 +102,6 @@ List of defined IDs
+ F1 - Misc Ciphers (Combine)
+ 01 - Zip
+ 01 - Main Zip crypto algo
+- 03 - RAR
+- 02 -
+- 03 - Rar29 AES-128 + (modified SHA-1)
+ 07 - 7z
+ 01 - AES-256 + SHA-256
+
+@@ -126,8 +116,6 @@ List of defined IDs
+ F0 - Misc Hash
+
+ F1 - Misc
+- 03 - RAR
+- 03 - Rar29 Password Hashing (modified SHA1)
+ 07 - 7z
+ 01 - SHA-256 Password Hashing
+
+diff --git a/src/platform/udefaultplugins.pas b/src/platform/udefaultplugins.pas
+index 7dfa48a..5045f03 100644
+--- a/src/platform/udefaultplugins.pas
++++ b/src/platform/udefaultplugins.pas
+@@ -149,12 +149,6 @@ begin
+ else
+ gWCXPlugins.Flags[I]:= 4;
+
+- I:= gWCXPlugins.IndexOfName('rar');
+- if I < 0 then
+- gWCXPlugins.Add('rar', 68, Folder + 'unrar' + PathDelim + 'unrar.wcx')
+- else
+- gWCXPlugins.Flags[I]:= 68;
+-
+ // Wfx plugins
+ Folder:= '%commander_path%' + PathDelim + 'plugins' + PathDelim + 'wfx' + PathDelim;
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 16:14:41 +0000