Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] calibre: update to 7.6.0.
@ 2024-03-09 15:30 sgn
  2024-03-10  1:59 ` [PR PATCH] [Closed]: " sgn
  0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2024-03-09 15:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages calibre-update
https://github.com/void-linux/void-packages/pull/49202

calibre: update to 7.6.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### 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/49202.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-calibre-update-49202.patch --]
[-- Type: text/x-diff, Size: 2989 bytes --]

From 804cb35a19d14a76f86264d0ef99424e0acdd922 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: Sat, 9 Mar 2024 22:27:57 +0700
Subject: [PATCH] calibre: update to 7.6.0.

---
 srcpkgs/calibre/patches/python-3.12.patch |  4 ++--
 srcpkgs/calibre/template                  | 17 +++--------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/calibre/patches/python-3.12.patch b/srcpkgs/calibre/patches/python-3.12.patch
index 8c309453a8d80b..f48418f4233401 100644
--- a/srcpkgs/calibre/patches/python-3.12.patch
+++ b/srcpkgs/calibre/patches/python-3.12.patch
@@ -1,5 +1,5 @@
---- a/calibre/src/templite/__init__.py
-+++ b/calibre/src/templite/__init__.py
+--- a/src/templite/__init__.py
++++ b/src/templite/__init__.py
 @@ -30,7 +30,7 @@ import sys, re
  from polyglot.builtins import unicode_type
  
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index dc32b971180dd2..af7ffde580ff95 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,8 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=7.3.0
+version=7.6.0
 revision=1
-build_wrksrc=calibre
 build_helper=python3
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config cmake python3-BeautifulSoup4 python3-Pillow
@@ -33,19 +32,12 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
-_lover=7.6.4.1
-distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz
- https://download.documentfoundation.org/libreoffice/src/${_lover%.*}/libreoffice-dictionaries-${_lover}.tar.xz"
-checksum="7c174b5d244930155f40e7eea8ea87ce01d2f1f5d8ab6c79275f35a4a661012a
- 36c0526e4c12ab38dd1e1766cd878118dd5692578b80411b9b443e389e3712fa"
+distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
+checksum="7c3da44f01faf76c7a366f7736b510be66dc5e25fd847069a38c2f52f06a2c03"
 python_version=3
 lib32disabled=yes
 nocross="python3 setup.py gui"
 
-post_extract() {
-	mv calibre-${version} calibre
-}
-
 do_configure() {
 	# Remove unneeded files and libs
 	rm -rf resources/${pkgname}-portable.*
@@ -163,8 +155,6 @@ do_build() {
 	python3 setup.py build
 	python3 setup.py gui
 	python3 setup.py kakasi
-	python3 setup.py hyphenation \
-		--path-to-hyphenation "$wrksrc/libreoffice-${_lover}/dictionaries"
 	python3 setup.py liberation_fonts \
 		--system-liberation_fonts \
 		--path-to-liberation_fonts /usr/share/fonts/TTF/liberation
@@ -176,7 +166,6 @@ do_build() {
 	# python3 setup.py rapydscript
 	# python3 setup.py translations
 	# python3 setup.py resources \
-	# 	--path-to-hyphenation "$wrksrc/libreoffice-${_lover}/dictionaries" \
 	# 	--system-liberation_fonts \
 	# 	--path-to-liberation_fonts /usr/share/fonts/TTF/liberation \
 	# 	--path-to-mathjax /usr/share/mathjax --system-mathjax

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Closed]: calibre: update to 7.6.0.
  2024-03-09 15:30 [PR PATCH] calibre: update to 7.6.0 sgn
@ 2024-03-10  1:59 ` sgn
  0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2024-03-10  1:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]

There's a closed pull request on the void-packages repository

calibre: update to 7.6.0.
https://github.com/void-linux/void-packages/pull/49202

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### 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
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-03-10  1:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-09 15:30 [PR PATCH] calibre: update to 7.6.0 sgn
2024-03-10  1:59 ` [PR PATCH] [Closed]: " sgn

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).