From: numerys <numerys@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gscan2pdf: corrected a patch to make tesseract available
Date: Fri, 24 Mar 2023 12:20:36 +0100 [thread overview]
Message-ID: <20230324112036.-LQdvU4646sxriyn1qKibqNFbH4TyJBmMwXOBED204U@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42968@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]
There is an updated pull request by numerys against master on the void-packages repository
https://github.com/numerys/void-packages gscan2pdf
https://github.com/void-linux/void-packages/pull/42968
gscan2pdf: corrected a patch to make tesseract available
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/42968.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gscan2pdf-42968.patch --]
[-- Type: text/x-diff, Size: 8700 bytes --]
From 2883085f3e826d774f7fb7e0958875940e771850 Mon Sep 17 00:00:00 2001
From: numerys <g@numerys.net>
Date: Thu, 23 Mar 2023 23:26:02 +0100
Subject: [PATCH 1/6] 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 <owenlaw222@gmail.com>
Date: Wed, 22 Mar 2023 22:03:28 -0400
Subject: [PATCH 2/6] 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 <michal@vasilek.cz>"
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?=
<congdanhqx@gmail.com>
Date: Fri, 24 Mar 2023 07:34:55 +0700
Subject: [PATCH 3/6] 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?=
<congdanhqx@gmail.com>
Date: Fri, 24 Mar 2023 07:34:34 +0700
Subject: [PATCH 4/6] 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 <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 7265d002ce38341e06c6ace50199eb36e8d6d73a1345e728741ed2eaadce2b0e"
+ b29f03f08d91cf885e165394ad2e67c81eb3d393b9ca53fda848775b6f6ccfe2"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From 2d3e9876a6578e37dbb5968a1a709ed3cf22e3ab Mon Sep 17 00:00:00 2001
From: numerys <g@numerys.net>
Date: Thu, 23 Mar 2023 23:26:02 +0100
Subject: [PATCH 5/6] 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 3e88fdc33771898752f2c3a88be45924a817edb4 Mon Sep 17 00:00:00 2001
From: numerys <g@numerys.net>
Date: Thu, 23 Mar 2023 23:26:02 +0100
Subject: [PATCH 6/6] 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
next prev parent reply other threads:[~2023-03-24 11:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-24 1:00 [PR PATCH] " numerys
2023-03-24 2:06 ` classabbyamp
2023-03-24 10:17 ` [PR PATCH] [Updated] " numerys
2023-03-24 10:30 ` numerys
2023-03-24 11:20 ` numerys [this message]
2023-03-24 11:38 ` numerys
2023-03-24 11:50 ` numerys
2023-03-25 2:00 ` classabbyamp
2023-03-28 14:34 ` [PR PATCH] [Updated] " numerys
2023-03-28 17:49 ` numerys
2023-03-28 21:14 ` numerys
2023-03-28 21:14 ` numerys
2023-03-28 21:26 ` numerys
2023-03-29 14:25 ` numerys
2023-03-29 14:32 ` [PR PATCH] [Merged]: " Hoshpak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230324112036.-LQdvU4646sxriyn1qKibqNFbH4TyJBmMwXOBED204U@z \
--to=numerys@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).