From 3578b4bbe7aa020565cf76bf44650ba291124413 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Mon, 15 Jan 2018 16:58:15 +0100 Subject: libre/doublecmd: updated to 0.8.1 --- libre/doublecmd/PKGBUILD | 150 +++++++++++++++++++++-------------------- libre/doublecmd/libre.patch | 158 +++++++++++++++++++------------------------- 2 files changed, 142 insertions(+), 166 deletions(-) diff --git a/libre/doublecmd/PKGBUILD b/libre/doublecmd/PKGBUILD index 0b5595c07..436bb2821 100644 --- a/libre/doublecmd/PKGBUILD +++ b/libre/doublecmd/PKGBUILD @@ -1,113 +1,111 @@ # vim:set ft=sh: -# $Id: PKGBUILD 214257 2017-02-28 19:42:14Z idevolder $ +# $Id$ # Maintainer (Arch): BlackIkeEagle +# Contributor: André Silva # Contributor (Arch): (sirocco AT ngs.ru) -# Maintainer: André Silva pkgbase=doublecmd -_pkgbase=$pkgbase-libre -pkgname=("$pkgbase-gtk2" "$pkgbase-qt") -pkgver=0.7.8 +pkgname=('doublecmd-gtk2' 'doublecmd-qt4' 'doublecmd-qt5') +pkgver=0.8.1 _helpver=0.6.0 pkgrel=1.parabola1 -url="http://$pkgbase.sourceforge.net/" -arch=('i686' 'x86_64') +url="http://doublecmd.sourceforge.net/" +arch=('x86_64' 'i686' 'armv7h') license=('GPL') provides=("$pkgbase") -makedepends=('lazarus' 'qt4pas' 'gtk2') +makedepends=('lazarus' 'qt4pas' 'qt5pas' 'gtk2') optdepends=( 'lua51: scripting' 'p7zip: support for 7zip archives' ) -mksource=( - "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz" -) source=( - "https://repo.parabola.nu/other/$_pkgbase/$_pkgbase-$pkgver-src.tar.gz" - "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz" - "http://www.herecura.be/files/lazarus-20140321-2.tar.gz" - 'libre.patch' - 'help-libre.patch' + "https://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz" + "https://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz" + "libre.patch" + "help-libre.patch" ) -mksha256sums=('5249557df3715588f379292258b937e37a097bf584602711bc211dfd6427e9a3') -sha256sums=('f66142f12efa5738bf8296e72d93db7e6adadb4920b9e14b2d849f5878a11efd' - 'd50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39' - '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20' - 'a23303f1719be08a59038ce7a256d582868cdd3e19cda2537c4a23d3480a40f9' - '62bc9fd628ca8dc11446f2f3b44ebf86bbf1776a7e8def11fbeb77589e9a5a6e') +sha512sums=('8e80ba5914362572d77403e054873665dcf9dcf2dd9258acd07888aa5dfa05e7b6537e9e7750f26eadb09091915bd314f859d29c0527bb3aa45e936763a664d4' + '2fe7a58e317c93baf4cfcb9cfc660647d71f4454eef588a512a9b9e8467477a691ec1061f014a42dff4ae0a0ba0600824b33c12c950fe1e26fba2a51122404bb' + '874a81b27d891cff3eefc8ed6aa128b4eb4abeb4e69247108544a60cda9a3f98b552196a8414d4835d358a426d74ff10823610acf605d3a4d5651f6c9dd3dcfa' + 'f71a328d592c4f45535480477e3e6a2e0dc3ea08bfae059a3f707a2d7d8d85407379dfbe8c54fb179e4f10c4d5078f29063ccd763d1af6525152053b6f00f746') mksource() { - cd "$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" - msg2 'remove nonfree unRAR utility files from the source' - rm -rv install/linux/deb/libunrar + msg2 'remove nonfree unRAR utility files from the source' + rm -rv install/linux/deb/libunrar } prepare() { - cd "$pkgbase-$pkgver" - sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i install/linux/install.sh + cd "$pkgbase-$pkgver" + sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i install/linux/install.sh + sed -e 's/=$(which lazbuild)/="$(which lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh - msg2 'remove nonfree libunrar, unace, unarj support and references' - rm -rv plugins/wcx/unrar - rm -v install/linux/rpm/libunrar.spec - rm -v install/darwin/make-unrar.sh - patch -Np1 -i ../libre.patch + msg2 'remove nonfree libunrar, unace, unarj support and references' + rm -rv plugins/wcx/unrar + rm -v install/linux/rpm/libunrar.spec + rm -v install/darwin/make-unrar.sh + patch -Np1 -i "$srcdir"/libre.patch - cd "$srcdir/$pkgbase-help-$_helpver" + cd "$srcdir/$pkgbase-help-$_helpver" - msg2 'remove nonfree libunrar, unace, unarj support and references on the help' - patch -Np1 -i ../help-libre.patch + msg2 'remove nonfree libunrar, unace, unarj support and references on the help' + patch -Np1 -i "$srcdir"/help-libre.patch - cd "$srcdir" + cd "$srcdir" - cp -a "$pkgbase-$pkgver" "$pkgbase-gtk" - cp -a "$pkgbase-$pkgver" "$pkgbase-qt" + cp -a "$pkgbase-$pkgver" "$pkgbase-gtk" + cp -a "$pkgbase-$pkgver" "$pkgbase-qt4" + cp -a "$pkgbase-$pkgver" "$pkgbase-qt5" } build() { - msg2 'build gtk' - gtkdir="$srcdir/$pkgbase-gtk" - cd "$gtkdir" - bsdtar -zxf "$srcdir/lazarus-20140321-2.tar.gz" - sed -e "s/\\(export\\ lazbuild=\\).*/\\1\"\$(which lazbuild) --primary-config-path=${gtkdir//\//\\\/}\/lazarus\/lazarus-$CARCH\"/" -i build.sh - sed -e "s/%%SRCDIR%%/${gtkdir//\//\\\/}/g" -i lazarus/packagefiles.xml - ./build.sh beta gtk2 - - msg2 'build qt' - qtdir="$srcdir/$pkgbase-qt" - cd "$qtdir" - bsdtar -zxf "$srcdir/lazarus-20140321-2.tar.gz" - sed -e "s/\\(export\\ lazbuild=\\).*/\\1\"\$(which lazbuild) --primary-config-path=${qtdir//\//\\\/}\/lazarus\/lazarus-$CARCH\"/" -i build.sh - sed -e "s/%%SRCDIR%%/${qtdir//\//\\\/}/g" -i lazarus/packagefiles.xml - ./build.sh beta qt + msg2 'build gtk' + cd "$srcdir/$pkgbase-gtk" + ./build.sh beta gtk2 + + msg2 'build qt4' + cd "$srcdir/$pkgbase-qt4" + ./build.sh beta qt + msg2 'build qt5' + cd "$srcdir/$pkgbase-qt5" + ./build.sh beta qt5 } package_doublecmd-gtk2() { - pkgdesc="twin-panel (commander-style) file manager (GTK), without nonfree decompression engine for RAR archives and support for nonfree unace and unarj" - depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info') - conflicts=("$pkgbase-qt" "$_pkgbase-gtk2" "$pkgbase-gtk2-libre") - replaces=("$_pkgbase-gtk2" "$pkgbase-gtk2-libre") - provides=("$pkgbase-gtk2-libre") - cd "$srcdir/$pkgbase-gtk" - ./install/linux/install.sh --install-prefix="$pkgdir" - - # install doc - cd "$srcdir/$pkgbase-help-$_helpver" - cp -a * "$pkgdir/usr/share/$pkgbase/doc/" + pkgdesc="twin-panel (commander-style) file manager (GTK), without nonfree decompression engine for RAR archives and support for nonfree unace and unarj" + depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info') + conflicts=('doublecmd-qt4' 'doublecmd-qt5') + cd "$srcdir/$pkgbase-gtk" + ./install/linux/install.sh --install-prefix="$pkgdir" + + # install doc + cd "$srcdir/$pkgbase-help-$_helpver" + cp -a * "$pkgdir/usr/share/$pkgbase/doc/" } -package_doublecmd-qt() { - pkgdesc="twin-panel (commander-style) file manager (QT), without nonfree decompression engine for RAR archives and support for nonfree unace and unarj" - depends=('qt4pas' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info') - conflicts=("$pkgbase-gtk2" "$_pkgbase-qt" "$pkgbase-qt-libre") - replaces=("$_pkgbase-qt" "$pkgbase-qt-libre") - provides=("$pkgbase-qt-libre") - cd "$srcdir/$pkgbase-qt" - ./install/linux/install.sh --install-prefix="$pkgdir" - - # install doc - cd "$srcdir/$pkgbase-help-$_helpver" - cp -a * "$pkgdir/usr/share/$pkgbase/doc/" +package_doublecmd-qt4() { + pkgdesc="twin-panel (commander-style) file manager (QT4), without nonfree decompression engine for RAR archives and support for nonfree unace and unarj" + depends=('qt4pas' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info') + conflicts=('doublecmd-gtk2' 'doublecmd-qt5') + replaces=('doublecmd-qt') + cd "$srcdir/$pkgbase-qt4" + ./install/linux/install.sh --install-prefix="$pkgdir" + + # install doc + cd "$srcdir/$pkgbase-help-$_helpver" + cp -a * "$pkgdir/usr/share/$pkgbase/doc/" } +package_doublecmd-qt5() { + pkgdesc="twin-panel (commander-style) file manager (QT5), without nonfree decompression engine for RAR archives and support for nonfree unace and unarj" + depends=('qt5pas' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info') + conflicts=('doublecmd-gtk2' 'doublecmd-qt4') + cd "$srcdir/$pkgbase-qt5" + ./install/linux/install.sh --install-prefix="$pkgdir" + + # install doc + cd "$srcdir/$pkgbase-help-$_helpver" + cp -a * "$pkgdir/usr/share/$pkgbase/doc/" +} diff --git a/libre/doublecmd/libre.patch b/libre/doublecmd/libre.patch index e9fa4604f..9a18e3cb8 100644 --- a/libre/doublecmd/libre.patch +++ b/libre/doublecmd/libre.patch @@ -1,40 +1,17 @@ -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\*.* +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\*.* + @del /Q /S plugins\wcx\sevenzip\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 -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 +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 @@ 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 +52,9 @@ diff -Nur doublecmd-0.6.6.orig/doublecmd.ext.example doublecmd-0.6.6/doublecmd.e # Source RPMs (SuSE uses *.spm, others use *.src.rpm) [spm|srcm] Open={!VFS} -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 +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 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb @@ -86,24 +63,24 @@ diff -Nur doublecmd-0.6.6.orig/install/darwin/install.sh doublecmd-0.6.6/install mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip # WDX plugins directories mkdir -p $DC_INSTALL_DIR/plugins/wdx -@@ -43,7 +42,6 @@ +@@ -44,7 +43,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/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/ + 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 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 +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 @@ -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.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 +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 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb @@ -112,26 +89,27 @@ diff -Nur doublecmd-0.6.6.orig/install/linux/install.sh doublecmd-0.6.6/install/ mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip # WDX plugins directories mkdir -p $DC_INSTALL_DIR/plugins/wdx -@@ -80,7 +79,6 @@ +@@ -81,7 +80,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/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/ + 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 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 + +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 @@ -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.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 +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 mkdir %DC_INSTALL_DIR%\plugins\wcx\rpm @@ -140,24 +118,24 @@ diff -Nur doublecmd-0.6.6.orig/install/windows/install.bat doublecmd-0.6.6/insta mkdir %DC_INSTALL_DIR%\plugins\wcx\zip rem WDX plugins directories mkdir %DC_INSTALL_DIR%\plugins\wdx -@@ -43,7 +42,6 @@ +@@ -45,7 +44,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\ + 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 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 +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 @@ -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.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 +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 @@ Output=0 Debug=0 @@ -231,7 +209,7 @@ diff -Nur doublecmd-0.6.6.orig/multiarc.ini doublecmd-0.6.6/multiarc.ini -Extension=rar -Start=^----------- -End=^----------- --Format0=aaaaaaaaaaa zzzzzzzzz dd-tt-yy hh:mm nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn +-Format0=?aaaaaaaaaa $z+ yyyy tt dd hh:mm n+ -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 @@ -248,10 +226,10 @@ diff -Nur doublecmd-0.6.6.orig/multiarc.ini doublecmd-0.6.6/multiarc.ini [TXZ] Archiver=tar Description=Compressed tar file (tar.xz) -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 @@ +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 @@ lazbuild wcx\deb\src\deb.lpi %DC_ARCH% lazbuild wcx\rpm\src\rpm.lpi %DC_ARCH% lazbuild wcx\sevenzip\src\sevenzipwcx.lpi %DC_ARCH% @@ -259,20 +237,20 @@ diff -Nur doublecmd-0.6.6.orig/plugins/build.bat doublecmd-0.6.6/plugins/build.b lazbuild wcx\zip\src\zip.lpi %DC_ARCH% rem WDX plugins -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 +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 @@ - $lazbuild wcx/cpio/src/cpio.lpi $DC_ARCH - $lazbuild wcx/deb/src/deb.lpi $DC_ARCH - $lazbuild wcx/rpm/src/rpm.lpi $DC_ARCH + $lazbuild wcx/cpio/src/cpio.lpi $DC_ARCH + $lazbuild wcx/deb/src/deb.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 + $lazbuild wcx/zip/src/Zip.lpi $DC_ARCH # WDX plugins -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 +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 @@ RsCompressionBZip2Name = 'BZIP2 format'; RsCompressionBZip2Extensions = '*.bz2;*.bzip2;*.tbz2;*.tbz'; @@ -284,9 +262,9 @@ diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas d 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 +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 @@ | | | |-- TJclZipDecompressArchive handled by sevenzip http://sevenzip.sourceforge.net/ @@ -296,7 +274,7 @@ diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/common/JclCompressio | |-- 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 @@ +@@ -1492,22 +1490,6 @@ procedure SetNumberOfThreads(Value: Cardinal); end; @@ -319,7 +297,7 @@ diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/common/JclCompressio TJclZDecompressArchive = class(TJclSevenzipDecompressArchive, IInterface) public class function MultipleItemContainer: Boolean; override; -@@ -4356,8 +4338,6 @@ +@@ -4358,8 +4340,6 @@ // register decompression archives RegisterFormat(TJclZipDecompressArchive); RegisterFormat(TJclBZ2DecompressArchive); @@ -328,7 +306,7 @@ diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/common/JclCompressio RegisterFormat(TJclZDecompressArchive); RegisterFormat(TJclLzhDecompressArchive); RegisterFormat(TJcl7zDecompressArchive); -@@ -7923,50 +7903,6 @@ +@@ -7974,50 +7954,6 @@ FNumberOfThreads := Value; end; @@ -379,9 +357,9 @@ diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/common/JclCompressio //=== { 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 +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 @@ -22,20 +22,6 @@ { library; if not, write to } { the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } @@ -420,9 +398,9 @@ diff -Nur doublecmd-0.6.6.orig/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas 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 +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 @@ 12 - BZip2 (not used). Use {04 02 02} instead 02 - BZip @@ -456,10 +434,10 @@ diff -Nur doublecmd-0.6.6.orig/plugins/wcx/zip/lzma/Methods.txt doublecmd-0.6.6/ 07 - 7z 01 - SHA-256 Password Hashing -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 @@ +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 @@ gWCXPlugins.FileName[I]:= Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx'; end; @@ -470,7 +448,7 @@ diff -Nur doublecmd-0.6.6.orig/src/platform/udefaultplugins.pas doublecmd-0.6.6/ I:= gWCXPlugins.IndexOfName('cab'); if I < 0 then gWCXPlugins.Add('cab', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx'); -@@ -253,19 +249,6 @@ +@@ -259,19 +255,6 @@ else gWCXPlugins.Flags[I]:= 4; -- cgit v1.2.3