From dbf8e033d4c2e3362e3783a23ab5fd0f7b32f7ea Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 11 Feb 2015 02:47:53 -0200 Subject: doublecmd-0.6.0-1.parabola1: updating version --- libre/doublecmd/libre.patch | 235 ++++++++++++++------------------------------ 1 file changed, 76 insertions(+), 159 deletions(-) (limited to 'libre/doublecmd/libre.patch') diff --git a/libre/doublecmd/libre.patch b/libre/doublecmd/libre.patch index d3fbf2156..cdfac16c8 100644 --- a/libre/doublecmd/libre.patch +++ b/libre/doublecmd/libre.patch @@ -1,7 +1,6 @@ -diff --git a/clean.bat b/clean.bat -index 910f591..0989998 100644 ---- a/clean.bat -+++ b/clean.bat +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 @@ -22,7 +22,6 @@ @del /Q /S plugins\wcx\lzma\lib\*.* @del /Q /S plugins\wcx\rpm\lib\*.* @@ -33,11 +32,10 @@ index 910f591..0989998 100644 -@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} +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 +@@ -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 @@ -51,7 +49,7 @@ index 24f4f9b..4e4307d 100644 # ha [ha] Open={!VFS} -@@ -250,13 +243,6 @@ View={!VIEWER} +@@ -250,13 +243,6 @@ Extract={!SHELL} ha xy %f '*' # Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I %f; fi @@ -65,7 +63,7 @@ index 24f4f9b..4e4307d 100644 #compress [Z] Open={!VFS} -@@ -287,11 +273,6 @@ Open={!VFS} +@@ -287,11 +273,6 @@ View={!VIEWER} /dev/null?> Uncompress={!SHELL} bunzip %f @@ -77,145 +75,90 @@ index 24f4f9b..4e4307d 100644 # 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 @@ - %commander_path%/plugins/wcx/rpm/rpm.wcx - 4 - -- -- rar -- %commander_path%/plugins/wcx/unrar/unrar.wcx -- 68 -- - - - -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 +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 +@@ -17,7 +17,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/ +@@ -43,7 +42,6 @@ + install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/cpio/ 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 +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 @@ -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 456bb4f..ec0da5e 100644 ---- a/install/linux/doublecmd.xml -+++ b/install/linux/doublecmd.xml -@@ -84,11 +84,6 @@ - %commander_path%/plugins/wcx/rpm/rpm.wcx - 4 - -- -- rar -- %commander_path%/plugins/wcx/unrar/unrar.wcx -- 68 -- - - - -diff --git a/install/linux/install.sh b/install/linux/install.sh -index 5f72fc7..a6ce41c 100755 ---- a/install/linux/install.sh -+++ b/install/linux/install.sh -@@ -50,7 +50,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio +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 +@@ -49,7 +49,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 -@@ -82,7 +81,6 @@ install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/ +@@ -80,7 +79,6 @@ + install -m 644 plugins/wcx/cpio/lib/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/cpio/ 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 +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 @@ -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 @@ - %commander_path%\plugins\wcx\rpm\rpm.wcx - 4 - -- -- rar -- %commander_path%\plugins\wcx\unrar\unrar.wcx -- 68 -- - - - -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 +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 +@@ -12,7 +12,6 @@ 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\sevenzip -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\ +@@ -43,7 +42,6 @@ + copy plugins\wcx\deb\lib\deb.wcx %DC_INSTALL_DIR%\plugins\wcx\deb\ + copy plugins\wcx\rpm\lib\rpm.wcx %DC_INSTALL_DIR%\plugins\wcx\rpm\ + copy plugins\wcx\sevenzip\sevenzip.wcx %DC_INSTALL_DIR%\plugins\wcx\sevenzip\ +-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 + 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 @@ -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 31cd8c3..a837e36 100644 ---- a/multiarc.ini -+++ b/multiarc.ini -@@ -37,89 +37,6 @@ Enabled=0 +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 +@@ -37,89 +37,6 @@ Output=0 Debug=0 @@ -263,11 +206,11 @@ index 31cd8c3..a837e36 100644 -Description=RAR 4.00 - http://www.rarlab.com -Extension=rar -Archiver=rar --Start=^------------ --End=^------------ +-Start=^----------- +-End=^----------- -Format0=?nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn -Format1=zzzzzzzzzzzzzzzzzzzzzz pppppppp dd-tt-yy hh:mm aaaaaaa --List=%P v {-p%W} %AQA +-List=%P v -c- {-p%W} %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 @@ -289,7 +232,7 @@ index 31cd8c3..a837e36 100644 -Start=^----------- -End=^----------- -Format0=aaaaaaaaaaa zzzzzzzzz dd-tt-yy hh:mm nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn --List=%P l {-p%W} %AQA +-List=%P l -c- {-p%W} %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 @@ -305,57 +248,32 @@ index 31cd8c3..a837e36 100644 [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% +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 +@@ -13,7 +13,6 @@ + lazbuild wcx\deb\src\deb.lpi %DC_ARCH% + lazbuild wcx\rpm\src\rpm.lpi %DC_ARCH% + lazbuild wcx\sevenzip\src\sevenzipwcx.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 966da8c..e84eabd 100755 ---- a/plugins/build.sh -+++ b/plugins/build.sh -@@ -17,7 +17,6 @@ $lazbuild wcx/cpio/src/cpio.lpi $DC_ARCH +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 +@@ -15,7 +15,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 -@@ -53,10 +52,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 +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 +@@ -73,13 +73,6 @@ 12 - BZip2 (not used). Use {04 02 02} instead 02 - BZip 02 - BZip2 @@ -369,7 +287,7 @@ index 393e1b0..9426718 100644 05 - Z 06 - Lzh 07 - Reserved for 7z -@@ -109,9 +102,6 @@ List of defined IDs +@@ -109,9 +102,6 @@ F1 - Misc Ciphers (Combine) 01 - Zip 01 - Main Zip crypto algo @@ -379,7 +297,7 @@ index 393e1b0..9426718 100644 07 - 7z 01 - AES-256 + SHA-256 -@@ -126,8 +116,6 @@ List of defined IDs +@@ -126,8 +116,6 @@ F0 - Misc Hash F1 - Misc @@ -388,11 +306,10 @@ index 393e1b0..9426718 100644 07 - 7z 01 - SHA-256 Password Hashing -diff --git a/src/platform/udefaultplugins.pas b/src/platform/udefaultplugins.pas -index f8b0ebd..aa9de17 100644 ---- a/src/platform/udefaultplugins.pas -+++ b/src/platform/udefaultplugins.pas -@@ -149,12 +149,6 @@ begin +diff -Nur doublecmd-0.6.0.orig/src/platform/udefaultplugins.pas doublecmd-0.6.0/src/platform/udefaultplugins.pas +--- doublecmd-0.6.0.orig/src/platform/udefaultplugins.pas 1989-12-31 22:00:00.000000000 -0200 ++++ doublecmd-0.6.0/src/platform/udefaultplugins.pas 2015-02-11 02:09:45.885075770 -0200 +@@ -251,12 +251,6 @@ else gWCXPlugins.Flags[I]:= 4; -- cgit v1.2.3