libre/doublecmd: bump to 0.9.8-1, update patch

Updated libre.patch with changes from upstream

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>

2 files changed, 95 insertions, 80 deletions

diff --git a/libre/doublecmd/PKGBUILD b/libre/doublecmd/PKGBUILD
index 7fddc3f82..4d115d90a 100644
--- a/libre/doublecmd/PKGBUILD
+++ b/libre/doublecmd/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=doublecmd
 pkgname=('doublecmd-gtk2' 'doublecmd-qt5')
-pkgver=0.9.6
+pkgver=0.9.8
 pkgrel=1
 pkgrel+=.parabola1
 url="http://doublecmd.sourceforge.net/"
@@ -27,8 +27,8 @@ source=(
     "https://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
     "libre.patch"
 )
-sha512sums=('050e0f36a2456ff0f6b1bd8896763db77afb5b3ae70a1340fac2e417fb979cbe5f1f73147a371b29562725ea5bc9816ffd65841430c5335daaad3f11702ee0d5'
-            '874a81b27d891cff3eefc8ed6aa128b4eb4abeb4e69247108544a60cda9a3f98b552196a8414d4835d358a426d74ff10823610acf605d3a4d5651f6c9dd3dcfa')
+sha512sums=('e44e4e697cbea0cec08fbac7336cb980ae2a1f72e807435b6e25aa81baf5fc0b94d378161cb36199e0fe42242101c7ce30301c07d1195f5b6252e63cef443682'
+            'f8a38cbae2c6ee0e0a40802daa5b779c6c07ae2d35b5adc119118318740585704b19bb6fb4d7edfb6ea54cad08f6381ef07ddae08f55bfbd38a1909e34fc3bea')
 
 prepare() {
     cp -a /usr/lib/lazarus ./
diff --git a/libre/doublecmd/libre.patch b/libre/doublecmd/libre.patch
index 9a18e3cb8..3c13f899e 100644
--- a/libre/doublecmd/libre.patch
+++ b/libre/doublecmd/libre.patch
@@ -1,18 +1,20 @@
-diff -Nur a/clean.bat b/clean.bat
---- a/clean.bat	2013-03-02 06:11:56.000000000 -0200
-+++ b/clean.bat	2015-10-12 00:42:35.563106419 -0300
-@@ -27,7 +27,6 @@
- @del /Q /S plugins\wcx\rpm\lib\*.*

+diff --git a/clean.bat b/clean.bat
+index 2979f6a..965b13a 100644
+--- a/clean.bat
++++ b/clean.bat
+@@ -28,7 +28,6 @@
  @del /Q /S plugins\wcx\sevenzip\lib\*.*

+ @del /Q /S plugins\wcx\torrent\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\*.*

-diff -Nur a/doublecmd.ext.example b/doublecmd.ext.example
---- a/doublecmd.ext.example	2011-07-10 14:42:16.000000000 -0300
-+++ b/doublecmd.ext.example	2015-10-12 00:42:35.563106419 -0300
-@@ -236,13 +236,6 @@
+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
  
@@ -26,7 +28,7 @@ diff -Nur a/doublecmd.ext.example b/doublecmd.ext.example
  # ha
  [ha]
  Open={!VFS}
-@@ -250,13 +243,6 @@
+@@ -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
  
@@ -40,7 +42,7 @@ diff -Nur a/doublecmd.ext.example b/doublecmd.ext.example
  #compress
  [Z]
  Open={!VFS}
-@@ -287,11 +273,6 @@
+@@ -287,11 +273,6 @@ Open={!VFS}
  View={!VIEWER} <?bzip -dc %f 2>/dev/null?>
  Uncompress={!SHELL} bunzip %f
  
@@ -52,10 +54,11 @@ diff -Nur a/doublecmd.ext.example b/doublecmd.ext.example
  # Source RPMs (SuSE uses *.spm, others use *.src.rpm)
  [spm|srcm]
  Open={!VFS}
-diff -Nur a/install/darwin/install.sh b/install/darwin/install.sh
---- a/install/darwin/install.sh	2014-11-15 16:05:41.000000000 -0200
-+++ b/install/darwin/install.sh	2015-10-12 00:42:35.563106419 -0300
-@@ -17,7 +17,6 @@
+diff --git a/install/darwin/install.sh b/install/darwin/install.sh
+index e201f94..a03953a 100755
+--- a/install/darwin/install.sh
++++ b/install/darwin/install.sh
+@@ -17,7 +17,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx
  mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio
  mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
  mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
@@ -63,7 +66,7 @@ diff -Nur a/install/darwin/install.sh b/install/darwin/install.sh
  mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
  # WDX plugins directories
  mkdir -p $DC_INSTALL_DIR/plugins/wdx
-@@ -44,7 +43,6 @@
+@@ -43,7 +42,6 @@ cp -a multiarc.ini                 $DC_INSTALL_DIR/
  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/rpm/lib/rpm.wcx          $DC_INSTALL_DIR/plugins/wcx/rpm/
@@ -71,17 +74,19 @@ diff -Nur a/install/darwin/install.sh b/install/darwin/install.sh
  install -m 644 plugins/wcx/zip/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 a/install/darwin/lib/readme.txt b/install/darwin/lib/readme.txt
---- a/install/darwin/lib/readme.txt	2012-08-19 12:11:56.000000000 -0300
-+++ b/install/darwin/lib/readme.txt	2015-10-12 00:42:35.563106419 -0300
+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 -Nur a/install/linux/install.sh b/install/linux/install.sh
---- a/install/linux/install.sh	2015-06-13 05:30:48.000000000 -0300
-+++ b/install/linux/install.sh	2015-10-12 00:42:35.563106419 -0300
-@@ -49,7 +49,6 @@
+diff --git a/install/linux/install.sh b/install/linux/install.sh
+index 94a3eba..fbe9001 100755
+--- a/install/linux/install.sh
++++ b/install/linux/install.sh
+@@ -49,7 +49,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx
  mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio
  mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
  mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
@@ -89,7 +94,7 @@ diff -Nur a/install/linux/install.sh b/install/linux/install.sh
  mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
  # WDX plugins directories
  mkdir -p $DC_INSTALL_DIR/plugins/wdx
-@@ -81,7 +80,6 @@
+@@ -80,7 +79,6 @@ cp -a multiarc.ini                 $DC_INSTALL_DIR/
  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/rpm/lib/rpm.wcx          $DC_INSTALL_DIR/plugins/wcx/rpm/
@@ -97,46 +102,49 @@ diff -Nur a/install/linux/install.sh b/install/linux/install.sh
  install -m 644 plugins/wcx/zip/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 a/install/linux/lib/readme.txt b/install/linux/lib/readme.txt
---- a/install/linux/lib/readme.txt	2012-08-19 12:11:56.000000000 -0300
-+++ b/install/linux/lib/readme.txt	2015-10-12 00:42:35.563106419 -0300
+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 -Nur a/install/windows/install.bat b/install/windows/install.bat
---- a/install/windows/install.bat	2015-01-12 17:43:57.000000000 -0200
-+++ b/install/windows/install.bat	2015-10-12 00:42:35.563106419 -0300
-@@ -12,7 +12,6 @@
- mkdir  %DC_INSTALL_DIR%\plugins\wcx\deb

+diff --git a/install/windows/install.bat b/install/windows/install.bat
+index f79782f..cbc0842 100644
+--- a/install/windows/install.bat
++++ b/install/windows/install.bat
+@@ -11,7 +11,6 @@ rem WCX plugins directories
+ mkdir  %DC_INSTALL_DIR%\plugins\wcx

  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\deb\lib\deb.wcx         %DC_INSTALL_DIR%\plugins\wcx\deb\

+@@ -42,7 +41,6 @@ rem copy plugins
+ rem WCX

  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\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 a/install/windows/lib/readme.txt b/install/windows/lib/readme.txt
---- a/install/windows/lib/readme.txt	2012-08-19 12:11:56.000000000 -0300
-+++ b/install/windows/lib/readme.txt	2015-10-12 00:42:35.563106419 -0300
+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 -Nur a/multiarc.ini b/multiarc.ini
---- a/multiarc.ini	2015-03-03 18:01:15.000000000 -0200
-+++ b/multiarc.ini	2015-10-12 00:42:35.563106419 -0300
-@@ -37,89 +37,6 @@
+diff --git a/multiarc.ini b/multiarc.ini
+index 4b26a72..ba5a916 100644
+--- a/multiarc.ini
++++ b/multiarc.ini
+@@ -37,89 +37,6 @@ Enabled=0
  Output=0

  Debug=0

  

@@ -146,7 +154,7 @@ diff -Nur a/multiarc.ini b/multiarc.ini
 -Extension=ace

 -Start=^Date

 -End=^listed:

--Format0=dd.tt.yy hh:mm ppppppppppp zzzzzzzzz        nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn

+-Format0=dd.tt.yy│hh:mm│ppppppppppp│zzzzzzzzz│     │ n+

 -List=%P v -y %AQA

 -Extract=%P x -y {-p%W} {%S} %AQA @%LQA

 -ExtractWithoutPath=%P e -y {-p%W} {%S} %AQA @%LQA

@@ -226,10 +234,11 @@ diff -Nur a/multiarc.ini b/multiarc.ini
  [TXZ]

  Archiver=tar

  Description=Compressed tar file (tar.xz)

-diff -Nur a/plugins/build.bat b/plugins/build.bat
---- a/plugins/build.bat	2015-01-12 17:43:57.000000000 -0200
-+++ b/plugins/build.bat	2015-10-12 00:42:35.563106419 -0300
-@@ -12,7 +12,6 @@
+diff --git a/plugins/build.bat b/plugins/build.bat
+index 2889499..7b9b2ad 100644
+--- a/plugins/build.bat
++++ b/plugins/build.bat
+@@ -12,7 +12,6 @@ rem WCX plugins
  lazbuild wcx\deb\src\deb.lpi              %DC_ARCH%

  lazbuild wcx\rpm\src\rpm.lpi              %DC_ARCH%

  lazbuild wcx\sevenzip\src\sevenzipwcx.lpi %DC_ARCH%

@@ -237,10 +246,11 @@ diff -Nur a/plugins/build.bat b/plugins/build.bat
  lazbuild wcx\zip\src\zip.lpi              %DC_ARCH%

  

  rem WDX plugins

-diff -Nur a/plugins/build.sh b/plugins/build.sh
---- a/plugins/build.sh	2015-01-02 13:06:45.000000000 -0200
-+++ b/plugins/build.sh	2015-10-12 00:42:35.563106419 -0300
-@@ -15,7 +15,6 @@
+diff --git a/plugins/build.sh b/plugins/build.sh
+index 4886322..7729101 100755
+--- a/plugins/build.sh
++++ b/plugins/build.sh
+@@ -15,7 +15,6 @@ cd plugins
  $lazbuild wcx/cpio/src/cpio.lpi   $DC_ARCH
  $lazbuild wcx/deb/src/deb.lpi     $DC_ARCH
  $lazbuild wcx/rpm/src/rpm.lpi     $DC_ARCH
@@ -248,10 +258,11 @@ diff -Nur a/plugins/build.sh b/plugins/build.sh
  $lazbuild wcx/zip/src/Zip.lpi     $DC_ARCH
  
  # WDX plugins
-diff -Nur a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas
---- a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas	2015-05-01 05:03:02.000000000 -0300
-+++ b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas	2015-10-12 01:15:43.454754161 -0300
-@@ -50,10 +50,6 @@
+diff --git a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas
+index c72b27a..1a8bb43 100644
+--- a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas
++++ b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas
+@@ -50,10 +50,6 @@ resourcestring
    RsCompressionBZip2Name           = 'BZIP2 format';

    RsCompressionBZip2Extensions     = '*.bz2;*.bzip2;*.tbz2;*.tbz';

    RsCompressionBZip2SubExtensions  = '.tbz2=.tar;.tbz=.tar';

@@ -262,10 +273,11 @@ diff -Nur a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas b/plugins/wcx/sevenz
    RsCompressionZName               = 'Z format';

    RsCompressionZExtensions         = '*.z;*.taz';

    RsCompressionZSubExtensions      = '.taz=.tar';

-diff -Nur a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
---- a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas	2015-09-07 09:12:21.000000000 -0300
-+++ b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas	2015-10-12 01:15:16.399385454 -0300
-@@ -122,8 +122,6 @@
+diff --git a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
+index a43868a..c45c697 100644
+--- a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
++++ b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
+@@ -122,8 +122,6 @@ uses
     |         |
     |         |-- TJclZipDecompressArchive      handled by sevenzip http://sevenzip.sourceforge.net/
     |         |-- TJclBZ2DecompressArchive      handled by sevenzip http://sevenzip.sourceforge.net/
@@ -274,7 +286,7 @@ diff -Nur a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx
     |         |-- TJclZDecompressArchive        handled by sevenzip http://sevenzip.sourceforge.net/
     |         |-- TJclLzhDecompressArchive      handled by sevenzip http://sevenzip.sourceforge.net/
     |         |-- TJcl7zDecompressArchive       handled by sevenzip http://sevenzip.sourceforge.net/
-@@ -1492,22 +1490,6 @@
+@@ -1492,22 +1490,6 @@ type
      procedure SetNumberOfThreads(Value: Cardinal);
    end;
  
@@ -297,7 +309,7 @@ diff -Nur a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx
    TJclZDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface)
    public
      class function MultipleItemContainer: Boolean; override;
