Please find patches attached. As usual, each patch has change description in the commit message. Any comments/questions/concerns are welcome!
From 4e9b5e27c36d9cd0daa93934d50babc763ae8eb4 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Thu, 26 Mar 2020 12:37:01 +0200 Subject: [PATCH 1/7] Sync with Arch Linux package version 19.12.3-1 --- libre/ark/PKGBUILD | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libre/ark/PKGBUILD b/libre/ark/PKGBUILD index 8bc36bcd3..1fca03f69 100644 --- a/libre/ark/PKGBUILD +++ b/libre/ark/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: jc_gargma <[email protected]> pkgname=ark -pkgver=19.04.1 +pkgver=19.12.3 pkgrel=1 pkgrel+=.par1 pkgdesc='Archiving Tool' @@ -20,9 +20,9 @@ makedepends=(extra-cmake-modules kdoctools) optdepends=('p7zip: 7Z format support' 'unarchiver: RAR format support' 'lzop: LZO format support' 'lrzip: LRZ format support') groups=(kde-applications kdeutils) -source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) source+=('libre.patch') -sha256sums=('6d348b2b9566ce0b8a1ba1b56d0a8c5d434d4748c479c5a853fdcdecfec753e6' +sha256sums=('78594029729c197fc90321850696f1bd189b40d8d7fbc9faf51ad6b2ab744a07' 'SKIP' '624bd7cd221db2a80b21cd5f71c447d86091e52276f2bdb609c8916755c7d602') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> @@ -39,8 +39,6 @@ prepare() { build() { cd build cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_TESTING=OFF make } -- 2.26.0
From d3b51be71a5b1bca63ab2097e644c31173a3a75c Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Thu, 26 Mar 2020 12:40:18 +0200 Subject: [PATCH 3/7] Sync with Arch Linux package version 3.36.0-1 --- libre/file-roller/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libre/file-roller/PKGBUILD b/libre/file-roller/PKGBUILD index 0f9743431..2fff5ed40 100644 --- a/libre/file-roller/PKGBUILD +++ b/libre/file-roller/PKGBUILD @@ -6,7 +6,7 @@ # - removed unace and unrar recommendation pkgname=file-roller -pkgver=3.32.3 +pkgver=3.36.0 pkgrel=1 pkgrel+=.parabola1 pkgdesc="Create and modify archives" @@ -18,9 +18,10 @@ license=(GPL) depends=(gtk3 dconf libarchive file json-glib libnotify zip unzip) makedepends=(yelp-tools git libnautilus-extension meson appstream-glib) optdepends=('p7zip: 7z, arj, exe and encrypted zip files support' - 'lrzip: lrzip archive support') + 'lrzip: lrzip archive support' + 'squashfs-tools: squashfs image support') groups=(gnome) -_commit=dddc71699f79b894f7ef689aa3c972261dd62580 # tags/3.32.3^0 +_commit=448229e786ca0aa8392d796ce2a195c94888971e # tags/3.36.0^0 source=("git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=$_commit";) sha256sums=('SKIP') -- 2.26.0
From 9f46c164c27b964ceb8f9cda24ab83d106a21a66 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Thu, 26 Mar 2020 12:40:38 +0200 Subject: [PATCH 4/7] Sync with Arch Linux package version 5.18.3-1 --- libre/khotkeys/PKGBUILD | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libre/khotkeys/PKGBUILD b/libre/khotkeys/PKGBUILD index be29990e4..8695ade84 100644 --- a/libre/khotkeys/PKGBUILD +++ b/libre/khotkeys/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer (Arch): Felix Yan <[email protected]> # Maintainer (Arch): Antonio Rojas <[email protected]> # Contributor (Arch): Andrea Scarpino <[email protected]> @@ -7,7 +6,7 @@ # Contributor: jc_gargma <[email protected]> pkgname=khotkeys -pkgver=5.12.4 +pkgver=5.18.3 pkgrel=1 pkgrel+=.parabola1 pkgdesc='KHotKeys' @@ -20,11 +19,11 @@ depends=(plasma-workspace) makedepends=(extra-cmake-modules kdoctools kdesignerplugin) groups=(plasma) source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('ceb4ba8267cf1e3c772813c3288fc755dae3069cd059feeeda64c01a6f5748d2' +sha256sums=('e2b459da176c369fecc46a0dfa151266e4778194b3b8d81c4d7bc423301ff204' 'SKIP') -validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell +validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <[email protected]> '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <[email protected]> - 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson + 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <[email protected]> '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <[email protected]> prepare() { @@ -36,8 +35,6 @@ prepare() { build() { cd build cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_TESTING=OFF make } -- 2.26.0
From d915e2db7798e5db59f5b79bbe669abbf0a18ba6 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Thu, 26 Mar 2020 12:42:14 +0200 Subject: [PATCH 6/7] Sync with Arch Linux package version 5.18.3-1, add missing dependency It won't build without qt5-webchannel that is now required if building without qt5-webengine. --- libre/libksysguard/PKGBUILD | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libre/libksysguard/PKGBUILD b/libre/libksysguard/PKGBUILD index 5f052ec5e..7435b778c 100644 --- a/libre/libksysguard/PKGBUILD +++ b/libre/libksysguard/PKGBUILD @@ -3,7 +3,7 @@ # Contributor (Arch): Andrea Scarpino <[email protected]> pkgname=libksysguard -pkgver=5.15.4 +pkgver=5.18.3 pkgrel=1 pkgrel+=.parabola1 pkgdesc='Libraries for ksysguard' @@ -12,11 +12,11 @@ arch=(x86_64) arch+=(i686 armv7h) url='https://www.kde.org/workspaces/plasmadesktop/' license=(LGPL) -depends=(libxres kio) +depends=(libxres kio qt5-webchannel) makedepends=(extra-cmake-modules kdoctools plasma-framework) groups=(plasma) source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('e4476b180f0f342d83ce1097ae10b1b9c88160b0c7fc9432259402ebbbdf4a14' +sha256sums=('d46113b835cfa7561c7ebb1be5ae89200196befe77c9a53981b18141da381f81' 'SKIP') validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <[email protected]> '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <[email protected]> @@ -30,8 +30,6 @@ prepare() { build() { cd build cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_TESTING=OFF make } -- 2.26.0
From 79c9c90bdd390541ab0b83041b451dc7e54540d9 Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Thu, 26 Mar 2020 12:43:24 +0200 Subject: [PATCH 7/7] Sync with Arch Linux package version 19.12.3-3, update pkgdesc --- libre/okular/PKGBUILD | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/libre/okular/PKGBUILD b/libre/okular/PKGBUILD index 3c20596bc..a6b468476 100644 --- a/libre/okular/PKGBUILD +++ b/libre/okular/PKGBUILD @@ -6,34 +6,38 @@ # Contributor: jc_gargma <[email protected]> pkgname=okular -pkgver=17.12.3 -pkgrel=1 +pkgver=19.12.3 +pkgrel=3 pkgrel+=.parabola1 pkgdesc='Document Viewer' -pkgdesc+=', with copy-protection anti-feature turned off by default' +pkgdesc+=', with copy-protection anti-feature turned off by default and without nonfree unrar recommendation' arch=(x86_64) arch+=(i686 armv7h) url="https://kde.org/applications/graphics/okular/"; license=(GPL LGPL FDL) groups=(kde-applications kdegraphics) -depends=(djvulibre libspectre libkexiv2 poppler-qt5 qca-qt5 kpty kactivities threadweaver kjs kparts purpose) -makedepends=(extra-cmake-modules ebook-tools kdegraphics-mobipocket kdoctools khtml python chmlib discount) -optdepends=('ebook-tools: mobi and epub support' 'discount: markdown support' - 'kdegraphics-mobipocket: mobi support' 'kirigami2: mobile UI' 'libzip: CHM support' - 'khtml: CHM support' 'chmlib: CHM support' 'calligra: ODT and ODP support') -conflicts=(kdegraphics-okular) -replaces=(kdegraphics-okular) -source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) +depends=(djvulibre libspectre libkexiv2 poppler-qt5 qca kpty kactivities threadweaver kjs kparts purpose discount phonon-qt5) +makedepends=(extra-cmake-modules ebook-tools kdegraphics-mobipocket kdoctools khtml chmlib) +optdepends=('ebook-tools: mobi and epub support' + 'kdegraphics-mobipocket: mobi support' 'libzip: CHM support' + 'khtml: CHM support' 'chmlib: CHM support' 'calligra: ODT and ODP support' + 'unarchiver: Comic Book Archive support') +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} + CVE-2020-9359.patch::"https://invent.kde.org/kde/okular/-/commit/6a93a033.patch";) source+=('libre.patch') -sha256sums=('0a12549c2d90c13b8fa0838707924596eb12981bffc3a5b81410785a4e9e061d' +sha256sums=('c5de22cc4292e3b7adae3f6ef6566dcba33a1dd5995fb0b968ea3e705a4c04e0' 'SKIP' + '58ab539871a68e36de81c80bcd0258a755b64e1cc210430ba60a0e8d5fb51a44' '83cf760b3ae6e03d49e02369375dae3ecc05a6800d512dd9ffeaac1648c19457') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <[email protected]> +options=(!zipman) prepare() { mkdir -p build + patch -d $pkgname-$pkgver -p1 -i "$srcdir"/CVE-2020-9359.patch + cd $pkgname-$pkgver patch -Np1 -i "$srcdir"/libre.patch } @@ -41,9 +45,8 @@ prepare() { build() { cd build cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF + -DBUILD_TESTING=OFF \ + -DBUILD_OKULARKIRIGAMI=OFF make } -- 2.26.0
From 173ba3b998f55bef07072c8e4746372f3d51fb3a Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Thu, 26 Mar 2020 12:39:32 +0200 Subject: [PATCH 2/7] Sync with Arch Linux package version 0.9.8-1, update patch to fix build --- libre/doublecmd/PKGBUILD | 6 +- libre/doublecmd/libre.patch | 169 ++++++++++++++++++++---------------- 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; -- 2.26.0
From 3fc655ff2a3b2d4bf6dbb632fae26d910622d0ab Mon Sep 17 00:00:00 2001 From: grizzlyuser <[email protected]> Date: Thu, 26 Mar 2020 12:41:01 +0200 Subject: [PATCH 5/7] Sync with Arch Linux package version 5.68.0-1 --- libre/kio/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/kio/PKGBUILD b/libre/kio/PKGBUILD index 38478700d..50adc499d 100644 --- a/libre/kio/PKGBUILD +++ b/libre/kio/PKGBUILD @@ -9,7 +9,7 @@ # - removed support for not freedom-respecting search engines pkgname=kio -pkgver=5.67.0 +pkgver=5.68.0 pkgrel=1 pkgrel+=.parabola1 pkgdesc='Resource and network access abstraction' @@ -25,7 +25,7 @@ optdepends=('kio-extras: extra protocols support (sftp, fish and more)' 'kdoctoo groups=(kf5) source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}) source+=(duckduckgo_{html,lite}.desktop) -sha256sums=('47e2c266a59015d7bb83ea0cf8a035f85f871ae650a67abd3b95d5eb75ff54a0' +sha256sums=('9cc2fb2da84d6661a90eac81eb12c2e37921a5c34cbc1975f48d613e5a9d9eef' 'SKIP' '31910ab7393e67609f15e04a57f6406f63e6dae58b01bce0787741bc5958f292' '40466a9dad7075f2525e9e024720da7d7b49a22892b6fca8b81cc0e6408d2f7d') -- 2.26.0
_______________________________________________ Dev mailing list [email protected] https://lists.parabola.nu/mailman/listinfo/dev
