mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
calibre: bump version
switch to python 3.8
This commit is contained in:
Jerome Duval
@@ -7,9 +7,9 @@ convenient reading. It is cross platform, running on Linux, Windows and macOS."
|
||||
HOMEPAGE="https://calibre-ebook.com/"
|
||||
COPYRIGHT="2008-2019 Kovid Goyal"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="6"
|
||||
SOURCE_URI="https://github.com/kovidgoyal/calibre/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="50855a25f7e219de81e19d2e5df462e1068b84c11556936aee372eb7f1950419"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.calibre-ebook.com/$portVersion/calibre-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="699392c018e834b63c9cc8bd022e2ccc4c49f4d31bf6acbc08bcbeed5bc7f6a2"
|
||||
PATCHES="calibre-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="calibre.rdef.in"
|
||||
|
||||
@@ -51,37 +51,36 @@ PROVIDES="
|
||||
REQUIRES="
|
||||
dbus$secondaryArchSuffix
|
||||
haiku$secondaryArchSuffix
|
||||
cmd:python2
|
||||
apsw_python
|
||||
beautifulsoup_python
|
||||
chardet_python
|
||||
css_parser_python
|
||||
dateutil_python
|
||||
# dbuspython_python
|
||||
dnspython_python
|
||||
dukpy_python
|
||||
feedparser_python
|
||||
html2text_python
|
||||
html5_parser_python
|
||||
html5lib_python
|
||||
lxml_python
|
||||
markdown_python
|
||||
mechanize_python
|
||||
msgpack_python
|
||||
# netifaces_python
|
||||
pillow_python
|
||||
# psutil_python
|
||||
pycrypto_python
|
||||
pygments_python
|
||||
pyqt_python
|
||||
regex_python
|
||||
setuptools_python
|
||||
sip_python
|
||||
sip_pyqt_python
|
||||
six_python
|
||||
soupsieve_python
|
||||
unrardll_python
|
||||
webencodings_python
|
||||
cmd:python3.8
|
||||
apsw_python38
|
||||
beautifulsoup_python38
|
||||
chardet_python38
|
||||
css_parser_python38
|
||||
dateutil_python38
|
||||
dbuspython_python38
|
||||
dnspython_python38
|
||||
dukpy_python38
|
||||
feedparser_python38
|
||||
html2text_python38
|
||||
html5_parser_python38
|
||||
html5lib_python38
|
||||
lxml_python38
|
||||
markdown_python38
|
||||
mechanize_python38
|
||||
msgpack_python38
|
||||
# netifaces_python38
|
||||
pillow_python38
|
||||
# psutil_python38
|
||||
pycrypto_python38
|
||||
pygments_python38
|
||||
pyqt5_python38
|
||||
regex_python38
|
||||
setuptools_python38
|
||||
six_python38
|
||||
soupsieve_python38
|
||||
unrardll_python38
|
||||
webencodings_python38
|
||||
pythonzeroconf_python38
|
||||
# lib:libdbus_1$secondaryArchSuffix
|
||||
# lib:libdbus_glib_1$secondaryArchSuffix
|
||||
# lib:libeasylzma$secondaryArchSuffix
|
||||
@@ -92,6 +91,8 @@ REQUIRES="
|
||||
lib:libgcrypt$secondaryArchSuffix
|
||||
lib:libglib_2.0$secondaryArchSuffix
|
||||
lib:libgpg_error$secondaryArchSuffix
|
||||
lib:libhunspell_1.7$secondaryArchSuffix
|
||||
lib:libhyphen$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libicui18n$secondaryArchSuffix >= 66
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
@@ -117,36 +118,38 @@ REQUIRES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
apsw_python
|
||||
beautifulsoup_python
|
||||
chardet_python
|
||||
css_parser_python
|
||||
dateutil_python
|
||||
# dbuspython_python
|
||||
dnspython_python
|
||||
dukpy_python
|
||||
feedparser_python
|
||||
html2text_python
|
||||
html5_parser_python
|
||||
html5lib_python
|
||||
lxml_python
|
||||
markdown_python
|
||||
mechanize_python
|
||||
msgpack_python
|
||||
# netifaces_python
|
||||
pillow_python
|
||||
# psutil_python
|
||||
pycrypto_python
|
||||
pygments_python
|
||||
pyqt_python
|
||||
regex_python
|
||||
setuptools_python
|
||||
sip_python
|
||||
sip_pyqt_python
|
||||
six_python
|
||||
soupsieve_python
|
||||
unrardll_python
|
||||
webencodings_python
|
||||
apsw_python38
|
||||
beautifulsoup_python38
|
||||
chardet_python38
|
||||
css_parser_python38
|
||||
dateutil_python38
|
||||
# dbuspython_python38
|
||||
dnspython_python38
|
||||
dukpy_python38
|
||||
feedparser_python38
|
||||
html2text_python38
|
||||
html5_parser_python38
|
||||
html5lib_python38
|
||||
lxml_python38
|
||||
markdown_python38
|
||||
mechanize_python38
|
||||
msgpack_python38
|
||||
# netifaces_python38
|
||||
pillow_python38
|
||||
# psutil_python38
|
||||
pycrypto_python38
|
||||
pygments_python38
|
||||
pyqt5_python38
|
||||
pyqt_builder_python38
|
||||
regex_python38
|
||||
setuptools_python38
|
||||
sip_python38
|
||||
# sip_pyqt_python38
|
||||
six_python38
|
||||
soupsieve_python38
|
||||
unrardll_python38
|
||||
webencodings_python38
|
||||
zeroconf_python38
|
||||
devel:libchm$secondaryArchSuffix
|
||||
# devel:libdbus_1$secondaryArchSuffix
|
||||
# devel:libdbus_glib_1$secondaryArchSuffix
|
||||
@@ -158,6 +161,8 @@ BUILD_REQUIRES="
|
||||
devel:libgcrypt$secondaryArchSuffix
|
||||
devel:libglib_2.0$secondaryArchSuffix
|
||||
devel:libgpg_error$secondaryArchSuffix
|
||||
devel:libhunspell_1.7$secondaryArchSuffix
|
||||
devel:libhyphen$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libicui18n$secondaryArchSuffix >= 66
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
@@ -188,8 +193,9 @@ BUILD_PREREQUIRES="
|
||||
cmd:nasm
|
||||
cmd:optipng
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python2 # Currently only Python2 supported by Calibre
|
||||
cmd:python2_pyrcc5$secondaryArchSuffix #pyqt
|
||||
cmd:python3.8
|
||||
cmd:pyrcc5
|
||||
cmd:qmake >= 5
|
||||
cmd:sip
|
||||
cmd:unrar
|
||||
"
|
||||
@@ -199,27 +205,27 @@ BUILD()
|
||||
# For current REQUIMENTS check:
|
||||
# https://github.com/kovidgoyal/build-calibre/blob/master/scripts/sources.json
|
||||
|
||||
export SIP_DIR=`finddir B_SYSTEM_DATA_DIRECTORY`
|
||||
export PODOFO_INC_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY`/podofo
|
||||
python=python3.8
|
||||
installLocation=$prefix/../pyqt5_python38/lib/$python/vendor-packages
|
||||
export BINDINGS_DIR=$installLocation/PyQt5/bindings/
|
||||
|
||||
python setup.py build
|
||||
python setup.py iso639
|
||||
python setup.py iso3166
|
||||
python setup.py resources || true # Something fishy here.
|
||||
LANG="en_US.UTF-8" $python setup.py build
|
||||
LANG="en_US.UTF-8" $python setup.py gui
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
export SIP_DIR=`finddir B_SYSTEM_DATA_DIRECTORY`
|
||||
export PODOFO_INC_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY`/podofo
|
||||
|
||||
python2 setup.py install \
|
||||
python=python3.8
|
||||
$python setup.py install \
|
||||
--prefix=$appsDir/Calibre
|
||||
|
||||
mv $appsDir/Calibre/bin/calibre $appsDir/Calibre/bin/Calibre
|
||||
|
||||
# Fix python path for scripts
|
||||
sed -i 's|/usr/bin/env |/bin/|' $appsDir/Calibre/bin/*
|
||||
sed -i 's|/usr/bin/env python3|/bin/python3.8|' $appsDir/Calibre/bin/*
|
||||
|
||||
# Preparing the attributes
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
@@ -249,5 +255,5 @@ TEST()
|
||||
export SIP_DIR=`finddir B_SYSTEM_DATA_DIRECTORY`
|
||||
export PODOFO_INC_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY`/podofo
|
||||
|
||||
python2 setup.py test
|
||||
python3.8 setup.py test
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
From 40c70501ccf2b1d48292cc85b416ca074dd7437a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Thu, 11 Apr 2019 09:38:10 +0200
|
||||
Subject: Crash workaround: disabling splashscreen, FIXME
|
||||
|
||||
|
||||
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
|
||||
index 9f15f8d..5baf33c 100644
|
||||
--- a/src/calibre/gui2/main.py
|
||||
+++ b/src/calibre/gui2/main.py
|
||||
@@ -331,7 +331,9 @@ class GuiRunner(QObject):
|
||||
def show_splash_screen(self):
|
||||
self.timed_print('Showing splash screen...')
|
||||
self.splash_screen = SplashScreen()
|
||||
- self.splash_screen.show()
|
||||
+ # FIXME! This is crashing somewhere in the splashscreen code on Haiku, workaround: disable.
|
||||
+ # self.splash_screen.show()
|
||||
+ # FIXME! This is crashing somewhere in the splashscreen code on Haiku, workaround: disable.
|
||||
self.splash_screen.show_message(_('Starting %s: Loading books...') % __appname__)
|
||||
self.timed_print('splash screen shown')
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
59
app-text/calibre/patches/calibre-5.10.1.patchset
Normal file
59
app-text/calibre/patches/calibre-5.10.1.patchset
Normal file
@@ -0,0 +1,59 @@
|
||||
From 39280bc4c3fa235564195b28a2373297438b14a4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Thu, 11 Apr 2019 09:38:10 +0200
|
||||
Subject: Crash workaround: disabling splashscreen, FIXME
|
||||
|
||||
|
||||
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
|
||||
index 776f8be..393cfe3 100644
|
||||
--- a/src/calibre/gui2/main.py
|
||||
+++ b/src/calibre/gui2/main.py
|
||||
@@ -345,7 +345,9 @@ class GuiRunner(QObject):
|
||||
def show_splash_screen(self):
|
||||
self.timed_print('Showing splash screen...')
|
||||
self.splash_screen = SplashScreen()
|
||||
- self.splash_screen.show()
|
||||
+ # FIXME! This is crashing somewhere in the splashscreen code on Haiku, workaround: disable.
|
||||
+ # self.splash_screen.show()
|
||||
+ # FIXME! This is crashing somewhere in the splashscreen code on Haiku, workaround: disable.
|
||||
self.splash_screen.show_message(_('Starting %s: Loading books...') % __appname__)
|
||||
self.timed_print('splash screen shown')
|
||||
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
From e542655d8a337fbab8c732af7e0fb0d64fca18db Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sun, 24 Jan 2021 17:31:18 +0100
|
||||
Subject: Haiku build
|
||||
|
||||
|
||||
diff --git a/setup/build.py b/setup/build.py
|
||||
index 44dad2a..fe4679d 100644
|
||||
--- a/setup/build.py
|
||||
+++ b/setup/build.py
|
||||
@@ -487,6 +487,7 @@ project-factory = "pyqtbuild:PyQtProject"
|
||||
|
||||
[tool.sip.project]
|
||||
sip-files-dir = "."
|
||||
+sip-include-dirs = ['{os.environ.get("BINDINGS_DIR")}']
|
||||
|
||||
[tool.sip.bindings.pictureflow]
|
||||
headers = {ext.headers}
|
||||
diff --git a/setup/translations.py b/setup/translations.py
|
||||
index b51b405..00c162a 100644
|
||||
--- a/setup/translations.py
|
||||
+++ b/setup/translations.py
|
||||
@@ -159,7 +159,7 @@ class POT(Command): # {{{
|
||||
f.seek(0), f.truncate(), f.write('\n'.join(lines).encode('utf-8'))
|
||||
break
|
||||
else:
|
||||
- raise SystemExit(f'Failed to add file_filter for {slug=} to config file')
|
||||
+ raise SystemExit(f'Failed to add file_filter for {slug} to config file')
|
||||
self.git('add .tx/config')
|
||||
self.upload_pot(resource=slug)
|
||||
self.git(['add', dest])
|
||||
--
|
||||
2.30.0
|
||||
|
||||
Reference in New Issue
Block a user