pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/calibre calibre: update to 3.16.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a4eae3cfd1b6
branches: trunk
changeset: 374968:a4eae3cfd1b6
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Feb 01 16:05:56 2018 +0000
description:
calibre: update to 3.16.0.
Lots of changes since 2.x, too many to list here.
(2.x does not build against current qt5...)
diffstat:
misc/calibre/Makefile | 49 +-
misc/calibre/PLIST | 256 ++-------
misc/calibre/distinfo | 15 +-
misc/calibre/patches/patch-setup_build.py | 12 +-
misc/calibre/patches/patch-setup_build__environment.py | 15 +-
misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py | 24 -
6 files changed, 95 insertions(+), 276 deletions(-)
diffs (truncated from 982 to 300 lines):
diff -r 96bc7a1849ef -r a4eae3cfd1b6 misc/calibre/Makefile
--- a/misc/calibre/Makefile Thu Feb 01 14:25:30 2018 +0000
+++ b/misc/calibre/Makefile Thu Feb 01 16:05:56 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.192 2018/01/10 22:16:25 wiz Exp $
+# $NetBSD: Makefile,v 1.193 2018/02/01 16:05:56 wiz Exp $
-DISTNAME= calibre-2.85.1
-PKGREVISION= 8
+DISTNAME= calibre-3.16.0
CATEGORIES= misc
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
@@ -13,36 +12,29 @@
COMMENT= E-book library management application
LICENSE= gnu-gpl-v3
-DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
-#DEPENDS+= help2man>=1.36.4:../../converters/help2man
-DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
-#DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
-DEPENDS+= ${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml
-DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
+DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
+DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
+DEPENDS+= ${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree
+DEPENDS+= ${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
-DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
-DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
+DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
+DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
+DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
-# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
-# not sure if pkgsrc version would be ok or not
-#DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
-# includes own, modified copy of html5lib
-#DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
-DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
-DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
+DEPENDS+= ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
+DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+# for installation
+BUILD_DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
EXTRACT_USING= bsdtar
+PYTHON_VERSIONS_ACCEPTED= 27 # as of 3.16.0
+
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config pax
-PYTHON_VERSIONS_ACCEPTED= 27
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup
-PYDISTUTILSPKG= yes
PYSETUPOPTARGS= # empty
PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
@@ -90,11 +82,6 @@
MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
MAKE_ENV+= SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
MAKE_ENV+= LFLAGS=${LDFLAGS:Q}
-#MAKE_ENV+= WITH_USB=no
-
-# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-pre-configure:
- cd ${WRKSRC} && rm -rf src/cherrypy
# Turn off x bits on non-executable files.
post-extract:
@@ -103,15 +90,12 @@
chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
-# not sure why libheadless installed into wrong directory
-# side effect of patch-setup_extensions.py?
post-install:
cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
${DESTDIR}${PREFIX}/share/calibre/recipes
cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
COPYRIGHT INSTALL LICENSE.* \
${DESTDIR}${PREFIX}/share/doc/calibre
- cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so
${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
.include "../../lang/python/application.mk"
@@ -130,7 +114,6 @@
# Get rid of --root=${DESTDIR}, use our own version from above instead.
# because the setup.py is not the standard one and behaves differently.
_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
-#.include "../../lang/python/extension.mk"
BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2
.include "../../print/podofo/buildlink3.mk"
BUILDLINK_API_DEPENDS.poppler+= poppler>=0.20.2
@@ -143,9 +126,7 @@
.include "../../sysutils/py-dbus/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../textproc/py-elementtree/buildlink3.mk"
.include "../../x11/py-sip/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
-BUILDLINK_API_DEPENDS.py-qt5+= ${PYPKGPREFIX}-qt5>=5.4
.include "../../x11/py-qt5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 96bc7a1849ef -r a4eae3cfd1b6 misc/calibre/PLIST
--- a/misc/calibre/PLIST Thu Feb 01 14:25:30 2018 +0000
+++ b/misc/calibre/PLIST Thu Feb 01 16:05:56 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.82 2017/05/16 13:37:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.83 2018/02/01 16:05:56 wiz Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@@ -33,6 +33,31 @@
lib/calibre/calibre/db/backup.py
lib/calibre/calibre/db/cache.py
lib/calibre/calibre/db/categories.py
+lib/calibre/calibre/db/cli/__init__.py
+lib/calibre/calibre/db/cli/cmd_add.py
+lib/calibre/calibre/db/cli/cmd_add_custom_column.py
+lib/calibre/calibre/db/cli/cmd_add_format.py
+lib/calibre/calibre/db/cli/cmd_backup_metadata.py
+lib/calibre/calibre/db/cli/cmd_catalog.py
+lib/calibre/calibre/db/cli/cmd_check_library.py
+lib/calibre/calibre/db/cli/cmd_clone.py
+lib/calibre/calibre/db/cli/cmd_custom_columns.py
+lib/calibre/calibre/db/cli/cmd_embed_metadata.py
+lib/calibre/calibre/db/cli/cmd_export.py
+lib/calibre/calibre/db/cli/cmd_list.py
+lib/calibre/calibre/db/cli/cmd_list_categories.py
+lib/calibre/calibre/db/cli/cmd_remove.py
+lib/calibre/calibre/db/cli/cmd_remove_custom_column.py
+lib/calibre/calibre/db/cli/cmd_remove_format.py
+lib/calibre/calibre/db/cli/cmd_restore_database.py
+lib/calibre/calibre/db/cli/cmd_saved_searches.py
+lib/calibre/calibre/db/cli/cmd_search.py
+lib/calibre/calibre/db/cli/cmd_set_custom.py
+lib/calibre/calibre/db/cli/cmd_set_metadata.py
+lib/calibre/calibre/db/cli/cmd_show_metadata.py
+lib/calibre/calibre/db/cli/main.py
+lib/calibre/calibre/db/cli/tests.py
+lib/calibre/calibre/db/cli/utils.py
lib/calibre/calibre/db/delete_service.py
lib/calibre/calibre/db/errors.py
lib/calibre/calibre/db/fields.py
@@ -61,9 +86,6 @@
lib/calibre/calibre/devices/__init__.py
lib/calibre/calibre/devices/android/__init__.py
lib/calibre/calibre/devices/android/driver.py
-lib/calibre/calibre/devices/apple/__init__.py
-lib/calibre/calibre/devices/apple/driver.py
-lib/calibre/calibre/devices/apple/itunes.py
lib/calibre/calibre/devices/binatone/__init__.py
lib/calibre/calibre/devices/binatone/driver.py
lib/calibre/calibre/devices/blackberry/__init__.py
@@ -88,9 +110,6 @@
lib/calibre/calibre/devices/hanlin/driver.py
lib/calibre/calibre/devices/hanvon/__init__.py
lib/calibre/calibre/devices/hanvon/driver.py
-lib/calibre/calibre/devices/idevice/__init__.py
-lib/calibre/calibre/devices/idevice/libimobiledevice.py
-lib/calibre/calibre/devices/idevice/parse_xml.py
lib/calibre/calibre/devices/iliad/__init__.py
lib/calibre/calibre/devices/iliad/driver.py
lib/calibre/calibre/devices/interface.py
@@ -336,6 +355,7 @@
lib/calibre/calibre/ebooks/metadata/book/formatter.py
lib/calibre/calibre/ebooks/metadata/book/json_codec.py
lib/calibre/calibre/ebooks/metadata/book/render.py
+lib/calibre/calibre/ebooks/metadata/book/serialize.py
lib/calibre/calibre/ebooks/metadata/cli.py
lib/calibre/calibre/ebooks/metadata/docx.py
lib/calibre/calibre/ebooks/metadata/epub.py
@@ -691,6 +711,7 @@
lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
+lib/calibre/calibre/gui2/changes.py
lib/calibre/calibre/gui2/comments_editor.py
lib/calibre/calibre/gui2/complete2.py
lib/calibre/calibre/gui2/convert/__init__.py
@@ -831,8 +852,6 @@
lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
lib/calibre/calibre/gui2/dialogs/scheduler.py
lib/calibre/calibre/gui2/dialogs/search.py
-lib/calibre/calibre/gui2/dialogs/search_item_ui.py
-lib/calibre/calibre/gui2/dialogs/search_ui.py
lib/calibre/calibre/gui2/dialogs/select_formats.py
lib/calibre/calibre/gui2/dialogs/smartdevice.py
lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
@@ -851,6 +870,7 @@
lib/calibre/calibre/gui2/email.py
lib/calibre/calibre/gui2/filename_pattern_ui.py
lib/calibre/calibre/gui2/font_family_chooser.py
+lib/calibre/calibre/gui2/gestures.py
lib/calibre/calibre/gui2/icon_theme.py
lib/calibre/calibre/gui2/init.py
lib/calibre/calibre/gui2/job_indicator.py
@@ -858,12 +878,14 @@
lib/calibre/calibre/gui2/keyboard.py
lib/calibre/calibre/gui2/languages.py
lib/calibre/calibre/gui2/layout.py
+lib/calibre/calibre/gui2/layout_menu.py
lib/calibre/calibre/gui2/library/__init__.py
lib/calibre/calibre/gui2/library/alternate_views.py
lib/calibre/calibre/gui2/library/caches.py
lib/calibre/calibre/gui2/library/delegates.py
lib/calibre/calibre/gui2/library/models.py
lib/calibre/calibre/gui2/library/views.py
+lib/calibre/calibre/gui2/linux_file_dialogs.py
lib/calibre/calibre/gui2/lrf_renderer/__init__.py
lib/calibre/calibre/gui2/lrf_renderer/bookview.py
lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
@@ -920,7 +942,6 @@
lib/calibre/calibre/gui2/preferences/sending.py
lib/calibre/calibre/gui2/preferences/sending_ui.py
lib/calibre/calibre/gui2/preferences/server.py
-lib/calibre/calibre/gui2/preferences/server_ui.py
lib/calibre/calibre/gui2/preferences/template_functions.py
lib/calibre/calibre/gui2/preferences/template_functions_ui.py
lib/calibre/calibre/gui2/preferences/texture_chooser.py
@@ -929,6 +950,7 @@
lib/calibre/calibre/gui2/preferences/tweaks.py
lib/calibre/calibre/gui2/proceed.py
lib/calibre/calibre/gui2/progress_indicator/__init__.py
+lib/calibre/calibre/gui2/qt_file_dialogs.py
lib/calibre/calibre/gui2/save.py
lib/calibre/calibre/gui2/search_box.py
lib/calibre/calibre/gui2/search_restriction_mixin.py
@@ -978,7 +1000,6 @@
lib/calibre/calibre/gui2/store/stores/bn_plugin.py
lib/calibre/calibre/gui2/store/stores/bubok_portugal_plugin.py
lib/calibre/calibre/gui2/store/stores/bubok_publishing_plugin.py
-lib/calibre/calibre/gui2/store/stores/cdp_plugin.py
lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
@@ -991,7 +1012,6 @@
lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
-lib/calibre/calibre/gui2/store/stores/koobe_plugin.py
lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
lib/calibre/calibre/gui2/store/stores/litres_plugin.py
@@ -1008,17 +1028,14 @@
lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
lib/calibre/calibre/gui2/store/stores/nexto_plugin.py
-lib/calibre/calibre/gui2/store/stores/nook_uk_plugin.py
lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
lib/calibre/calibre/gui2/store/stores/publio_plugin.py
lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
-lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
-lib/calibre/calibre/gui2/store/stores/sony_plugin.py
+lib/calibre/calibre/gui2/store/stores/swiatebookow_plugin.py
lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
-lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
@@ -1140,7 +1157,6 @@
lib/calibre/calibre/library/catalogs/epub_mobi_builder.py
lib/calibre/calibre/library/catalogs/utils.py
lib/calibre/calibre/library/check_library.py
-lib/calibre/calibre/library/cli.py
lib/calibre/calibre/library/coloring.py
lib/calibre/calibre/library/comments.py
lib/calibre/calibre/library/custom_columns.py
@@ -1151,29 +1167,15 @@
lib/calibre/calibre/library/restore.py
lib/calibre/calibre/library/save_to_disk.py
lib/calibre/calibre/library/schema_upgrades.py
-lib/calibre/calibre/library/server/__init__.py
-lib/calibre/calibre/library/server/ajax.py
-lib/calibre/calibre/library/server/base.py
-lib/calibre/calibre/library/server/browse.py
-lib/calibre/calibre/library/server/cache.py
-lib/calibre/calibre/library/server/content.py
-lib/calibre/calibre/library/server/main.py
-lib/calibre/calibre/library/server/mobile.py
-lib/calibre/calibre/library/server/opds.py
-lib/calibre/calibre/library/server/utils.py
-lib/calibre/calibre/library/server/xml.py
lib/calibre/calibre/library/sqlite.py
-lib/calibre/calibre/library/test_cli.py
lib/calibre/calibre/libunzip.py
lib/calibre/calibre/linux.py
lib/calibre/calibre/plugins/_patiencediff_c.so
-lib/calibre/calibre/plugins/_regex.so
lib/calibre/calibre/plugins/bzzdec.so
lib/calibre/calibre/plugins/cPalmdoc.so
Home |
Main Index |
Thread Index |
Old Index