-@@ -4358,8 +4340,6 @@
+@@ -4368,8 +4350,6 @@ begin
    // register decompression archives
    RegisterFormat(TJclZipDecompressArchive);
    RegisterFormat(TJclBZ2DecompressArchive);
@@ -306,7 +318,7 @@ diff -Nur a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx
    RegisterFormat(TJclZDecompressArchive);
    RegisterFormat(TJclLzhDecompressArchive);
    RegisterFormat(TJcl7zDecompressArchive);
-@@ -7974,50 +7954,6 @@
+@@ -7984,50 +7964,6 @@ begin
    FNumberOfThreads := Value;
  end;
  
@@ -357,9 +369,10 @@ diff -Nur a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx
  //=== { TJclZDecompressArchive } =============================================
  
  class function TJclZDecompressArchive.ArchiveExtensions: string;
-diff -Nur a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
---- a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas	2015-05-01 05:03:02.000000000 -0300
-+++ b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas	2015-10-12 01:11:49.932620714 -0300
+diff --git a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
+index 0853a85..4448860 100644
+--- a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
++++ b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
 @@ -22,20 +22,6 @@
  {    library; if not, write to                                                                     }
  {    the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA   }
@@ -381,7 +394,7 @@ diff -Nur a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas b/plugins/wcx/seve
  {**************************************************************************************************}
  {                                                                                                  }
  { Translation 2007-2008 Florent Ouchet for the JEDI Code Library                                   }
