From 27c273cb43dc279361ee59754929c6c2876bbb7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 13 Dec 2023 22:57:41 +0700 Subject: [PATCH] calibre: update to 7.1.0. --- srcpkgs/calibre/patches/python-3.12.patch | 11 ++++++++ srcpkgs/calibre/template | 34 +++++++++++------------ 2 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 srcpkgs/calibre/patches/python-3.12.patch diff --git a/srcpkgs/calibre/patches/python-3.12.patch b/srcpkgs/calibre/patches/python-3.12.patch new file mode 100644 index 00000000000..8c309453a8d --- /dev/null +++ b/srcpkgs/calibre/patches/python-3.12.patch @@ -0,0 +1,11 @@ +--- a/calibre/src/templite/__init__.py ++++ b/calibre/src/templite/__init__.py +@@ -30,7 +30,7 @@ import sys, re + from polyglot.builtins import unicode_type + + class Templite: +- auto_emit = re.compile('(^[\'\"])|(^[a-zA-Z0-9_\[\]\'\"]+$)') ++ auto_emit = re.compile('(^[\'\"])|(^[a-zA-Z0-9_\\[\\]\'\"]+$)') + + def __init__(self, template, start='${', end='}$'): + if len(start) != 2 or len(end) != 2: diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 37b5c4c2a4f..c6adc019548 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre -version=6.17.0 -revision=4 +version=7.1.0 +revision=1 build_wrksrc=calibre build_style=python3-module pycompile_dirs="/usr/lib/calibre/" @@ -9,14 +9,14 @@ hostmakedepends="pkg-config cmake python3-BeautifulSoup4 python3-Pillow python3-apsw python3-css-parser python3-dateutil sip qt6-base python3-py7zr python3-html5-parser python3-msgpack python3-regex python3-mechanize mathjax liberation-fonts-ttf python3-zeroconf xdg-utils rapydscript-ng - python3-PyQt-builder python3-Markdown" + python3-PyQt-builder python3-Markdown python3-xxhash" makedepends="libinput-devel libmagick-devel libmtp-devel libstemmer-devel libpodofo-devel libwmf-devel libxkbcommon-devel poppler-cpp-devel freetype-devel uchardet-devel openssl-devel icu-devel libusb-devel sqlite-devel tslib-devel hunspell-devel hyphen-devel libstemmer-devel python3-pyqt6-devel python3-pyqt6-webengine-devel" depends="desktop-file-utils optipng poppler python3-BeautifulSoup4 - qt6-imageformats python3-Pygments python3-pycryptodome + qt6-imageformats python3-Pygments python3-pycryptodome python3-xxhash python3-Markdown python3-Pillow python3-zeroconf python3-Pygments python3-apsw python3-css-parser python3-cssselect python3-dateutil python3-jeepney python3-dnspython python3-feedparser python3-html5-parser python3-mechanize @@ -26,18 +26,18 @@ depends="desktop-file-utils optipng poppler python3-BeautifulSoup4 python3-pyqt6-network python3-pyqt6-dbus python3-pyqt6-opengl-widgets python3-pyqt6-widgets python3-pyqt6-gui python3-pyqt6-declarative python3-pyqt6-printsupport python3-pyqt6-webchannel python3-pyqt6-svg - python3-pyqt6-webengine python3-fonttools" + python3-pyqt6-pdf python3-pyqt6-webengine python3-fonttools" checkdepends="${depends} libjpeg-turbo-tools jxrlib" short_desc="Ebook management application" maintainer="skmpz " license="GPL-3.0-only" homepage="https://calibre-ebook.com" changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt" -_lover=7.4.3.2 +_lover=7.6.0.3 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz https://download.documentfoundation.org/libreoffice/src/${_lover%.*}/libreoffice-dictionaries-${_lover}.tar.xz" -checksum="1ca4abb8a5d850c1f5963e37080dd1a7795736538d5c4d4ff6014b687d7a368e - 3a55d5807b763827f820c4aee0a0fd9f44520e70629c9eb9748e1f8c57c64389" +checksum="70a515fad059e597579282dd24f75444a9d63f90798330944107a1550211824a + b932cdd6bd2ee717f3a09766c88fe90100b0c2c0509313c3ee297f95c084ee2e" python_version=3 lib32disabled=yes nocross=yes @@ -84,16 +84,16 @@ do_build() { --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 - python3 setup.py iso3166 + # python3 setup.py iso639 + # python3 setup.py iso3166 # python3 setup.py recent_uas - 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 + # 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 } do_check() {