pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/calibre Update to 2.18. Lots of changes since 1.x...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e44b7cdbedf4
branches: trunk
changeset: 646348:e44b7cdbedf4
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Feb 08 00:37:09 2015 +0000
description:
Update to 2.18. Lots of changes since 1.x, most significant one probably
the switch from qt4 to qt5; but also support for more new readers and
more recipes.
Based on wip package by myself.
diffstat:
misc/calibre/Makefile | 69 ++++-----
misc/calibre/PLIST | 116 ++++++++++++++--
misc/calibre/distinfo | 16 +-
misc/calibre/patches/patch-setup_build__environment.py | 57 ++++++++
misc/calibre/patches/patch-setup_extensions.py | 24 +-
misc/calibre/patches/patch-src_calibre_linux.py | 17 +-
6 files changed, 215 insertions(+), 84 deletions(-)
diffs (truncated from 934 to 300 lines):
diff -r cd5b8fce2637 -r e44b7cdbedf4 misc/calibre/Makefile
--- a/misc/calibre/Makefile Sun Feb 08 00:33:16 2015 +0000
+++ b/misc/calibre/Makefile Sun Feb 08 00:37:09 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2015/01/08 10:20:34 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2015/02/08 00:37:09 wiz Exp $
-DISTNAME= calibre-1.48.0
-PKGREVISION= 4
+DISTNAME= calibre-2.18.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
EXTRACT_SUFX= .tar.xz
@@ -12,43 +11,38 @@
COMMENT= E-book library management application
LICENSE= gnu-gpl-v3
-DEPENDS+= help2man>=1.36.4:../../converters/help2man
-DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+#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>=2.2.1:../../textproc/py-lxml
+#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}-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
-# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
+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}-Pdf-[0-9]*:../../print/py-Pdf
DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
-DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
-DEPENDS+= ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
-DEPENDS+= ${PYPKGPREFIX}-apsw-[0-9]*:../../databases/py-apsw
+#DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
+DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
+DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
+# dateutil>=1.4.1
+# dns>=1.6.0
PYTHON_VERSIONED_DEPENDENCIES= dateutil dns
-# We also need the distfile for qt4-libs to extract some private header files
-# If QTVERSION changes, the distinfo file needs to be updated too.
-QTVERSION= 4.8.5 # from ../../x11/qt4/Makefile.common
-# Including that file to avoid hardcoding the version number won't work,
-# since it will occur in the distinfo anyway.
-QTNAME= qt-everywhere-opensource-src-${QTVERSION}
-DISTFILES+= ${QTNAME}.tar.gz
-MASTER_SITES+= http://releases.qt-project.org/qt4/source/
EXTRACT_USING= bsdtar
USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
USE_TOOLS+= pkg-config pax
PYTHON_VERSIONS_ACCEPTED= 27
-PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
+PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
PYDISTUTILSPKG= yes
PYSETUPOPTARGS= # empty
PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
-WRKSRC= ${WRKDIR}/calibre
INSTALLATION_DIRS= share/applications
INSTALLATION_DIRS= share/icons
@@ -64,7 +58,7 @@
FIX_PYTHON_PATHS+= */*/*/*/*/*/*.py
SUBST_CLASSES+= prefix
-SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
+SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt5/bin/qmake',"
SUBST_MESSAGE.prefix= Fixing path to QMAKE
SUBST_STAGE.prefix= post-patch
SUBST_FILES.prefix= setup/build_environment.py
@@ -91,6 +85,7 @@
MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
+MAKE_ENV+= SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
#MAKE_ENV+= WITH_USB=no
# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
@@ -104,24 +99,23 @@
chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
-# Get access to (some of) the Qt4 private header files (for qt_hack).
-post-wrapper:
- cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \
- ln -s ../../../../${QTNAME}/include/QtGui/private .
- cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \
- ln -s ../../../../${QTNAME}/include/QtCore/private .
-
+# 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
.include "../../lang/python/application.mk"
.include "../../lang/python/versioned_dependencies.mk"
.include "../../databases/sqlite3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.40
.include "../../devel/chmlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5
+.include "../../devel/libmtp/buildlink3.mk"
BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
.include "../../devel/libusb/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
@@ -137,12 +131,12 @@
# 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.podofo+= podofo>=0.8.2
+BUILDLINK_API_DEPENDS.poppler+= poppler>=0.20.2
.include "../../print/poppler-includes/buildlink3.mk"
.include "../../print/poppler/buildlink3.mk"
-BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.12.0
-.include "../../print/poppler-qt4/buildlink3.mk"
+.include "../../print/poppler-qt5/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/hal/buildlink3.mk"
BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2
@@ -151,10 +145,7 @@
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../textproc/py-elementtree/buildlink3.mk"
.include "../../x11/py-sip/buildlink3.mk"
-BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0
-.include "../../x11/py-qt4/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7.0
-.include "../../x11/qt4-tools/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.7.0
-.include "../../x11/qt4-qdbus/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 cd5b8fce2637 -r e44b7cdbedf4 misc/calibre/PLIST
--- a/misc/calibre/PLIST Sun Feb 08 00:33:16 2015 +0000
+++ b/misc/calibre/PLIST Sun Feb 08 00:37:09 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2014/08/08 22:02:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.29 2015/02/08 00:37:09 wiz Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@@ -216,6 +216,7 @@
lib/calibre/calibre/ebooks/conversion/plumber.py
lib/calibre/calibre/ebooks/conversion/preprocess.py
lib/calibre/calibre/ebooks/conversion/utils.py
+lib/calibre/calibre/ebooks/covers.py
lib/calibre/calibre/ebooks/djvu/__init__.py
lib/calibre/calibre/ebooks/djvu/djvu.py
lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
@@ -242,6 +243,9 @@
lib/calibre/calibre/ebooks/docx/writer/__init__.py
lib/calibre/calibre/ebooks/docx/writer/container.py
lib/calibre/calibre/ebooks/epub/__init__.py
+lib/calibre/calibre/ebooks/epub/cfi/__init__.py
+lib/calibre/calibre/ebooks/epub/cfi/parse.py
+lib/calibre/calibre/ebooks/epub/cfi/tests.py
lib/calibre/calibre/ebooks/epub/pages.py
lib/calibre/calibre/ebooks/epub/periodical.py
lib/calibre/calibre/ebooks/fb2/__init__.py
@@ -416,7 +420,6 @@
lib/calibre/calibre/ebooks/oeb/iterator/__init__.py
lib/calibre/calibre/ebooks/oeb/iterator/book.py
lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py
-lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py
lib/calibre/calibre/ebooks/oeb/iterator/spine.py
lib/calibre/calibre/ebooks/oeb/normalize_css.py
lib/calibre/calibre/ebooks/oeb/parse_utils.py
@@ -443,6 +446,7 @@
lib/calibre/calibre/ebooks/oeb/polish/parsing.py
lib/calibre/calibre/ebooks/oeb/polish/pretty.py
lib/calibre/calibre/ebooks/oeb/polish/replace.py
+lib/calibre/calibre/ebooks/oeb/polish/report.py
lib/calibre/calibre/ebooks/oeb/polish/spell.py
lib/calibre/calibre/ebooks/oeb/polish/split.py
lib/calibre/calibre/ebooks/oeb/polish/stats.py
@@ -458,6 +462,7 @@
lib/calibre/calibre/ebooks/oeb/stylizer.py
lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
lib/calibre/calibre/ebooks/oeb/transforms/cover.py
+lib/calibre/calibre/ebooks/oeb/transforms/data_url.py
lib/calibre/calibre/ebooks/oeb/transforms/embed_fonts.py
lib/calibre/calibre/ebooks/oeb/transforms/filenames.py
lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
@@ -640,6 +645,7 @@
lib/calibre/calibre/gui2/actions/save_to_disk.py
lib/calibre/calibre/gui2/actions/show_book_details.py
lib/calibre/calibre/gui2/actions/show_quickview.py
+lib/calibre/calibre/gui2/actions/show_template_tester.py
lib/calibre/calibre/gui2/actions/similar_books.py
lib/calibre/calibre/gui2/actions/sort.py
lib/calibre/calibre/gui2/actions/store.py
@@ -648,9 +654,6 @@
lib/calibre/calibre/gui2/actions/unpack_book.py
lib/calibre/calibre/gui2/actions/view.py
lib/calibre/calibre/gui2/add.py
-lib/calibre/calibre/gui2/add_wizard/__init__.py
-lib/calibre/calibre/gui2/add_wizard/scan_ui.py
-lib/calibre/calibre/gui2/add_wizard/welcome_ui.py
lib/calibre/calibre/gui2/auto_add.py
lib/calibre/calibre/gui2/bars.py
lib/calibre/calibre/gui2/book_details.py
@@ -663,7 +666,6 @@
lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
lib/calibre/calibre/gui2/comments_editor.py
-lib/calibre/calibre/gui2/complete.py
lib/calibre/calibre/gui2/complete2.py
lib/calibre/calibre/gui2/convert/__init__.py
lib/calibre/calibre/gui2/convert/azw3_output.py
@@ -731,7 +733,16 @@
lib/calibre/calibre/gui2/convert/xpath_wizard.py
lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
lib/calibre/calibre/gui2/cover_flow.py
+lib/calibre/calibre/gui2/covers.py
lib/calibre/calibre/gui2/custom_column_widgets.py
+lib/calibre/calibre/gui2/dbus_export/__init__.py
+lib/calibre/calibre/gui2/dbus_export/demo.py
+lib/calibre/calibre/gui2/dbus_export/gtk.py
+lib/calibre/calibre/gui2/dbus_export/menu.py
+lib/calibre/calibre/gui2/dbus_export/menu2.py
+lib/calibre/calibre/gui2/dbus_export/tray.py
+lib/calibre/calibre/gui2/dbus_export/utils.py
+lib/calibre/calibre/gui2/dbus_export/widgets.py
lib/calibre/calibre/gui2/device.py
lib/calibre/calibre/gui2/device_drivers/__init__.py
lib/calibre/calibre/gui2/device_drivers/configwidget.py
@@ -764,6 +775,7 @@
lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py
lib/calibre/calibre/gui2/dialogs/conversion_error.py
lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
+lib/calibre/calibre/gui2/dialogs/custom_recipes.py
lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py
lib/calibre/calibre/gui2/dialogs/device_category_editor.py
@@ -811,8 +823,6 @@
lib/calibre/calibre/gui2/dialogs/template_line_editor.py
lib/calibre/calibre/gui2/dialogs/test_email_ui.py
lib/calibre/calibre/gui2/dialogs/trim_image.py
-lib/calibre/calibre/gui2/dialogs/user_profiles.py
-lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
lib/calibre/calibre/gui2/dnd.py
lib/calibre/calibre/gui2/ebook_download.py
lib/calibre/calibre/gui2/email.py
@@ -897,10 +907,12 @@
lib/calibre/calibre/gui2/preferences/tweaks_ui.py
lib/calibre/calibre/gui2/proceed.py
lib/calibre/calibre/gui2/progress_indicator/__init__.py
+lib/calibre/calibre/gui2/save.py
lib/calibre/calibre/gui2/search_box.py
lib/calibre/calibre/gui2/search_restriction_mixin.py
lib/calibre/calibre/gui2/shortcuts.py
lib/calibre/calibre/gui2/shortcuts_ui.py
+lib/calibre/calibre/gui2/splash.py
lib/calibre/calibre/gui2/store/__init__.py
lib/calibre/calibre/gui2/store/basic_config.py
lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
@@ -929,7 +941,6 @@
lib/calibre/calibre/gui2/store/search/search_ui.py
lib/calibre/calibre/gui2/store/search_result.py
lib/calibre/calibre/gui2/store/stores/__init__.py
-lib/calibre/calibre/gui2/store/stores/allegro_plugin.py
lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py
lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py
lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
@@ -942,6 +953,8 @@
lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
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
@@ -1005,6 +1018,11 @@
lib/calibre/calibre/gui2/tweak_book/boss.py
lib/calibre/calibre/gui2/tweak_book/char_select.py
lib/calibre/calibre/gui2/tweak_book/check.py
+lib/calibre/calibre/gui2/tweak_book/completion/__init__.py
+lib/calibre/calibre/gui2/tweak_book/completion/basic.py
+lib/calibre/calibre/gui2/tweak_book/completion/popup.py
+lib/calibre/calibre/gui2/tweak_book/completion/utils.py
+lib/calibre/calibre/gui2/tweak_book/completion/worker.py
lib/calibre/calibre/gui2/tweak_book/diff/__init__.py
Home |
Main Index |
Thread Index |
Old Index