-@@ -91,16 +77,11 @@
+@@ -91,16 +77,11 @@ const
    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
@@ -398,10 +411,11 @@ diff -Nur a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas b/plugins/wcx/seve
    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 a/plugins/wcx/zip/src/lzma/Methods.txt b/plugins/wcx/zip/src/lzma/Methods.txt
---- a/plugins/wcx/zip/src/lzma/Methods.txt	2012-08-19 12:11:56.000000000 -0300
-+++ b/plugins/wcx/zip/src/lzma/Methods.txt	2015-10-12 00:42:35.563106419 -0300
-@@ -73,13 +73,6 @@
+diff --git a/plugins/wcx/zip/src/lzma/Methods.txt b/plugins/wcx/zip/src/lzma/Methods.txt
+index 393e1b0..9426718 100644
+--- a/plugins/wcx/zip/src/lzma/Methods.txt
++++ b/plugins/wcx/zip/src/lzma/Methods.txt
+@@ -73,13 +73,6 @@ List of defined IDs
        12 - BZip2 (not used). Use {04 02 02} instead
     02 - BZip
        02 - BZip2
@@ -415,7 +429,7 @@ diff -Nur a/plugins/wcx/zip/src/lzma/Methods.txt b/plugins/wcx/zip/src/lzma/Meth
     05 - Z
     06 - Lzh
     07 - Reserved for 7z
