Here is a patch for doublecmd.
The package compiles with libretools (x86_64, armv7h).
Note: "qt6pas" is in "extra-staging" repo (archlinux32).
It works (tested on x86_64)
Changes:
- updated patches
- updated build recipe according to upstream
From f94cd84abf02aaaa610d1798adacc094ea60cca4 Mon Sep 17 00:00:00 2001
From: SolveFinder <kwop...@proton.me>
Date: Sun, 5 May 2024 20:34:15 +0300
Subject: [PATCH] doublecmd: upgrade to v1.1.13
---
libre/doublecmd/PKGBUILD | 68 +++--
libre/doublecmd/libre.patch | 491 ++++++++++++++++++------------------
2 files changed, 299 insertions(+), 260 deletions(-)
diff --git a/libre/doublecmd/PKGBUILD b/libre/doublecmd/PKGBUILD
index 4d678f41a3..408115c054 100644
--- a/libre/doublecmd/PKGBUILD
+++ b/libre/doublecmd/PKGBUILD
@@ -7,8 +7,8 @@
# - removed libunrar support
pkgbase=doublecmd
-pkgname=('doublecmd-gtk2' 'doublecmd-qt5')
-pkgver=0.9.8
+pkgname=('doublecmd-gtk2' 'doublecmd-qt5' 'doublecmd-qt6')
+pkgver=1.1.13
pkgrel=1
pkgrel+=.parabola1
url="http://doublecmd.sourceforge.net/";
@@ -16,7 +16,8 @@ arch=('x86_64')
arch+=('i686' 'armv7h')
license=('GPL')
provides=("$pkgbase")
-makedepends=('lazarus' 'qt5pas' 'gtk2')
+makedepends=('lazarus' 'gtk2' 'qt5pas' 'qt6pas')
+makedepends+=('dos2unix') # for patching
optdepends=(
'lua: scripting'
'unzip: support extracting zip archives'
@@ -25,10 +26,10 @@ optdepends=(
)
source=(
"https://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz";
- "libre.patch"
)
-sha512sums=('e44e4e697cbea0cec08fbac7336cb980ae2a1f72e807435b6e25aa81baf5fc0b94d378161cb36199e0fe42242101c7ce30301c07d1195f5b6252e63cef443682'
- 'f8a38cbae2c6ee0e0a40802daa5b779c6c07ae2d35b5adc119118318740585704b19bb6fb4d7edfb6ea54cad08f6381ef07ddae08f55bfbd38a1909e34fc3bea')
+source+=("libre.patch")
+sha512sums=('a9e8282477a695e8ec088800ddc963a0dfcbbd5f295c70b26a4e4bf6b574f88804142a75fa3995fcd939c8cc0a02db4d527e4a7306573203e4b75f2ed2b56109')
+sha512sums+=('6ee5d9fdc0508c2b57322d51104c16265dd573111ccf563482b1c311e99d3359fc693a5704ba4e885e8b6c15698f67c4cce99eb14fdcedf29f39a3d2989ba39b')
prepare() {
cp -a /usr/lib/lazarus ./
@@ -36,35 +37,64 @@ prepare() {
cd "$pkgbase-$pkgver"
sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i install/linux/install.sh
sed -e "s@=\$(which lazbuild)@=\"\$(which lazbuild) --lazarusdir=$srcdir/lazarus\"@" -i build.sh
+ sed -e '/doublecmd.zdli/d' -i install/linux/install.sh
+ ## libre patching ##
msg2 'remove nonfree libunrar, unace, unarj support and references'
rm -rv plugins/wcx/unrar
rm -rv install/linux/deb/libunrar
rm -v install/linux/rpm/libunrar.spec
rm -v install/darwin/make-unrar.sh
+
+ dos2unix clean.bat \
+ fpmake.pp \
+ install/windows/install.bat \
+ plugins/build.bat plugins/wcx/sevenzip/src/jcl/DCJclResources.pas \
+ default/multiarc.ini
patch -Np1 -i "$srcdir"/libre.patch
+}
+
+build() {
+ cd "$srcdir/$pkgbase-$pkgver"
+ ./build.sh components
+ ./build.sh plugins
cd "$srcdir"
cp -a "$pkgbase-$pkgver" "$pkgbase-gtk"
cp -a "$pkgbase-$pkgver" "$pkgbase-qt5"
-}
+ cp -a "$pkgbase-$pkgver" "$pkgbase-qt6"
-build() {
- msg2 'build gtk'
+ # build gtk
cd "$srcdir/$pkgbase-gtk"
- ./build.sh beta gtk2
+ /usr/bin/lazbuild --lazarusdir="$srcdir/lazarus" \
+ src/doublecmd.lpi \
+ --bm="NoDebug Full Optimizations" \
+ --widgetset=gtk2
+ #./build.sh beta gtk2
- msg2 'build qt5'
+ # build qt5
cd "$srcdir/$pkgbase-qt5"
- ./build.sh beta qt5
+ /usr/bin/lazbuild --lazarusdir="$srcdir/lazarus" \
+ src/doublecmd.lpi \
+ --bm="NoDebug Full Optimizations" \
+ --widgetset=qt5
+ #./build.sh beta qt5
+
+ # build qt6
+ cd "$srcdir/$pkgbase-qt6"
+ /usr/bin/lazbuild --lazarusdir="$srcdir/lazarus" \
+ src/doublecmd.lpi \
+ --bm="NoDebug Full Optimizations" \
+ --widgetset=qt6
+ #./build.sh beta qt6
}
package_doublecmd-gtk2() {
- pkgdesc="twin-panel (commander-style) file manager (GTK2)"
+ pkgdesc="twin-panel (commander-style) file manager (GTK3)"
pkgdesc+=", 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-qt5')
+ conflicts=('doublecmd-qt5' 'doublecmd-qt6')
cd "$srcdir/$pkgbase-gtk"
./install/linux/install.sh --install-prefix="$pkgdir"
}
@@ -73,8 +103,16 @@ package_doublecmd-qt5() {
pkgdesc="twin-panel (commander-style) file manager (Qt5)"
pkgdesc+=", 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')
+ conflicts=('doublecmd-gtk2' 'doublecmd-qt6')
replaces=('doublecmd-qt' 'doublecmd-qt4')
cd "$srcdir/$pkgbase-qt5"
./install/linux/install.sh --install-prefix="$pkgdir"
}
+
+package_doublecmd-qt6() {
+ pkgdesc="twin-panel (commander-style) file manager (Qt6)"
+ depends=('qt6pas' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info')
+ conflicts=('doublecmd-gtk2' 'doublecmd-qt5')
+ cd "$srcdir/$pkgbase-qt6"
+ ./install/linux/install.sh --install-prefix="$pkgdir"
+}
diff --git a/libre/doublecmd/libre.patch b/libre/doublecmd/libre.patch
index 3c13f899e4..c634d9eaf2 100644
--- a/libre/doublecmd/libre.patch
+++ b/libre/doublecmd/libre.patch
@@ -1,64 +1,102 @@
diff --git a/clean.bat b/clean.bat
-index 2979f6a..965b13a 100644
+index 3406b88..14e0da8 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 --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
+@@ -27,7 +27,6 @@
+ @del /Q /S plugins\wcx\rpm\lib\*.*
+ @del /Q /S plugins\wcx\sevenzip\lib\*.*
+ @del /Q /S plugins\wcx\torrent\lib\*.*
+-@del /Q /S plugins\wcx\unrar\lib\*.*
+ @del /Q /S plugins\wcx\zip\lib\*.*
--# 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
+ @del /Q /S plugins\wdx\deb_wdx\lib\*.*
+diff --git a/clean.sh b/clean.sh
+index a7af82a..c5b2435 100755
+--- a/clean.sh
++++ b/clean.sh
+@@ -26,8 +26,6 @@ find plugins -iname '*.res' -not -path "*/sevenzip/src/*" -delete
+ find plugins -iname '*.a' -delete
+ rm -f src/doublecmd.res doublecmd
+ rm -f tools/extractdwrflnfo
+-rm -f plugins/wcx/unrar/lib/rarconfdlg.lfm
+-rm -f plugins/wcx/unrar/lib/rarlng.rsj
+ rm -f plugins/wcx/zip/lib/ZipConfDlg.lfm
+ rm -f plugins/wcx/zip/lib/ZipLng.rsj
+ rm -f plugins/wcx/zip/lib/abresstring.rs?
+diff --git a/default/multiarc.ini b/default/multiarc.ini
+index e25b479..64515ee 100644
+--- a/default/multiarc.ini
++++ b/default/multiarc.ini
+@@ -37,46 +37,6 @@ Enabled=0
+ Output=0
+ Debug=0
--# 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
+-[ACE]
+-Archiver=ace
+-Description=ACE v2.0.4
+-Extension=ace
+-Start=^Date
+-End=^listed:
+-Format0=dd.tt.yyâhh:mmâpppppppppppâzzzzzzzzzâ â n+
+-List=%P v -y %AQ
+-Extract=%P x -y {-p%W} {%S} %AQ @%LQA
+-ExtractWithoutPath=%P e -y {-p%W} {%S} %AQ @%LQA
+-Test=%P t -y %AQ
+-Delete=%P d -y %AQ @%LQA
+-Add=%P a -y {-p%W} {-v%V} {%S} %AQ @%LQA
+-AddSelfExtract=%P a -y -sfx {-p%W} {-v%V} {%S} %AQ @%LQA
+-Enabled=0
+-Output=0
+-Debug=0
-
- #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
+-[ARJ]
+-Description=ARJ 3.15 by ARJ Software, Inc.
+-Archiver=arj
+-ID=60 EA
+-IDPos=0
+-Extension=arj
+-Start=^------------
+-End=^------------
+-Format0=* n+
+-Format1=???????????? zzzzzzzzzz pppppppppp yy-tt-dd hh:mm:ss aaaaaa
+-Format2=?
+-Format3=?
+-List=%P v %AQ
+-Extract=%P x -y {-g%W} {%S} %AQ !%LQA
+-ExtractWithoutPath=%P e -y {-g%W} {%S} %AQ !%LQA
+-Test=%P t -y {%S} %AQ
+-Delete=%P d -y {%S} %AQ !%LQA
+-Add=%P a -y {-g%W} {-v%V} {%S} %AQ !%LQA
+-Enabled=0
+-Output=0
+-Debug=0
-
- # Source RPMs (SuSE uses *.spm, others use *.src.rpm)
- [spm|srcm]
- Open={!VFS}
+ [ZPAQ]
+ Archiver=zpaq
+ Description=ZPAQ - http://mattmahoney.net/dc/zpaq.html
+diff --git a/fpmake.pp b/fpmake.pp
+index cb3fef6..6a7e0cf 100755
+--- a/fpmake.pp
++++ b/fpmake.pp
+@@ -24,12 +24,11 @@ const
+ 'components\virtualterminal\virtualterminal.lpk'
+ );
+
+- CommonPlugins: array[1..9] of String =
++ CommonPlugins: array[1..8] of String =
+ (
+ 'plugins/wcx/base64/src/base64wcx.lpi',
+ 'plugins/wcx/deb/src/deb.lpi',
+ 'plugins/wcx/rpm/src/rpm.lpi',
+- 'plugins/wcx/unrar/src/unrar.lpi',
+ 'plugins/wcx/zip/src/Zip.lpi',
+ 'plugins/wdx/rpm_wdx/src/rpm_wdx.lpi',
+ 'plugins/wdx/deb_wdx/src/deb_wdx.lpi',
diff --git a/install/darwin/install.sh b/install/darwin/install.sh
-index e201f94..a03953a 100755
+index a1334db..576bda7 100755
--- a/install/darwin/install.sh
+++ b/install/darwin/install.sh
-@@ -17,7 +17,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx
+@@ -18,7 +18,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/base64
mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio
mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
@@ -66,27 +104,70 @@ index e201f94..a03953a 100755
mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
# WDX plugins directories
mkdir -p $DC_INSTALL_DIR/plugins/wdx
-@@ -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/
--install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
+@@ -47,8 +46,6 @@ install -m 644 plugins/wcx/base64/base64.wcx $DC_INSTALL_DIR/plugins/wcx/
+ install -m 644 plugins/wcx/cpio/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/cpio/
+ install -m 644 plugins/wcx/deb/deb.wcx $DC_INSTALL_DIR/plugins/wcx/deb/
+ install -m 644 plugins/wcx/rpm/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/
+-cp -r plugins/wcx/unrar/language $DC_INSTALL_DIR/plugins/wcx/unrar
+-install -m 644 plugins/wcx/unrar/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
+ cp -r plugins/wcx/zip/language $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 --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/deb/doublecmd/control b/install/linux/deb/doublecmd/control
+index 1a68367..bf465a7 100644
+--- a/install/linux/deb/doublecmd/control
++++ b/install/linux/deb/doublecmd/control
+@@ -36,9 +36,6 @@ Description: twin-panel (commander-style) file manager (GTK2)
+ with two panels side by side. It is inspired by Total Commander
+ and features some new ideas.
+ .
+- Support for RAR archives can be enabled by installing the
+- libunrar5 package from non-free.
+- .
+ This package contains the GTK2 user interface.
+
+ Package: doublecmd-qt
+@@ -55,9 +52,6 @@ Description: twin-panel (commander-style) file manager (Qt5)
+ with two panels side by side. It is inspired by Total Commander
+ and features some new ideas.
+ .
+- Support for RAR archives can be enabled by installing the
+- libunrar5 package from non-free.
+- .
+ This package contains the Qt5 user interface.
+
+ Package: doublecmd-plugins
+@@ -69,9 +63,6 @@ Description: twin-panel (commander-style) file manager (plugins)
+ with two panels side by side. It is inspired by Total Commander
+ and features some new ideas.
+ .
+- Support for RAR archives can be enabled by installing the
+- libunrar5 package from non-free.
+- .
+ This package contains plugins.
+
+ Package: doublecmd-common
+@@ -81,7 +72,6 @@ Recommends: doublecmd-gtk | doublecmd-qt
+ Depends: desktop-file-utils, ${misc:Depends}
+ Suggests: doublecmd-help-en | doublecmd-help,
+ libffmpegthumbnailer4v5,
+- libunrar5,
+ mplayer,
+ p7zip-full,
+ rabbitvcs-core,
+@@ -91,7 +81,4 @@ Description: twin-panel (commander-style) file manager
+ with two panels side by side. It is inspired by Total Commander
+ and features some new ideas.
+ .
+- Support for RAR archives can be enabled by installing the
+- libunrar-dev package from non-free.
+- .
+ This package contains common files.
diff --git a/install/linux/install.sh b/install/linux/install.sh
-index 94a3eba..fbe9001 100755
+index 03daba3..31c070d 100755
--- a/install/linux/install.sh
+++ b/install/linux/install.sh
-@@ -49,7 +49,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx
+@@ -50,7 +50,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/wcx/base64
mkdir -p $DC_INSTALL_DIR/plugins/wcx/cpio
mkdir -p $DC_INSTALL_DIR/plugins/wcx/deb
mkdir -p $DC_INSTALL_DIR/plugins/wcx/rpm
@@ -94,187 +175,113 @@ index 94a3eba..fbe9001 100755
mkdir -p $DC_INSTALL_DIR/plugins/wcx/zip
# WDX plugins directories
mkdir -p $DC_INSTALL_DIR/plugins/wdx
-@@ -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/
--install -m 644 plugins/wcx/unrar/lib/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
+@@ -83,8 +82,6 @@ install -m 644 plugins/wcx/base64/base64.wcx $DC_INSTALL_DIR/plugins/wcx/
+ install -m 644 plugins/wcx/cpio/cpio.wcx $DC_INSTALL_DIR/plugins/wcx/cpio/
+ install -m 644 plugins/wcx/deb/deb.wcx $DC_INSTALL_DIR/plugins/wcx/deb/
+ install -m 644 plugins/wcx/rpm/rpm.wcx $DC_INSTALL_DIR/plugins/wcx/rpm/
+-cp -r plugins/wcx/unrar/language $DC_INSTALL_DIR/plugins/wcx/unrar
+-install -m 644 plugins/wcx/unrar/unrar.wcx $DC_INSTALL_DIR/plugins/wcx/unrar/
+ cp -r plugins/wcx/zip/language $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 --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/linux/pkg/doublecmd-gtk2.pkgbuild b/install/linux/pkg/doublecmd-gtk2.pkgbuild
+index aa9672d..8fd090c 100644
+--- a/install/linux/pkg/doublecmd-gtk2.pkgbuild
++++ b/install/linux/pkg/doublecmd-gtk2.pkgbuild
+@@ -20,7 +20,6 @@ makedepends=('lazarus' 'fpc' 'subversion')
+ optdepends=(
+ 'lua51: scripting'
+ 'p7zip: support for 7zip archives'
+- 'libunrar: support for rar archives'
+ )
+ options=('!strip')
+ provides=(${_pkgname}-gtk2)
+diff --git a/install/linux/pkg/doublecmd-qt.pkgbuild b/install/linux/pkg/doublecmd-qt.pkgbuild
+index c2e10aa..754ab75 100644
+--- a/install/linux/pkg/doublecmd-qt.pkgbuild
++++ b/install/linux/pkg/doublecmd-qt.pkgbuild
+@@ -20,7 +20,6 @@ makedepends=('lazarus' 'fpc' 'subversion')
+ optdepends=(
+ 'lua51: scripting'
+ 'p7zip: support for 7zip archives'
+- 'libunrar: support for rar archives'
+ )
+ options=('!strip')
+ provides=(${_pkgname}-qt)
+diff --git a/install/linux/pkg/doublecmd-qt5.pkgbuild b/install/linux/pkg/doublecmd-qt5.pkgbuild
+index 391781c..71ff52c 100644
+--- a/install/linux/pkg/doublecmd-qt5.pkgbuild
++++ b/install/linux/pkg/doublecmd-qt5.pkgbuild
+@@ -20,7 +20,6 @@ makedepends=('lazarus' 'fpc' 'subversion')
+ optdepends=(
+ 'lua51: scripting'
+ 'p7zip: support for 7zip archives'
+- 'libunrar: support for rar archives'
+ )
+ options=('!strip')
+ provides=(${_pkgname}-qt5)
diff --git a/install/windows/install.bat b/install/windows/install.bat
-index f79782f..cbc0842 100644
+index 7c8c2ec..5dedfa4 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
-@@ -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 --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 4b26a72..ba5a916 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â â n+
--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 -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
--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=?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
--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)
+@@ -12,7 +12,6 @@ mkdir %DC_INSTALL_DIR%\plugins\wcx
+ mkdir %DC_INSTALL_DIR%\plugins\wcx\base64
+ 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
+@@ -52,8 +51,6 @@ rem WCX
+ copy plugins\wcx\base64\base64.wcx %DC_INSTALL_DIR%\plugins\wcx\base64\
+ copy plugins\wcx\rpm\rpm.wcx %DC_INSTALL_DIR%\plugins\wcx\rpm\
+ copy plugins\wcx\sevenzip\sevenzip.wcx %DC_INSTALL_DIR%\plugins\wcx\sevenzip\
+-copy plugins\wcx\unrar\unrar.wcx %DC_INSTALL_DIR%\plugins\wcx\unrar\
+-xcopy /E plugins\wcx\unrar\language %DC_INSTALL_DIR%\plugins\wcx\unrar\language\
+ copy plugins\wcx\zip\zip.wcx %DC_INSTALL_DIR%\plugins\wcx\zip\
+ xcopy /E plugins\wcx\zip\language %DC_INSTALL_DIR%\plugins\wcx\zip\language\
+ rem WDX
diff --git a/plugins/build.bat b/plugins/build.bat
-index 2889499..7b9b2ad 100644
+index 4983608..54fc807 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%
--lazbuild wcx\unrar\src\unrar.lpi %DC_ARCH%
- lazbuild wcx\zip\src\zip.lpi %DC_ARCH%
-
- rem WDX plugins
+@@ -13,7 +13,6 @@ lazbuild wcx\base64\src\base64wcx.lpi %DC_ARCH%
+ 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
diff --git a/plugins/build.sh b/plugins/build.sh
-index 4886322..7729101 100755
+index fd58e70..c2122fb 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
--$lazbuild wcx/unrar/src/unrar.lpi $DC_ARCH
- $lazbuild wcx/zip/src/Zip.lpi $DC_ARCH
+@@ -16,7 +16,6 @@ $lazbuild wcx/base64/src/base64wcx.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
# WDX plugins
diff --git a/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas b/plugins/wcx/sevenzip/src/jcl/DCJclResources.pas
-index c72b27a..1a8bb43 100644
+index 96dc4e3..56a7cff 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';
-- RsCompressionRarName = 'RAR format';
-- RsCompressionRarExtensions = '*.rar;*.r00';
-- RsCompressionArjName = 'ARJ format';
-- RsCompressionArjExtensions = '*.arj';
- RsCompressionZName = 'Z format';
- RsCompressionZExtensions = '*.z;*.taz';
- RsCompressionZSubExtensions = '.taz=.tar';
+ 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 --git a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
-index a43868a..c45c697 100644
+index 7d762c7..d5d5a6c 100644
--- a/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
+++ b/plugins/wcx/sevenzip/src/jcl/common/JclCompression.pas
@@ -122,8 +122,6 @@ uses
@@ -318,7 +325,7 @@ index a43868a..c45c697 100644
RegisterFormat(TJclZDecompressArchive);
RegisterFormat(TJclLzhDecompressArchive);
RegisterFormat(TJcl7zDecompressArchive);
-@@ -7984,50 +7964,6 @@ begin
+@@ -8004,50 +7984,6 @@ begin
FNumberOfThreads := Value;
end;
@@ -370,7 +377,7 @@ index a43868a..c45c697 100644
class function TJclZDecompressArchive.ArchiveExtensions: string;
diff --git a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
-index 0853a85..4448860 100644
+index 68f4ae2..a195d8c 100644
--- a/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
+++ b/plugins/wcx/sevenzip/src/jcl/windows/sevenzip.pas
@@ -22,20 +22,6 @@
@@ -449,10 +456,10 @@ index 393e1b0..9426718 100644
01 - SHA-256 Password Hashing
diff --git a/src/platform/udefaultplugins.pas b/src/platform/udefaultplugins.pas
-index b09a728..ee1c29f 100644
+index 944ee7e..f8fb05c 100644
--- a/src/platform/udefaultplugins.pas
+++ b/src/platform/udefaultplugins.pas
-@@ -192,10 +192,6 @@ begin
+@@ -196,10 +196,6 @@ begin
gWCXPlugins.FileName[I]:= Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx';
end;
@@ -463,23 +470,17 @@ index b09a728..ee1c29f 100644
I:= gWCXPlugins.IndexOfName('cab');
if I < 0 then
gWCXPlugins.Add('cab', 4, Folder + 'sevenzip' + PathDelim + 'sevenzip.wcx');
-@@ -275,19 +271,6 @@ begin
+@@ -279,12 +275,6 @@ begin
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;
-
+ I:= gWCXPlugins.IndexOfName('base64');
+ if I < 0 then
+ gWCXPlugins.Add('b64', 1, Folder + 'base64' + PathDelim + 'base64.wcx');
+
--
2.45.0
_______________________________________________
Dev mailing list
Dev@lists.parabola.nu
https://lists.parabola.nu/mailman/listinfo/dev
