* Re: [PR PATCH] [Updated] calibre: update liberation fonts location
2023-03-24 0:38 [PR PATCH] calibre: update liberation fonts location sgn
@ 2023-03-24 0:44 ` sgn
2023-03-24 1:25 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2023-03-24 0:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1288 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages calibre-fix
https://github.com/void-linux/void-packages/pull/42963
calibre: update liberation fonts location
Fix: #42953
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42963.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calibre-fix-42963.patch --]
[-- Type: text/x-diff, Size: 3649 bytes --]
From 5372d134611930fe8ae611eea203ec940700ce43 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] 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
}
^ permalink raw reply [flat|nested] 3+ messages in thread