-@@ -109,9 +102,6 @@
+@@ -109,9 +102,6 @@ List of defined IDs
     F1 - Misc Ciphers (Combine)
        01 - Zip
           01 - Main Zip crypto algo
@@ -425,7 +439,7 @@ diff -Nur a/plugins/wcx/zip/src/lzma/Methods.txt b/plugins/wcx/zip/src/lzma/Meth
        07 - 7z
           01 - AES-256 + SHA-256
  
-@@ -126,8 +116,6 @@
+@@ -126,8 +116,6 @@ List of defined IDs
     F0 - Misc Hash
  
     F1 - Misc
@@ -434,10 +448,11 @@ diff -Nur a/plugins/wcx/zip/src/lzma/Methods.txt b/plugins/wcx/zip/src/lzma/Meth
        07 - 7z 
           01 - SHA-256 Password Hashing
      
-diff -Nur a/src/platform/udefaultplugins.pas b/src/platform/udefaultplugins.pas
---- a/src/platform/udefaultplugins.pas	2015-09-26 14:02:18.000000000 -0300
-+++ b/src/platform/udefaultplugins.pas	2015-10-12 01:12:57.716037187 -0300
-@@ -176,10 +176,6 @@
+diff --git a/src/platform/udefaultplugins.pas b/src/platform/udefaultplugins.pas
+index b09a728..ee1c29f 100644
+--- a/src/platform/udefaultplugins.pas
++++ b/src/platform/udefaultplugins.pas
+@@ -192,10 +192,6 @@ begin
      gWCXPlugins.FileName[I]:= Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx';
    end;
  
@@ -448,7 +463,7 @@ diff -Nur a/src/platform/udefaultplugins.pas b/src/platform/udefaultplugins.pas
    I:= gWCXPlugins.IndexOfName('cab');
    if I < 0 then
      gWCXPlugins.Add('cab', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx');
-@@ -259,19 +255,6 @@
+@@ -275,19 +271,6 @@ begin
    else
      gWCXPlugins.Flags[I]:= 4;