[Dev] [PATCH] Updates to file-roller, khotkeys, libksysguard, linux-libre-tools, openexr, reflector
Andreas Grapentin
andreas at grapentin.org
Sun Apr 12 19:07:12 GMT 2020
Hi,
thanks for the patches. All are looking good, packages have been built
and released for i686, x86_64. Some ARM packages are still building.
-A
On Tue, Apr 07, 2020 at 05:56:31PM +0000, grizzlyuser wrote:
> Hi!
>
> Please find the patches attached with changes described in
> commit messages.
>
> Built on x86_64, i686 and armv7h.
> From c8b0f74fbf120cfc2575bfcc62093e3e49b36192 Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Tue, 7 Apr 2020 14:02:57 +0300
> Subject: [PATCH 1/6] libre/file-roller 3.36.1: Bump version
>
> ---
> libre/file-roller/PKGBUILD | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libre/file-roller/PKGBUILD b/libre/file-roller/PKGBUILD
> index 2fff5ed40..723612b4c 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.36.0
> +pkgver=3.36.1
> pkgrel=1
> pkgrel+=.parabola1
> pkgdesc="Create and modify archives"
> @@ -21,7 +21,7 @@ optdepends=('p7zip: 7z, arj, exe and encrypted zip files support'
> 'lrzip: lrzip archive support'
> 'squashfs-tools: squashfs image support')
> groups=(gnome)
> -_commit=448229e786ca0aa8392d796ce2a195c94888971e # tags/3.36.0^0
> +_commit=3e70dc594044b2792e8e2c50fa8ea79438b1ddfc # tags/3.36.1^0
> source=("git+https://gitlab.gnome.org/GNOME/file-roller.git#commit=$_commit")
> sha256sums=('SKIP')
>
> --
> 2.26.0
>
> From 98bf76c1a358d017dfebf0a0bb6486aed22dd9c8 Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Tue, 7 Apr 2020 14:03:42 +0300
> Subject: [PATCH 2/6] libre/khotkeys 5.18.4.1: Bump version
>
> ---
> libre/khotkeys/PKGBUILD | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libre/khotkeys/PKGBUILD b/libre/khotkeys/PKGBUILD
> index 8695ade84..963687dba 100644
> --- a/libre/khotkeys/PKGBUILD
> +++ b/libre/khotkeys/PKGBUILD
> @@ -6,7 +6,7 @@
> # Contributor: jc_gargma <jc_gargma at iserlohn-fortress.net>
>
> pkgname=khotkeys
> -pkgver=5.18.3
> +pkgver=5.18.4.1
> pkgrel=1
> pkgrel+=.parabola1
> pkgdesc='KHotKeys'
> @@ -18,8 +18,8 @@ license=(LGPL)
> 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=('e2b459da176c369fecc46a0dfa151266e4778194b3b8d81c4d7bc423301ff204'
> +source=("https://download.kde.org/stable/plasma/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
> +sha256sums=('272f83576ab3b13203400854431e891c27d027684eebc720f2009734d3b7221f'
> 'SKIP')
> validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <jr at jriddell.org>
> '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bshah at kde.org>
> --
> 2.26.0
>
> From 54d05f317ed47bbc7f5b04aef55dde56563ef353 Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Tue, 7 Apr 2020 14:05:08 +0300
> Subject: [PATCH 3/6] libre/libksysguard 5.18.4.1: Sync with changes from Arch
> Linux
>
> ---
> libre/libksysguard/PKGBUILD | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/libre/libksysguard/PKGBUILD b/libre/libksysguard/PKGBUILD
> index 7435b778c..690836bde 100644
> --- a/libre/libksysguard/PKGBUILD
> +++ b/libre/libksysguard/PKGBUILD
> @@ -1,9 +1,10 @@
> # Maintainer (Arch): Felix Yan <felixonmars at archlinux.org>
> # Maintainer (Arch): Antonio Rojas <arojas at archlinux.org>
> # Contributor (Arch): Andrea Scarpino <andrea at archlinux.org>
> +# Contributor: grizzlyuser <grizzlyuser at protonmail.com>
>
> pkgname=libksysguard
> -pkgver=5.18.3
> +pkgver=5.18.4.1
> pkgrel=1
> pkgrel+=.parabola1
> pkgdesc='Libraries for ksysguard'
> @@ -15,8 +16,8 @@ license=(LGPL)
> 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=('d46113b835cfa7561c7ebb1be5ae89200196befe77c9a53981b18141da381f81'
> +source=("https://download.kde.org/stable/plasma/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig})
> +sha256sums=('357be91db541876fa257b9be903484beb6577502a05f1610480ed0b198d16824'
> 'SKIP')
> validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell <jr at jriddell.org>
> '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bshah at kde.org>
> --
> 2.26.0
>
> From ccfac85e2c5a39742dc6e715cc2fb5ed4070fcc8 Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Tue, 7 Apr 2020 14:15:03 +0300
> Subject: [PATCH 4/6] libre/linux-libre-tools 5.6.1: Sync with Arch Linux,
> refresh patch
>
> Removed part of patch has been applied upstream:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/tools/perf/builtin-diff.c?h=v5.6&id=98e93245113d0f5c279ef77f4a9e7d097323ad71
> ---
> libre/linux-libre-tools/PKGBUILD | 46 +++++++++-----------
> libre/linux-libre-tools/perf-fix-types.patch | 13 ------
> 2 files changed, 21 insertions(+), 38 deletions(-)
>
> diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
> index 6e9a080df..a54342e1b 100644
> --- a/libre/linux-libre-tools/PKGBUILD
> +++ b/libre/linux-libre-tools/PKGBUILD
> @@ -24,7 +24,7 @@ case "$CARCH" in
> armv7h) pkgname+=('gpio-utils' 'iio-utils') ;;
> esac
>
> -pkgver=5.4.1
> +pkgver=5.6.1
> pkgver+=_gnu
> pkgrel=1
> license=('GPL2')
> @@ -54,41 +54,37 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver//_/-}/l
> 'cpupower.service'
> 'usbipd.service'
> 'perf-fix-types.patch')
> -sha256sums=('7d2ce65f26e9c9234091167b7558cc9a3de545236a1cec3a4e77d171d440f35c'
> +sha256sums=('c5f208af2d199e650ce609eb7ac4ece2a6909af679cc0a1de4dd8438f2ee05d8'
> 'SKIP'
> -# '2129f0a264ecb03a2a8ccd6a3e2270dec0b4c11c66d09262eb0f1bbf18fcaefc'
> -# 'SKIP'
> '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
> 'd2e8e5e8b22c6089a91f573aa1c59e442a1f3b67a2c9f047abe3b57d3d6558cc'
> 'fa2560630576464739ede14c9292249f4007f36a684bc378add174fc88394550'
> '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
> - 'aa08545851784262d1049da4df6f63bdb366b0ac21e2dbecc7fd31382bb4f4dc')
> + 'ca6b56540e2f8d6931c86978910d47e01bc28516c8b9ce616ecf6de2ba3daf4e')
> validpgpkeys=('474402C8C582DAFBE389C427BCB7CF877E7D47A7') # Alexandre Oliva
>
> prepare() {
> cd linux-${pkgver%_*}
>
> # apply patch from the source array (should be a pacman feature)
> - local filename
> - for filename in "${source[@]}"; do
> - filename="${filename##*/}"
> - if [[ "$filename" =~ \.patch$ ]]; then
> - msg2 "Applying patch $filename"
> - patch -p1 -N -i "$srcdir/$filename"
> - elif [[ "$filename" =~ ^patch- ]]; then
> - msg2 "Applying linux $filename"
> - patch -p1 -N -i "$srcdir/${filename%.*}"
> - fi
> + local src
> + for src in "${source[@]}"; do
> + src="${src%%::*}"
> + src="${src##*/}"
> + src="${src%.xz}"
> + [[ $src = *.patch || $src = patch-* ]] || continue
> + echo ":: Applying patch $src"
> + patch -p1 -N -i "$srcdir/$src"
> done
> }
>
> build() {
> - msg2 'libtraceevent'
> + echo ':: libtraceevent'
> pushd linux-${pkgver%_*}/tools/lib/traceevent
> make
> popd
>
> - msg2 'perf'
> + echo ':: perf'
> pushd linux-${pkgver%_*}/tools/perf
> make -f Makefile.perf \
> prefix=/usr \
> @@ -101,19 +97,19 @@ build() {
> DESTDIR="$pkgdir"
> popd
>
> - msg2 'cpupower'
> + echo ':: cpupower'
> pushd linux-${pkgver%_*}/tools/power/cpupower
> make VERSION=$pkgver-$pkgrel
> popd
>
> if [[ "$CARCH" == x86_64 ]] || [[ "$CARCH" == i686 ]]; then
> - msg2 'x86_energy_perf_policy'
> + echo ':: x86_energy_perf_policy'
> pushd linux-${pkgver%_*}/tools/power/x86/x86_energy_perf_policy
> make
> popd
> fi
>
> - msg2 'usbip'
> + echo ':: usbip'
> pushd linux-${pkgver%_*}/tools/usb/usbip
> # Fix gcc compilation
> sed -i 's,-Wall -Werror -Wextra,,' configure.ac
> @@ -122,30 +118,30 @@ fi
> make
> popd
>
> - msg2 'tmon'
> + echo ':: tmon'
> pushd linux-${pkgver%_*}/tools/thermal/tmon
> make
> popd
>
> - msg2 'cgroup_event_listener'
> + echo ':: cgroup_event_listener'
> pushd linux-${pkgver%_*}/tools/cgroup
> make
> popd
>
> if [[ "$CARCH" == x86_64 ]] || [[ "$CARCH" == i686 ]]; then
> - msg2 'turbostat'
> + echo ':: turbostat'
> pushd linux-${pkgver%_*}/tools/power/x86/turbostat
> make
> popd
> fi
>
> if [[ "$CARCH" == armv7h ]]; then
> - msg2 'gpio'
> + echo ':: gpio'
> pushd linux-${pkgver%_*}/tools/gpio
> make -j1
> popd
>
> - msg2 'iio'
> + echo ':: iio'
> pushd linux-${pkgver%_*}/tools/iio
> make -j1
> popd
> diff --git a/libre/linux-libre-tools/perf-fix-types.patch b/libre/linux-libre-tools/perf-fix-types.patch
> index 0b81586b0..cb6688acf 100644
> --- a/libre/linux-libre-tools/perf-fix-types.patch
> +++ b/libre/linux-libre-tools/perf-fix-types.patch
> @@ -1,16 +1,3 @@
> ---- linux-5.4.1/tools/perf/builtin-diff.c.orig 2019-11-29 04:10:32.000000000 -0500
> -+++ linux-5.4.1/tools/perf/builtin-diff.c 2020-01-19 15:54:20.558514973 -0500
> -@@ -575,8 +575,8 @@
> - if (!pairs_left && !pairs_right)
> - return 0;
> -
> -- l = labs(left->diff.cycles);
> -- r = labs(right->diff.cycles);
> -+ l = llabs(left->diff.cycles);
> -+ r = llabs(right->diff.cycles);
> - return r - l;
> - }
> -
> --- linux-5.4.1/tools/perf/util/session.c.orig 2019-11-29 04:10:32.000000000 -0500
> +++ linux-5.4.1/tools/perf/util/session.c 2020-01-19 16:13:39.628532016 -0500
> @@ -88,7 +88,7 @@
> --
> 2.26.0
>
> From 7d585c7e2b72771668d65ecb0f28a3d361625258 Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Tue, 7 Apr 2020 16:36:26 +0300
> Subject: [PATCH 5/6] libre/openexr 2.4.1-2.parabola2: Update URL, cleanup, add
> missing fonts
>
> [1] redirects to [2], so changed source URL accordingly.
>
> Since the documents are already in the tarball, no need to fetch them
> separately.
>
> Added most of the fonts used in the documents as makedepends. Without
> them, generated PDF files will display mostly tofu instead of glyphs.
> Of course these documents expect mostly Microsoft fonts, but luckily we
> have metric-compatible substitutions for them (please find the details
> in fontconfig file: /etc/fonts/conf.avail/30-metric-aliases.conf )
>
> [1] https://github.com/openexr/openexr/
> [2] https://github.com/AcademySoftwareFoundation/openexr
> ---
> libre/openexr/PKGBUILD | 35 +++++++----------------------------
> 1 file changed, 7 insertions(+), 28 deletions(-)
>
> diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD
> index 3831c2d48..ac5bf7377 100644
> --- a/libre/openexr/PKGBUILD
> +++ b/libre/openexr/PKGBUILD
> @@ -1,11 +1,12 @@
> # Maintainer (Arch): Tobias Powalowski <tpowa at archlinux.org>
> # Maintainer (Hyperbola): Andr?? Silva <emulatorman at hyperbola.info>
> # Maintainer: Omar Vega Ramos <ovruni at gnu.org.pe>
> +# Contributor: grizzlyuser <grizzlyuser at protonmail.com>
>
> pkgname=openexr
> pkgver=2.4.1
> pkgrel=2
> -pkgrel+=.parabola1
> +pkgrel+=.parabola2
> pkgdesc="An high dynamic-range image file format library"
> pkgdesc+=", without embedded nonfree fonts in the documentation"
> url="https://www.openexr.com/"
> @@ -14,32 +15,14 @@ arch+=('i686' 'armv7h')
> license=('BSD3')
> depends=('zlib')
> makedepends=('cmake' 'fltk' 'python' 'boost' 'freeglut' 'python-numpy' 'chrpath')
> -makedepends+=('unoconv' 'libepoxy')
> -optdepends=('fltk: for exrdisplay' 'boost-libs: python support' 'python: python support')
> +makedepends+=('unoconv' 'libepoxy' 'ttf-croscore' 'ttf-caladea' 'ttf-carlito' 'gsfonts' 'ttf-bitstream-vera')
> +optdepends=('fltk: for exrdisplay' 'boost-libs: python support' 'python: python support')
> conflicts=('ilmbase')
> replaces=('ilmbase')
> -source=($pkgname-$pkgver.tar.gz::"https://github.com/openexr/openexr/archive/v$pkgver.tar.gz"
> - openexr-pc-prefix.patch::"https://github.com/AcademySoftwareFoundation/openexr/commit/0b26a9de.patch"
> - "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
> - "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
> - "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
> - "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
> - "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt"
> - "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR_Viewers/doc/OpenEXRViewers.odt")
> +source=($pkgname-$pkgver.tar.gz::"https://github.com/AcademySoftwareFoundation/openexr/archive/v$pkgver.tar.gz"
> + openexr-pc-prefix.patch::"https://github.com/AcademySoftwareFoundation/openexr/commit/0b26a9de.patch")
> sha256sums=('3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1'
> - 'f20d7588badb679828816e0ada201705b7d1cc5a4d82df3d586707a792b10950'
> - '6fc748b44fc4c52680db233143b53a199988f51682b206c623b05238a6fdbcbe'
> - '38c46075f7efe02e231d32753966ffa463f2a3c4673dd8ea71dd47560c403db0'
> - '854942160870b4c442dc249e10d8f540aa554bd793ce40576bda430f90b7f995'
> - 'a4fdf678244f6c37e5ae126a9385a2e154b824b67e1746ed10bc17907c6b45ba'
> - 'fab77bb2afb3d580387249807300fa26c70eaf46ca23a0036165bafee607dc4e'
> - '27467ce4cad8a84cb63b2da2d58454834eac8830c2516cbe8846f32324517a92')
> -noextract=(InterpretingDeepPixels.docx
> - MultiViewOpenEXR.odt
> - OpenEXRFileLayout.odt
> - ReadingAndWritingImageFiles.odt
> - TechnicalIntroduction.odt
> - OpenEXRViewers.odt)
> + 'f20d7588badb679828816e0ada201705b7d1cc5a4d82df3d586707a792b10950')
>
> prepare() {
> cd $pkgname-$pkgver
> @@ -49,10 +32,6 @@ prepare() {
> rm -v OpenEXR/doc/{InterpretingDeepPixels,MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction,TheoryDeepPixels}.pdf
> rm -v OpenEXR_Viewers/doc/OpenEXRViewers.pdf
>
> - # add source documentation
> - install -m644 -v "$srcdir/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} OpenEXR/doc
> - install -m644 -v "$srcdir/"OpenEXRViewers.odt OpenEXR_Viewers/doc
> -
> # convert source documentation to pdf format and clean source code
> pushd OpenEXR/doc
> unoconv -v -f pdf {InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt}
> --
> 2.26.0
>
> From 7d908b577029f390fb6fd10c28374e47f9f1baaf Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Tue, 7 Apr 2020 16:37:05 +0300
> Subject: [PATCH 6/6] libre/reflector 2020.3.21.2-1: Sync with Arch Linux,
> update rebranding
>
> ---
> libre/reflector/PKGBUILD | 12 ++-
> libre/reflector/rebranding.patch | 132 ++++++++++++++++++-------------
> 2 files changed, 86 insertions(+), 58 deletions(-)
>
> diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
> index ba202b072..ab95cbdec 100644
> --- a/libre/reflector/PKGBUILD
> +++ b/libre/reflector/PKGBUILD
> @@ -1,10 +1,11 @@
> # Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>
> # Maintainer (Hyperbola): Andr?? Silva <emulatorman at parabola.nu>
> # Maintainer: Omar Vega Ramos <ovruni at gnu.org.pe>
> +# Contributor: grizzlyuser <grizzlyuser at protonmail.com>
>
> pkgname=reflector
> -pkgver=2019.10
> -pkgrel=2.parabola1
> +pkgver=2020.3.21.2
> +pkgrel=1
> pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
> arch=(any)
> license=(GPL)
> @@ -18,9 +19,9 @@ source=(
> https://xyne.archlinux.ca/projects/reflector/src/reflector-${pkgver}.tar.xz.sig
> rebranding.patch
> )
> -sha512sums=('9f39934456840f1a86036ed71eb942fff92a9b2cb7d0f679e1e9ab371ae21cc4da7035ba4dcc88919ceab41d45f5d07ae3abe336037d1785dc8231df0c97eb6c'
> +sha512sums=('cdb1ae3806fca6dd7dd7dccc75ef677e70ceec5d61b140315ef88540513abd7131dc2260f261444d801490368ab73194c7718d974c6191c7c354fcb811ba35e2'
> 'SKIP'
> - 'c38c90c428b9761e84d4cbc1cf6a679772264ae5a8aafc4cc961fa5fd1f63ef0628a9621944f2b51ff54d8092dea5cdfdb4d1d07b6c39c4ca57f0f50a942b923')
> + 'f9b86f7b63398adcd037a332d9f335b35f5a3dee7aeeb3b38e6ae11ed3b038c82bf47f9e94281bb2d1942f10056197209ce48433f1769f26554dbff6c9ad69ec')
>
> validpgpkeys=('EC3CBE7F607D11E663149E811D1F0DC78F173680')
>
> @@ -28,7 +29,9 @@ prepare ()
> {
> cd "$srcdir/$pkgname-$pkgver"
> # Rebranding for Parabola
> + gunzip "man/${pkgname}.1.gz"
> patch -Np1 -i "$srcdir/rebranding.patch"
> + gzip "man/${pkgname}.1"
> }
>
> package ()
> @@ -36,4 +39,5 @@ package ()
> cd "$srcdir/$pkgname-$pkgver"
> python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
> install -Dm755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname"
> + install -Dm644 "man/${pkgname}.1.gz" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz"
> }
> diff --git a/libre/reflector/rebranding.patch b/libre/reflector/rebranding.patch
> index 7cade23f5..1afa8e554 100644
> --- a/libre/reflector/rebranding.patch
> +++ b/libre/reflector/rebranding.patch
> @@ -1,8 +1,17 @@
> diff --git a/Reflector.py b/Reflector.py
> -index 1f22f18..64d6453 100644
> +index 5263316..3498174 100644
> --- a/Reflector.py
> +++ b/Reflector.py
> -@@ -42,7 +42,7 @@ import urllib.request
> +@@ -20,7 +20,7 @@
> + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> +
> + '''
> +-Retrieve Arch Linux mirrors.
> ++Retrieve Parabola GNU/Linux-libre mirrors.
> + '''
> +
> + import argparse
> +@@ -48,7 +48,7 @@ import urllib.request
>
> NAME = 'Reflector'
>
> @@ -11,59 +20,74 @@ index 1f22f18..64d6453 100644
>
> DISPLAY_TIME_FORMAT = '%Y-%m-%d %H:%M:%S UTC'
> PARSE_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
> -@@ -436,7 +436,7 @@ def format_mirrorlist(mirror_status, mtime, include_country=False, command=None)
> +@@ -440,7 +440,7 @@ def format_mirrorlist(mirror_status, mtime, include_country=False, command=None,
>
> - width = 80
> - colw = 11
> -- header = '# Arch Linux mirrorlist generated by Reflector #'.center(width, '#')
> -+ header = '# Parabola GNU/Linux-libre mirrorlist generated by Reflector #'.center(width, '#')
> - border = '#' * len(header)
> - mirrorlist = ''
> - mirrorlist = '{}\n{}\n{}\n'.format(border, header, border) + \
> -@@ -496,8 +496,18 @@ class MirrorStatus():
> - 'extra',
> - 'gnome-unstable',
> - 'kde-unstable',
> -+ 'libre',
> -+ 'libre-testing',
> -+ 'libre-multilib',
> -+ 'libre-multilib-testing',
> - 'multilib',
> -- 'multilib-testing'
> -+ 'multilib-testing',
> -+ 'nonprism',
> -+ 'nonprism-testing',
> -+ 'pcr',
> -+ 'kernels',
> -+ 'java',
> -+ 'cross',
> - 'staging',
> - 'testing'
> - )
> -@@ -655,7 +665,7 @@ def add_arguments(parser):
> - '''
> - Add reflector arguments to the argument parser.
> - '''
> -- parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Arch Linux mirrors')
> -+ parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors')
> + width = 80
> + colw = 11
> +- header = '# Arch Linux mirrorlist generated by Reflector #'.center(width, '#')
> ++ header = '# Parabola GNU/Linux-libre mirrorlist generated by Reflector #'.center(width, '#')
> + border = '#' * len(header)
> + mirrorlist = f'{border}\n{header}\n{border}\n\n' + \
> + '\n'.join(
> +@@ -494,8 +494,18 @@ class MirrorStatus():
> + 'extra',
> + 'gnome-unstable',
> + 'kde-unstable',
> ++ 'libre',
> ++ 'libre-testing',
> ++ 'libre-multilib',
> ++ 'libre-multilib-testing',
> + 'multilib',
> +- 'multilib-testing'
> ++ 'multilib-testing',
> ++ 'nonprism',
> ++ 'nonprism-testing',
> ++ 'pcr',
> ++ 'kernels',
> ++ 'java',
> ++ 'cross',
> + 'staging',
> + 'testing'
> + )
> +@@ -638,7 +648,7 @@ def add_arguments(parser):
> + '''
> + Add reflector arguments to the argument parser.
> + '''
> +- parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Arch Linux mirrors')
> ++ parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors')
>
> - parser.add_argument(
> - '--connection-timeout', type=int, metavar='n', default=DEFAULT_CONNECTION_TIMEOUT,
> -@@ -674,7 +684,7 @@ def add_arguments(parser):
> + parser.add_argument(
> + '--connection-timeout', type=int, metavar='n', default=DEFAULT_CONNECTION_TIMEOUT,
> +@@ -657,7 +667,7 @@ def add_arguments(parser):
>
> - parser.add_argument(
> - '--cache-timeout', type=int, metavar='n', default=DEFAULT_CACHE_TIMEOUT,
> -- help='The cache timeout in seconds for the data retrieved from the Arch Linux Mirror Status API. The default is %(default)s.'
> -+ help='The cache timeout in seconds for the data retrieved from the Parabola GNU/Linux-libre Mirror Status API. The default is %(default)s.'
> - )
> + parser.add_argument(
> + '--cache-timeout', type=int, metavar='n', default=DEFAULT_CACHE_TIMEOUT,
> +- help='The cache timeout in seconds for the data retrieved from the Arch Linux Mirror Status API. The default is %(default)s.'
> ++ help='The cache timeout in seconds for the data retrieved from the Parabola GNU/Linux-libre Mirror Status API. The default is %(default)s.'
> + )
>
> - parser.add_argument(
> -@@ -784,7 +794,7 @@ def parse_args(args=None):
> - Parse command-line arguments.
> - '''
> - parser = argparse.ArgumentParser(
> -- description='retrieve and filter a list of the latest Arch Linux mirrors'
> -+ description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors'
> - )
> - parser = add_arguments(parser)
> - options = parser.parse_args(args)
> + parser.add_argument(
> +@@ -769,7 +779,7 @@ def parse_args(args=None):
> + Parse command-line arguments.
> + '''
> + parser = argparse.ArgumentParser(
> +- description='retrieve and filter a list of the latest Arch Linux mirrors'
> ++ description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors'
> + )
> + parser = add_arguments(parser)
> + options = parser.parse_args(args)
> +diff --git a/man/reflector.1 b/man/reflector.1
> +index 4a9a5d2..139dec6 100644
> +--- a/man/reflector.1
> ++++ b/man/reflector.1
> +@@ -11,8 +11,8 @@ reflector - retrieve and filter the latest Pacman mirrorlist
> + .SH DESCRIPTION
> + .PP
> + reflector is a Python script and associated Python module that can
> +-retrieve up-to-date Arch Linux mirror data from the Mirror
> +-Status (https://www.archlinux.org/mirrors/status/) web interface.
> ++retrieve up-to-date Parabola GNU/Linux-libre mirror data from the
> ++Mirror Status (https://www.parabola.nu/mirrors/status/) web interface.
> + .SH ARGUMENTS
> + .PP
> + See \f[C]reflector --help\f[R].
> --
> 2.26.0
>
> _______________________________________________
> Dev mailing list
> Dev at lists.parabola.nu
> https://lists.parabola.nu/mailman/listinfo/dev
--
------------------------------------------------------------------------------
my GPG Public Key: https://files.grapentin.org/.gpg/public.key
------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <https://lists.parabola.nu/pipermail/dev/attachments/20200412/e2cfe7b9/attachment-0001.sig>
More information about the Dev
mailing list