update to calibre-2.82.0
This commit is contained in:
sthen
parent
16e0d83f2c
commit
8828e740f4
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.57 2017/02/06 22:39:05 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.58 2017/03/28 10:57:51 sthen Exp $
|
||||
|
||||
COMMENT = ebook management application
|
||||
|
||||
V = 2.78.0
|
||||
V = 2.82.0
|
||||
DISTNAME = calibre-$V
|
||||
CATEGORIES = textproc
|
||||
EXTRACT_SUFX = .tar.xz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (calibre-2.78.0.tar.xz) = 0rCwxUUdOsBc6d4LgB3fjedmT+5F8nPX7oRFoewviYs=
|
||||
SIZE (calibre-2.78.0.tar.xz) = 38739404
|
||||
SHA256 (calibre-2.82.0.tar.xz) = E3mVq+Rn/LlRwdQlgzBevse4ykA8RIlecPgqLWFWcRw=
|
||||
SIZE (calibre-2.82.0.tar.xz) = 38823912
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-setup___init___py,v 1.5 2016/06/27 23:05:11 sthen Exp $
|
||||
--- setup/__init__.py.orig Fri Jun 24 02:54:27 2016
|
||||
+++ setup/__init__.py Mon Jun 27 23:55:25 2016
|
||||
$OpenBSD: patch-setup___init___py,v 1.6 2017/03/28 10:57:51 sthen Exp $
|
||||
--- setup/__init__.py.orig Sat Mar 18 04:19:33 2017
|
||||
+++ setup/__init__.py Tue Mar 28 11:50:22 2017
|
||||
@@ -14,7 +14,8 @@ isosx = 'darwin' in sys.platform
|
||||
isfreebsd = 'freebsd' in sys.platform
|
||||
isnetbsd = 'netbsd' in sys.platform
|
||||
@ -8,6 +8,6 @@ $OpenBSD: patch-setup___init___py,v 1.5 2016/06/27 23:05:11 sthen Exp $
|
||||
-isbsd = isnetbsd or isfreebsd or isdragonflybsd
|
||||
+isopenbsd = 'openbsd' in sys.platform
|
||||
+isbsd = isnetbsd or isfreebsd or isopenbsd or isdragonflybsd
|
||||
islinux = not isosx and not iswindows and not isbsd
|
||||
ishaiku = 'haiku1' in sys.platform
|
||||
islinux = not isosx and not iswindows and not isbsd and not ishaiku
|
||||
sys.setup_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
SRC = os.path.abspath(os.path.join(os.path.dirname(sys.setup_dir), 'src'))
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-setup_build_py,v 1.2 2017/02/06 22:39:05 sthen Exp $
|
||||
--- setup/build.py.orig Fri Jan 27 03:46:08 2017
|
||||
+++ setup/build.py Sun Feb 5 13:34:05 2017
|
||||
$OpenBSD: patch-setup_build_py,v 1.3 2017/03/28 10:57:51 sthen Exp $
|
||||
--- setup/build.py.orig Sat Mar 18 04:19:33 2017
|
||||
+++ setup/build.py Tue Mar 28 11:48:35 2017
|
||||
@@ -36,13 +36,6 @@ class Extension(object):
|
||||
self.cflags = d['cflags'] = kwargs.get('cflags', [])
|
||||
self.ldflags = d['ldflags'] = kwargs.get('ldflags', [])
|
||||
@ -15,11 +15,11 @@ $OpenBSD: patch-setup_build_py,v 1.2 2017/02/06 22:39:05 sthen Exp $
|
||||
self.qt_private_headers = d['qt_private_headers'] = kwargs.get('qt_private', [])
|
||||
|
||||
|
||||
@@ -154,6 +147,7 @@ def init_env():
|
||||
@@ -156,6 +149,7 @@ def init_env():
|
||||
cflags.append('-pthread')
|
||||
ldflags.append('-shared')
|
||||
cflags.append('-I'+sysconfig.get_python_inc())
|
||||
+ ldflags.append('-L'+os.path.join(sysconfig.PREFIX))
|
||||
ldflags.append('-lpython'+sysconfig.get_python_version())
|
||||
|
||||
if isosx:
|
||||
if ishaiku:
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
$OpenBSD: patch-src_calibre_constants_py,v 1.5 2017/01/12 23:39:53 sthen Exp $
|
||||
$OpenBSD: patch-src_calibre_constants_py,v 1.6 2017/03/28 10:57:51 sthen Exp $
|
||||
|
||||
- add OpenBSD to list of recognized BSDs.
|
||||
|
||||
USB (and probably MTP) support needs more work, the current code only
|
||||
supports OSX, Windows, and Linux SYSFS.
|
||||
|
||||
--- src/calibre/constants.py.orig Fri Dec 30 03:16:06 2016
|
||||
+++ src/calibre/constants.py Thu Jan 12 23:27:17 2017
|
||||
@@ -21,7 +21,8 @@ isnewosx = isosx and getattr(sys, 'new_app_bundle', F
|
||||
--- src/calibre/constants.py.orig Sat Mar 18 04:19:33 2017
|
||||
+++ src/calibre/constants.py Tue Mar 28 11:49:40 2017
|
||||
@@ -22,7 +22,8 @@ isnewosx = isosx and getattr(sys, 'new_app_bundle', F
|
||||
isfreebsd = 'freebsd' in _plat
|
||||
isnetbsd = 'netbsd' in _plat
|
||||
isdragonflybsd = 'dragonfly' in _plat
|
||||
-isbsd = isfreebsd or isnetbsd or isdragonflybsd
|
||||
+isopenbsd = 'openbsd' in _plat
|
||||
+isbsd = isfreebsd or isnetbsd or isdragonflybsd or isopenbsd
|
||||
islinux = not(iswindows or isosx or isbsd)
|
||||
ishaiku = 'haiku1' in _plat
|
||||
islinux = not(iswindows or isosx or isbsd or ishaiku)
|
||||
isfrozen = hasattr(sys, 'frozen')
|
||||
isunix = isosx or islinux
|
||||
@@ -167,7 +168,7 @@ class Plugins(collections.Mapping):
|
||||
@@ -171,7 +172,7 @@ class Plugins(collections.Mapping):
|
||||
plugins.extend(['winutil', 'wpd', 'winfonts'])
|
||||
if isosx:
|
||||
plugins.append('usbobserver')
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.28 2017/02/06 22:39:05 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.29 2017/03/28 10:57:51 sthen Exp $
|
||||
bin/calibre
|
||||
bin/calibre-complete
|
||||
bin/calibre-customize
|
||||
@ -740,8 +740,6 @@ lib/calibre/calibre/ebooks/metadata/kdl.py
|
||||
lib/calibre/calibre/ebooks/metadata/kdl.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/kfx.py
|
||||
lib/calibre/calibre/ebooks/metadata/kfx.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/library_thing.py
|
||||
lib/calibre/calibre/ebooks/metadata/library_thing.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/lit.py
|
||||
lib/calibre/calibre/ebooks/metadata/lit.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/lrx.py
|
||||
@ -809,8 +807,12 @@ lib/calibre/calibre/ebooks/metadata/sources/ozon.py
|
||||
lib/calibre/calibre/ebooks/metadata/sources/ozon.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/sources/prefs.py
|
||||
lib/calibre/calibre/ebooks/metadata/sources/prefs.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/sources/search_engines.py
|
||||
lib/calibre/calibre/ebooks/metadata/sources/search_engines.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/sources/test.py
|
||||
lib/calibre/calibre/ebooks/metadata/sources/test.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/sources/update.py
|
||||
lib/calibre/calibre/ebooks/metadata/sources/update.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/sources/worker.py
|
||||
lib/calibre/calibre/ebooks/metadata/sources/worker.pyc
|
||||
lib/calibre/calibre/ebooks/metadata/tag_mapper.py
|
||||
@ -2788,6 +2790,8 @@ lib/calibre/calibre/utils/ordered_dict.pyc
|
||||
lib/calibre/calibre/utils/podofo/
|
||||
lib/calibre/calibre/utils/podofo/__init__.py
|
||||
lib/calibre/calibre/utils/podofo/__init__.pyc
|
||||
lib/calibre/calibre/utils/random_ua.py
|
||||
lib/calibre/calibre/utils/random_ua.pyc
|
||||
lib/calibre/calibre/utils/rapydscript.py
|
||||
lib/calibre/calibre/utils/rapydscript.pyc
|
||||
lib/calibre/calibre/utils/recycle_bin.py
|
||||
@ -3221,7 +3225,6 @@ share/calibre/catalog/section_list_templates.pyc
|
||||
share/calibre/catalog/stylesheet.css
|
||||
share/calibre/catalog/template.xhtml
|
||||
share/calibre/coffee-script.js
|
||||
share/calibre/common-user-agents.txt
|
||||
share/calibre/compiled_coffeescript.zip
|
||||
share/calibre/content-server/
|
||||
share/calibre/content-server/autoreload.js
|
||||
@ -3587,6 +3590,7 @@ share/calibre/rapydscript/lib/pythonize.pyj
|
||||
share/calibre/rapydscript/lib/random.pyj
|
||||
share/calibre/rapydscript/lib/re.pyj
|
||||
share/calibre/rapydscript/lib/traceback.pyj
|
||||
share/calibre/rapydscript/lib/uuid.pyj
|
||||
share/calibre/recipes/
|
||||
share/calibre/recipes/10minutos.recipe
|
||||
share/calibre/recipes/180.recipe
|
||||
@ -4069,6 +4073,7 @@ share/calibre/recipes/daum_net.recipe
|
||||
share/calibre/recipes/dawn.recipe
|
||||
share/calibre/recipes/daytona_beach.recipe
|
||||
share/calibre/recipes/dbb.recipe
|
||||
share/calibre/recipes/de_redactie_be.recipe
|
||||
share/calibre/recipes/de_standaard.png
|
||||
share/calibre/recipes/de_standaard.recipe
|
||||
share/calibre/recipes/deadspin.png
|
||||
@ -4327,6 +4332,7 @@ share/calibre/recipes/endgadget_ja.png
|
||||
share/calibre/recipes/endgadget_ja.recipe
|
||||
share/calibre/recipes/entrepeneur.png
|
||||
share/calibre/recipes/entrepeneur.recipe
|
||||
share/calibre/recipes/eos_wetenschap.recipe
|
||||
share/calibre/recipes/epl_talk.recipe
|
||||
share/calibre/recipes/epw.recipe
|
||||
share/calibre/recipes/equipped.png
|
||||
@ -4877,6 +4883,7 @@ share/calibre/recipes/klip_me.recipe
|
||||
share/calibre/recipes/klubknjige.recipe
|
||||
share/calibre/recipes/km_blog.png
|
||||
share/calibre/recipes/km_blog.recipe
|
||||
share/calibre/recipes/knack_be.recipe
|
||||
share/calibre/recipes/koegelokalavisen_dk.png
|
||||
share/calibre/recipes/koegelokalavisen_dk.recipe
|
||||
share/calibre/recipes/koldinglokalavisen_dk.png
|
||||
@ -5293,6 +5300,7 @@ share/calibre/recipes/ngz.png
|
||||
share/calibre/recipes/ngz.recipe
|
||||
share/calibre/recipes/niebezpiecznik.png
|
||||
share/calibre/recipes/niebezpiecznik.recipe
|
||||
share/calibre/recipes/nieuws_be.recipe
|
||||
share/calibre/recipes/nightflier.recipe
|
||||
share/calibre/recipes/nikkei_free.png
|
||||
share/calibre/recipes/nikkei_free.recipe
|
||||
@ -5317,6 +5325,7 @@ share/calibre/recipes/nordjyske_dk.png
|
||||
share/calibre/recipes/nordjyske_dk.recipe
|
||||
share/calibre/recipes/nortecastilla.png
|
||||
share/calibre/recipes/nortecastilla.recipe
|
||||
share/calibre/recipes/nos_nl.recipe
|
||||
share/calibre/recipes/noticias_r7.recipe
|
||||
share/calibre/recipes/noticias_unb.recipe
|
||||
share/calibre/recipes/novaya_gazeta.png
|
||||
@ -5839,6 +5848,7 @@ share/calibre/recipes/sportowefakty.png
|
||||
share/calibre/recipes/sportowefakty.recipe
|
||||
share/calibre/recipes/sportsillustrated.recipe
|
||||
share/calibre/recipes/sportsillustrated_columnists.recipe
|
||||
share/calibre/recipes/sporza_be.recipe
|
||||
share/calibre/recipes/st_louis_post_dispatch.png
|
||||
share/calibre/recipes/st_louis_post_dispatch.recipe
|
||||
share/calibre/recipes/stackoverflow.png
|
||||
@ -5954,7 +5964,6 @@ share/calibre/recipes/the_marker.recipe
|
||||
share/calibre/recipes/the_nation.png
|
||||
share/calibre/recipes/the_nation.recipe
|
||||
share/calibre/recipes/the_nation_thai.png
|
||||
share/calibre/recipes/the_nation_thai.recipe
|
||||
share/calibre/recipes/the_new_age_za.png
|
||||
share/calibre/recipes/the_new_age_za.recipe
|
||||
share/calibre/recipes/the_new_republic.recipe
|
||||
@ -5984,6 +5993,7 @@ share/calibre/recipes/theluminouslandscape.png
|
||||
share/calibre/recipes/theluminouslandscape.recipe
|
||||
share/calibre/recipes/themarketticker.png
|
||||
share/calibre/recipes/themarketticker.recipe
|
||||
share/calibre/recipes/themorningpaper.recipe
|
||||
share/calibre/recipes/thenews.recipe
|
||||
share/calibre/recipes/theoldfoodie.png
|
||||
share/calibre/recipes/theoldfoodie.recipe
|
||||
@ -6154,6 +6164,7 @@ share/calibre/recipes/vitalia.recipe
|
||||
share/calibre/recipes/viva.png
|
||||
share/calibre/recipes/viva.recipe
|
||||
share/calibre/recipes/vnexpress.recipe
|
||||
share/calibre/recipes/voetbal_belgie.recipe
|
||||
share/calibre/recipes/voice_of_america.png
|
||||
share/calibre/recipes/voice_of_america.recipe
|
||||
share/calibre/recipes/volksrant.png
|
||||
@ -6264,6 +6275,7 @@ share/calibre/recipes/zerohedge.png
|
||||
share/calibre/recipes/zerohedge.recipe
|
||||
share/calibre/recipes/ziarulfinanciar.png
|
||||
share/calibre/recipes/ziarulfinanciar.recipe
|
||||
share/calibre/recipes/zita_be.recipe
|
||||
share/calibre/recipes/ziuaveche.png
|
||||
share/calibre/recipes/ziuaveche.recipe
|
||||
share/calibre/recipes/znadplanszy_pl.recipe
|
||||
@ -6285,6 +6297,7 @@ share/calibre/templates/new_book.html
|
||||
share/calibre/templates/new_nav.html
|
||||
share/calibre/templates/rtf.xsl
|
||||
share/calibre/tracer.epub
|
||||
share/calibre/user-agent-data.json
|
||||
share/calibre/user-manual-translation-stats.json
|
||||
share/calibre/viewer/
|
||||
share/calibre/viewer/blank.html
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user