From 2883085f3e826d774f7fb7e0958875940e771850 Mon Sep 17 00:00:00 2001 From: numerys Date: Thu, 23 Mar 2023 23:26:02 +0100 Subject: [PATCH 01/10] gscan2pdf: corrected patch --- srcpkgs/gscan2pdf/patches/tesseract.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gscan2pdf/patches/tesseract.patch b/srcpkgs/gscan2pdf/patches/tesseract.patch index dd28bb2618a5..52ac12e7b450 100644 --- a/srcpkgs/gscan2pdf/patches/tesseract.patch +++ b/srcpkgs/gscan2pdf/patches/tesseract.patch @@ -13,13 +13,11 @@ # we can use --list-langs and not bother with tessdata ( undef, my $out, my $err ) = - Gscan2pdf::Document::exec_command( [ 'tesseract', '-v' ] ); -- if ( $err =~ /^tesseract[ ]([\d.]+)/xsm ) { + Gscan2pdf::Document::exec_command( [ 'tesseract-ocr', '-v' ] ); -+ if ( $err =~ /^tesseract-ocr[ ]([\d.]+)/xsm ) { + if ( $err =~ /^tesseract[ ]([\d.]+)/xsm ) { $version = $1; } -- elsif ( $out =~ /^tesseract[ ]([\d.]+)/xsm ) { -+ elsif ( $out =~ /^tesseract-ocr[ ]([\d.]+)/xsm ) { + elsif ( $out =~ /^tesseract[ ]([\d.]+)/xsm ) { $version = $1; } if ( not $version ) { return } From ca4df5ba5bd8199ce34288801c8f5224d5a51d8a Mon Sep 17 00:00:00 2001 From: Owen Law Date: Wed, 22 Mar 2023 22:03:28 -0400 Subject: [PATCH 02/10] nautilus: update to 44.0. --- srcpkgs/nautilus/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index bf934b66f63c..91329f37d77d 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=43.2 +version=44.0 revision=1 build_style=meson build_helper="gir" @@ -18,12 +18,12 @@ short_desc="GNOME file manager" maintainer="Michal Vasilek " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" -changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/master/NEWS" distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz" -checksum=a86a9aa7a455511b029ce49a1d8b4659c3c355b5d81d7360bb4d0de637afede0 +checksum=57b99ebb8e2b9c1512d381e53096188c087b33410d6c52d87a27bd60ee76ac7f # tests timeout: # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s -make_check=extended +make_check=ci-skip if [ "$CROSS_BUILD" ]; then # tests try to use tracker-sandbox from the wrong path, because of some confusion with libdir: From 95cbe8237d9b73032fd567ad6359eadadf421a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 24 Mar 2023 07:34:55 +0700 Subject: [PATCH 03/10] calibre: update liberation fonts location Fix: #42953 --- srcpkgs/calibre/template | 44 +++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index e58c2ccbc832..0f0733b7a575 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre version=6.13.0 -revision=1 +revision=2 build_wrksrc=calibre build_style=python3-module pycompile_dirs="/usr/lib/calibre/" @@ -81,7 +81,7 @@ do_build() { --path-to-hyphenation "$wrksrc/libreoffice-${_lover}/dictionaries" python3 setup.py liberation_fonts \ --system-liberation_fonts \ - --path-to-liberation_fonts /usr/share/fonts/TTF + --path-to-liberation_fonts /usr/share/fonts/TTF/liberation python3 setup.py mathjax \ --path-to-mathjax /usr/share/mathjax --system-mathjax python3 setup.py iso639 @@ -92,7 +92,7 @@ do_build() { python3 setup.py resources \ --path-to-hyphenation "$wrksrc/libreoffice-${_lover}/dictionaries" \ --system-liberation_fonts \ - --path-to-liberation_fonts /usr/share/fonts/TTF \ + --path-to-liberation_fonts /usr/share/fonts/TTF/liberation \ --path-to-mathjax /usr/share/mathjax --system-mathjax } @@ -111,6 +111,7 @@ do_check() { } do_install() { + local _khtml export QMAKE=${XBPS_WRAPPERDIR}/sip-qmake vmkdir usr/share/zsh/site-functions vmkdir usr/share/man @@ -121,23 +122,24 @@ do_install() { # fake some user-agent, otherwise we need to build recent_uas target, # which generates a (very long) list from current data, - cat <<-'EOF' >${DESTDIR}/usr/share/calibre/user-agent-data.json -{ - "chrome_versions": [ - {"chrome_version":"110.0.5481","date":"2023-02-07","webkit_version":"110"}, - {"chrome_version":"109.0.5414","date":"2023-01-10","webkit_version":"109"} - ], - "common_user_agents": [ - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36", - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36" - ], - "desktop_platforms": ["Windows NT 10.0; Win64; x64"], - "firefox_versions": ["110.0","109.0","108.0","102.0"], - "timestamp": "2023-02-24T04:17:21.721566+00:00", - "user_agents_popularity": { - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36": 252652, - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36": 115713 - } -} + _khtml="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko)" + cat <<-EOF >${DESTDIR}/usr/share/calibre/user-agent-data.json + { + "chrome_versions": [ + {"chrome_version":"110.0.5481","date":"2023-02-07","webkit_version":"110"}, + {"chrome_version":"109.0.5414","date":"2023-01-10","webkit_version":"109"} + ], + "common_user_agents": [ + "$_khtml Chrome/109.0.0.0 Safari/537.36", + "$_khtml Chrome/110.0.0.0 Safari/537.36" + ], + "desktop_platforms": ["Windows NT 10.0; Win64; x64"], + "firefox_versions": ["110.0","109.0","108.0","102.0"], + "timestamp": "2023-02-24T04:17:21.721566+00:00", + "user_agents_popularity": { + "$_khtml Chrome/109.0.0.0 Safari/537.36": 252652, + "$_khtml Chrome/110.0.0.0 Safari/537.36": 115713 + } + } EOF } From 4aa13c575ea0f282ce1c5fd28c78d80afb23ece9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 24 Mar 2023 07:34:34 +0700 Subject: [PATCH 04/10] linux6.1: update to 6.1.21. --- srcpkgs/linux6.1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template index 6c7608495487..01e101e767da 100644 --- a/srcpkgs/linux6.1/template +++ b/srcpkgs/linux6.1/template @@ -1,6 +1,6 @@ # Template file for 'linux6.1' pkgname=linux6.1 -version=6.1.20 +version=6.1.21 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Đoàn Trần Công Danh " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb - 7265d002ce38341e06c6ace50199eb36e8d6d73a1345e728741ed2eaadce2b0e" + b29f03f08d91cf885e165394ad2e67c81eb3d393b9ca53fda848775b6f6ccfe2" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. From 6f469e25df8e4834b4b3dc7a5da2fc317b9cdf76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 24 Mar 2023 10:03:04 +0700 Subject: [PATCH 05/10] perl-Linux-Distribution: use /etc/os-release --- srcpkgs/perl-Linux-Distribution/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/perl-Linux-Distribution/template b/srcpkgs/perl-Linux-Distribution/template index dc9f7341e239..4b3e6fd207d3 100644 --- a/srcpkgs/perl-Linux-Distribution/template +++ b/srcpkgs/perl-Linux-Distribution/template @@ -1,7 +1,7 @@ # Template file for 'perl-Linux-Distribution' pkgname=perl-Linux-Distribution version=0.23 -revision=3 +revision=4 build_style=perl-module hostmakedepends="perl" makedepends="perl" @@ -12,3 +12,11 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Linux-Distribution" distfiles="${CPAN_SITE}/Linux/Linux-Distribution-${version}.tar.gz" checksum=603e27da607b3e872a669d7a66d75982f0969153eab2d4b20c341347b4ebda5f + +post_patch() { + vsed -i -e 's/lsb-release/os-release/' \ + lib/Linux/Distribution.pm \ + t/Linux-Distribution.t \ + t/ubuntu1404/files + mv t/ubuntu1404/lsb-release t/ubuntu1404/os-release +} From 2330bfda6b55998af76f75594dff487abce269bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 24 Mar 2023 12:07:59 +0700 Subject: [PATCH 06/10] tzutils: update to 2023b. --- srcpkgs/tzutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template index 4335d4d3d3cd..7bdf99450589 100644 --- a/srcpkgs/tzutils/template +++ b/srcpkgs/tzutils/template @@ -1,6 +1,6 @@ # Template file for 'tzutils' pkgname=tzutils -version=2023a +version=2023b revision=1 bootstrap=yes short_desc="Time zone and daylight-saving time utilities" @@ -8,7 +8,7 @@ maintainer="Đoàn Trần Công Danh " license="Public Domain" homepage="https://www.iana.org/time-zones" distfiles="https://www.iana.org/time-zones/repository/releases/tzdb-${version}.tar.lz" -checksum=4ab2805f15f9a5a681e4f581cb54383d41ae25da506469b77b4239556038c652 +checksum=2694091b28981ae5af99d63d7b5f43905a698a96116db3d85131aa03be535cfb if [ "$CROSS_BUILD" ]; then hostmakedepends="tzutils" From db7a640ce9119b8d195cc397d144111d2e535a25 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 24 Mar 2023 04:41:19 -0400 Subject: [PATCH 07/10] sftpgo: fix make_dirs ownership/mode order --- srcpkgs/sftpgo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template index d923eb2430af..2feda6d3cff2 100644 --- a/srcpkgs/sftpgo/template +++ b/srcpkgs/sftpgo/template @@ -1,7 +1,7 @@ # Template file for 'sftpgo' pkgname=sftpgo version=2.3.5 -revision=1 +revision=2 build_style=go go_import_path=github.com/drakkan/sftpgo/v2 short_desc="Fully featured and highly configurable SFTP server" @@ -10,7 +10,7 @@ license="AGPL-3.0-only" homepage="https://github.com/drakkan/sftpgo" distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz" checksum=b5844ccbea92e458c9b132fcbcaa5976baa9cf2a9d864f9efc06c143886b4b13 -make_dirs="/var/lib/sftpgo root root 0750" +make_dirs="/var/lib/sftpgo 0750 root root" post_install() { vmkdir usr/share/sftpgo From 8b14e87d626f63a5f8078d6bef272fc55abf98f4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 24 Mar 2023 05:20:46 -0400 Subject: [PATCH 08/10] chezmoi: update to 2.33.0. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 1a2b4895bb43..68776ae4fb41 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.32.0 +version=2.33.0 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" @@ -12,7 +12,7 @@ maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=ccfa5188c5312fc1ffd90b89413736b0e66ae7f30c11a029851cc17ae36f032a +checksum=ea4155b54bfe267844390025dc2aff42118c413f14af9ed896b9713b32f2ed27 pre_build() { local _date From ce17eed85a3fd94208a9306d355524ee349586e4 Mon Sep 17 00:00:00 2001 From: numerys Date: Thu, 23 Mar 2023 23:26:02 +0100 Subject: [PATCH 09/10] gscan2pdf: corrected patch --- srcpkgs/gscan2pdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template index 875e3b598af7..a20f6e2f78ca 100644 --- a/srcpkgs/gscan2pdf/template +++ b/srcpkgs/gscan2pdf/template @@ -1,7 +1,7 @@ # Template file for 'gscan2pdf'. pkgname=gscan2pdf version=2.13.2 -revision=1 +revision=2 build_style=perl-module hostmakedepends="perl gettext" makedepends="ImageMagick djvulibre libmagick-perl perl-Config-General From 51937f379f140c24181b7eab409f4dcfbffd6a54 Mon Sep 17 00:00:00 2001 From: numerys Date: Thu, 23 Mar 2023 23:26:02 +0100 Subject: [PATCH 10/10] gscan2pdf: corrected patch --- srcpkgs/gscan2pdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template index a20f6e2f78ca..1c80a5d8b2be 100644 --- a/srcpkgs/gscan2pdf/template +++ b/srcpkgs/gscan2pdf/template @@ -1,4 +1,4 @@ -# Template file for 'gscan2pdf'. +# Template file for 'gscan2pdf' pkgname=gscan2pdf version=2.13.2 revision=2