UPDATE: textproc/calibre

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: textproc/calibre

Stuart Henderson
Anyone want to give this a spin?

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/calibre/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 9 Nov 2013 15:02:14 -0000 1.24
+++ Makefile 15 Jan 2014 11:52:30 -0000
@@ -2,7 +2,7 @@
 
 COMMENT = ebook management application
 
-DISTNAME = calibre-1.10.0
+DISTNAME = calibre-1.19.0
 CATEGORIES = textproc
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX = .tar.xz
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/calibre/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 9 Nov 2013 15:02:14 -0000 1.6
+++ distinfo 15 Jan 2014 11:52:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (calibre-1.10.0.tar.xz) = LXwsVuir2g3e7bm5d9IwWZKngo1JJD/j5dsf0bEh0Jg=
-SIZE (calibre-1.10.0.tar.xz) = 30531340
+SHA256 (calibre-1.19.0.tar.xz) = QJ1q3Qvuv6zXkjaQAbAqerm7pdE8rMbAvXqGlgbD7q0=
+SIZE (calibre-1.19.0.tar.xz) = 32332536
Index: patches/patch-setup___init___py
===================================================================
RCS file: /cvs/ports/textproc/calibre/patches/patch-setup___init___py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-setup___init___py
--- patches/patch-setup___init___py 9 Nov 2013 15:02:14 -0000 1.1
+++ patches/patch-setup___init___py 15 Jan 2014 11:52:30 -0000
@@ -1,13 +1,13 @@
 $OpenBSD: patch-setup___init___py,v 1.1 2013/11/09 15:02:14 sthen Exp $
---- setup/__init__.py.orig Fri Nov  8 03:44:31 2013
-+++ setup/__init__.py Sat Nov  9 14:24:16 2013
-@@ -13,7 +13,8 @@ iswindows = re.search('win(32|64)', sys.platform)
- isosx = 'darwin' in sys.platform
+--- setup/__init__.py.orig Fri Jan 10 04:08:21 2014
++++ setup/__init__.py Tue Jan 14 22:35:06 2014
+@@ -14,7 +14,8 @@ isosx = 'darwin' in sys.platform
  isfreebsd = 'freebsd' in sys.platform
  isnetbsd = 'netbsd' in sys.platform
--isbsd = isnetbsd or isfreebsd
+ isdragonflybsd = 'dragonfly' in sys.platform
+-isbsd = isnetbsd or isfreebsd or isdragonflybsd
 +isopenbsd = 'openbsd' in sys.platform
-+isbsd = isnetbsd or isfreebsd or isopenbsd
++isbsd = isnetbsd or isfreebsd or isopenbsd or isdragonflybsd
  islinux = not isosx and not iswindows and not isbsd
  SRC = os.path.abspath('src')
  sys.path.insert(0, SRC)
Index: patches/patch-setup_extensions_py
===================================================================
RCS file: /cvs/ports/textproc/calibre/patches/patch-setup_extensions_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-setup_extensions_py
--- patches/patch-setup_extensions_py 9 Nov 2013 15:02:14 -0000 1.3
+++ patches/patch-setup_extensions_py 15 Jan 2014 11:52:30 -0000
@@ -8,8 +8,8 @@ may need /sys/ access to actually detect
 
 if updating patches, watch out for X11BASE -> /usr/X11R6 in last chunk
 
---- setup/extensions.py.orig Fri Nov  8 03:44:31 2013
-+++ setup/extensions.py Sat Nov  9 14:24:16 2013
+--- setup/extensions.py.orig Fri Jan 10 04:08:21 2014
++++ setup/extensions.py Tue Jan 14 22:34:03 2014
 @@ -12,7 +12,7 @@ from multiprocessing import cpu_count
 
  from PyQt4.pyqtconfig import QtGuiModuleMakefile
@@ -19,7 +19,7 @@ if updating patches, watch out for X11BA
  from setup.build_environment import (chmlib_inc_dirs,
          podofo_inc, podofo_lib, podofo_error, pyqt, OSX_SDK, NMAKE, QMAKE,
          msvc, MT, win_inc, win_lib, win_ddk, magick_inc_dirs, magick_lib_dirs,
-@@ -47,13 +47,6 @@ class Extension(object):
+@@ -46,13 +46,6 @@ class Extension(object):
          self.ldflags = kwargs.get('ldflags', [])
          self.optional = kwargs.get('optional', False)
          self.needs_ddk = kwargs.get('needs_ddk', False)
@@ -33,7 +33,7 @@ if updating patches, watch out for X11BA
 
      def preflight(self, obj_dir, compiler, linker, builder, cflags, ldflags):
          pass
-@@ -167,6 +160,7 @@ extensions = [
+@@ -182,6 +175,7 @@ extensions = [
                      libraries=['podofo'],
                      lib_dirs=[podofo_lib],
                      inc_dirs=[podofo_inc, os.path.dirname(podofo_inc)],
@@ -41,7 +41,7 @@ if updating patches, watch out for X11BA
                      error=podofo_error),
 
      Extension('pictureflow',
-@@ -247,9 +241,10 @@ if isosx:
+@@ -262,9 +256,10 @@ if isosx:
                  ldflags=['-framework', 'CoreServices', '-framework', 'IOKit'])
              )
 
@@ -53,7 +53,7 @@ if updating patches, watch out for X11BA
          libraries=['usb-1.0']
      ))
 
-@@ -263,6 +258,7 @@ if islinux or isosx:
+@@ -278,6 +273,7 @@ if islinux or isosx:
          'calibre/devices/mtp/unix/upstream/music-players.h',
          'calibre/devices/mtp/unix/upstream/device-flags.h',
          ],
@@ -61,7 +61,7 @@ if updating patches, watch out for X11BA
          libraries=['mtp']
      ))
 
-@@ -289,9 +285,9 @@ if isbsd:
+@@ -304,9 +300,9 @@ if isbsd:
      cflags.append('-pthread')
      ldflags.append('-shared')
      cflags.append('-I'+sysconfig.get_python_inc())
@@ -72,12 +72,12 @@ if updating patches, watch out for X11BA
  if isosx:
      x, p = ('i386', 'x86_64')
      archs = ['-arch', x, '-arch', p, '-isysroot',
-@@ -498,7 +494,7 @@ class Build(Command):
+@@ -513,7 +509,7 @@ class Build(Command):
          DESTDIR = .
          TARGET = calibre
          QT *= svg
 -        INCLUDEPATH *= {conf} {inc}
-+        INCLUDEPATH *= "/usr/X11R6/include" {conf} {inc}
++        INCLUDEPATH *= "${X11BASE}/include" {conf} {inc}
          win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
 
          # Force C++ language
Index: patches/patch-src_calibre_linux_py
===================================================================
RCS file: /cvs/ports/textproc/calibre/patches/patch-src_calibre_linux_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_calibre_linux_py
--- patches/patch-src_calibre_linux_py 9 Nov 2013 15:02:14 -0000 1.2
+++ patches/patch-src_calibre_linux_py 15 Jan 2014 11:52:30 -0000
@@ -4,8 +4,8 @@ Saves mime and desktop files on disk ins
 Adapted from archlinux patch:
 https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/calibre
 
---- src/calibre/linux.py.orig Fri Nov  8 03:44:31 2013
-+++ src/calibre/linux.py Sat Nov  9 14:27:11 2013
+--- src/calibre/linux.py.orig Fri Jan 10 04:08:21 2014
++++ src/calibre/linux.py Tue Jan 14 22:47:52 2014
 @@ -8,7 +8,7 @@ from subprocess import check_call
  from functools import partial
 
@@ -15,7 +15,7 @@ https://projects.archlinux.org/svntogit/
  from calibre.customize.ui import all_input_formats
  from calibre.ptempfile import TemporaryDirectory
  from calibre import CurrentDir
-@@ -450,19 +450,7 @@ class PostInstall:
+@@ -451,19 +451,7 @@ class PostInstall:
              self.setup_completion()
          if islinux or isbsd:
              self.setup_desktop_integration()
@@ -35,7 +35,7 @@ https://projects.archlinux.org/svntogit/
          if warn is None and self.warnings:
              self.info('There were %d warnings'%len(self.warnings))
              for args, kwargs in self.warnings:
-@@ -507,7 +495,7 @@ class PostInstall:
+@@ -510,7 +498,7 @@ class PostInstall:
              if os.path.exists(bc):
                  f = os.path.join(bc, 'calibre')
              else:
@@ -44,7 +44,7 @@ https://projects.archlinux.org/svntogit/
                      f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
                  else:
                      f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-@@ -651,65 +639,44 @@ class PostInstall:
+@@ -655,73 +643,50 @@ class PostInstall:
                  env['LD_LIBRARY_PATH'] = os.pathsep.join(npaths)
                  cc = partial(check_call, env=env)
 
@@ -74,6 +74,9 @@ https://projects.archlinux.org/svntogit/
 -                render_img('viewer.png', 'calibre-viewer.png')
 -                cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
 -                self.icon_resources.append(('apps', 'calibre-viewer', '128'))
+-                render_img('tweak.png', 'calibre-ebook-edit.png')
+-                cc('xdg-icon-resource install --size 128 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
+-                self.icon_resources.append(('apps', 'calibre-ebook-edit', '128'))
 +            with TemporaryDirectory() as tdir, CurrentDir(tdir):
 +                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
 +                os.mkdir(dir)
@@ -82,8 +85,9 @@ https://projects.archlinux.org/svntogit/
 +                render_img('mimetypes/tpz.png', os.path.join(dir,'calibre-tpz.png')) #  application-x-topaz-ebook
 +                render_img('mimetypes/azw2.png', os.path.join(dir,'calibre-azw2.png')) #  application-x-kindle-application
 +                render_img('mimetypes/azw3.png', os.path.join(dir,'calibre-azw3.png')) #  application-x-mobi8-ebook
-+                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
++                render_img('lt.png', os.path.join(dir,'calibre-gui.png'), width=256, height=256)
++                render_img('viewer.png', os.path.join(dir,'calibre-viewer.png'))
++                render_img('tweak.png', os.path.join(dir,'calibre-ebook-edit.png'))
 
                  mimetypes = set([])
                  for x in all_input_formats():
@@ -95,6 +99,7 @@ https://projects.archlinux.org/svntogit/
                  def write_mimetypes(f):
                      f.write('MimeType=%s;\n'%';'.join(mimetypes))
 
+                 from calibre.ebooks.oeb.polish.main import SUPPORTED
 -                f = open('calibre-lrfviewer.desktop', 'wb')
 +                dir = os.path.join(self.opts.staging_sharedir,'../applications')
 +                os.mkdir(dir)
@@ -105,6 +110,11 @@ https://projects.archlinux.org/svntogit/
 +                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
                  f.write(EVIEWER)
                  write_mimetypes(f)
+-                f = open('calibre-ebook-edit.desktop', 'wb')
++                f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
+                 f.write(ETWEAK)
+                 mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
+                 f.write('MimeType=%s;\n'%';'.join(mt))
                  f.close()
 -                f = open('calibre-gui.desktop', 'wb')
 +                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
@@ -112,7 +122,7 @@ https://projects.archlinux.org/svntogit/
                  write_mimetypes(f)
                  f.close()
 -                des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
--                        'calibre-ebook-viewer.desktop')
+-                        'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
 -                for x in des:
 -                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
 -                    cc(' '.join(cmd), shell=True)
@@ -129,7 +139,7 @@ https://projects.archlinux.org/svntogit/
          except Exception:
              if self.opts.fatal_errors:
                  raise
-@@ -857,7 +824,7 @@ GUI = '''\
+@@ -881,7 +846,7 @@ GUI = '''\
  [Desktop Entry]
  Version=1.0
  Type=Application
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/calibre/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 9 Nov 2013 15:02:14 -0000 1.8
+++ pkg/PLIST 15 Jan 2014 11:52:31 -0000
@@ -9,6 +9,7 @@ bin/calibre-smtp
 bin/calibredb
 bin/ebook-convert
 bin/ebook-device
+bin/ebook-edit
 bin/ebook-meta
 bin/ebook-polish
 bin/ebook-viewer
@@ -147,6 +148,8 @@ lib/calibre/calibre/devices/cybook/drive
 lib/calibre/calibre/devices/cybook/driver.pyc
 lib/calibre/calibre/devices/cybook/t2b.py
 lib/calibre/calibre/devices/cybook/t2b.pyc
+lib/calibre/calibre/devices/cybook/t4b.py
+lib/calibre/calibre/devices/cybook/t4b.pyc
 lib/calibre/calibre/devices/eb600/
 lib/calibre/calibre/devices/eb600/__init__.py
 lib/calibre/calibre/devices/eb600/__init__.pyc
@@ -528,6 +531,8 @@ lib/calibre/calibre/ebooks/html/meta.py
 lib/calibre/calibre/ebooks/html/meta.pyc
 lib/calibre/calibre/ebooks/html/to_zip.py
 lib/calibre/calibre/ebooks/html/to_zip.pyc
+lib/calibre/calibre/ebooks/html_entities.py
+lib/calibre/calibre/ebooks/html_entities.pyc
 lib/calibre/calibre/ebooks/htmlz/
 lib/calibre/calibre/ebooks/htmlz/__init__.py
 lib/calibre/calibre/ebooks/htmlz/__init__.pyc
@@ -884,10 +889,27 @@ lib/calibre/calibre/ebooks/oeb/parse_uti
 lib/calibre/calibre/ebooks/oeb/polish/
 lib/calibre/calibre/ebooks/oeb/polish/__init__.py
 lib/calibre/calibre/ebooks/oeb/polish/__init__.pyc
+lib/calibre/calibre/ebooks/oeb/polish/check/
+lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py
+lib/calibre/calibre/ebooks/oeb/polish/check/__init__.pyc
+lib/calibre/calibre/ebooks/oeb/polish/check/base.py
+lib/calibre/calibre/ebooks/oeb/polish/check/base.pyc
+lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py
+lib/calibre/calibre/ebooks/oeb/polish/check/fonts.pyc
+lib/calibre/calibre/ebooks/oeb/polish/check/images.py
+lib/calibre/calibre/ebooks/oeb/polish/check/images.pyc
+lib/calibre/calibre/ebooks/oeb/polish/check/links.py
+lib/calibre/calibre/ebooks/oeb/polish/check/links.pyc
+lib/calibre/calibre/ebooks/oeb/polish/check/main.py
+lib/calibre/calibre/ebooks/oeb/polish/check/main.pyc
+lib/calibre/calibre/ebooks/oeb/polish/check/parsing.py
+lib/calibre/calibre/ebooks/oeb/polish/check/parsing.pyc
 lib/calibre/calibre/ebooks/oeb/polish/container.py
 lib/calibre/calibre/ebooks/oeb/polish/container.pyc
 lib/calibre/calibre/ebooks/oeb/polish/cover.py
 lib/calibre/calibre/ebooks/oeb/polish/cover.pyc
+lib/calibre/calibre/ebooks/oeb/polish/create.py
+lib/calibre/calibre/ebooks/oeb/polish/create.pyc
 lib/calibre/calibre/ebooks/oeb/polish/embed.py
 lib/calibre/calibre/ebooks/oeb/polish/embed.pyc
 lib/calibre/calibre/ebooks/oeb/polish/errors.py
@@ -898,8 +920,12 @@ lib/calibre/calibre/ebooks/oeb/polish/ma
 lib/calibre/calibre/ebooks/oeb/polish/main.pyc
 lib/calibre/calibre/ebooks/oeb/polish/parsing.py
 lib/calibre/calibre/ebooks/oeb/polish/parsing.pyc
+lib/calibre/calibre/ebooks/oeb/polish/pretty.py
+lib/calibre/calibre/ebooks/oeb/polish/pretty.pyc
 lib/calibre/calibre/ebooks/oeb/polish/replace.py
 lib/calibre/calibre/ebooks/oeb/polish/replace.pyc
+lib/calibre/calibre/ebooks/oeb/polish/split.py
+lib/calibre/calibre/ebooks/oeb/polish/split.pyc
 lib/calibre/calibre/ebooks/oeb/polish/stats.py
 lib/calibre/calibre/ebooks/oeb/polish/stats.pyc
 lib/calibre/calibre/ebooks/oeb/polish/subset.py
@@ -917,6 +943,8 @@ lib/calibre/calibre/ebooks/oeb/polish/te
 lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.pyc
 lib/calibre/calibre/ebooks/oeb/polish/toc.py
 lib/calibre/calibre/ebooks/oeb/polish/toc.pyc
+lib/calibre/calibre/ebooks/oeb/polish/utils.py
+lib/calibre/calibre/ebooks/oeb/polish/utils.pyc
 lib/calibre/calibre/ebooks/oeb/reader.py
 lib/calibre/calibre/ebooks/oeb/reader.pyc
 lib/calibre/calibre/ebooks/oeb/stylizer.py
@@ -1320,6 +1348,8 @@ lib/calibre/calibre/gui2/actions/toc_edi
 lib/calibre/calibre/gui2/actions/toc_edit.pyc
 lib/calibre/calibre/gui2/actions/tweak_epub.py
 lib/calibre/calibre/gui2/actions/tweak_epub.pyc
+lib/calibre/calibre/gui2/actions/unpack_book.py
+lib/calibre/calibre/gui2/actions/unpack_book.pyc
 lib/calibre/calibre/gui2/actions/view.py
 lib/calibre/calibre/gui2/actions/view.pyc
 lib/calibre/calibre/gui2/add.py
@@ -1521,6 +1551,8 @@ lib/calibre/calibre/gui2/dialogs/add_fro
 lib/calibre/calibre/gui2/dialogs/add_from_isbn.pyc
 lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py
 lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.pyc
+lib/calibre/calibre/gui2/dialogs/authors_edit.py
+lib/calibre/calibre/gui2/dialogs/authors_edit.pyc
 lib/calibre/calibre/gui2/dialogs/book_info.py
 lib/calibre/calibre/gui2/dialogs/book_info.pyc
 lib/calibre/calibre/gui2/dialogs/catalog.py
@@ -1653,6 +1685,8 @@ lib/calibre/calibre/gui2/dialogs/templat
 lib/calibre/calibre/gui2/dialogs/template_line_editor.pyc
 lib/calibre/calibre/gui2/dialogs/test_email_ui.py
 lib/calibre/calibre/gui2/dialogs/test_email_ui.pyc
+lib/calibre/calibre/gui2/dialogs/trim_image.py
+lib/calibre/calibre/gui2/dialogs/trim_image.pyc
 lib/calibre/calibre/gui2/dialogs/user_profiles.py
 lib/calibre/calibre/gui2/dialogs/user_profiles.pyc
 lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
@@ -2058,9 +2092,19 @@ lib/calibre/calibre/gui2/tweak_book/__in
 lib/calibre/calibre/gui2/tweak_book/__init__.pyc
 lib/calibre/calibre/gui2/tweak_book/boss.py
 lib/calibre/calibre/gui2/tweak_book/boss.pyc
+lib/calibre/calibre/gui2/tweak_book/char_select.py
+lib/calibre/calibre/gui2/tweak_book/char_select.pyc
+lib/calibre/calibre/gui2/tweak_book/check.py
+lib/calibre/calibre/gui2/tweak_book/check.pyc
 lib/calibre/calibre/gui2/tweak_book/editor/
 lib/calibre/calibre/gui2/tweak_book/editor/__init__.py
 lib/calibre/calibre/gui2/tweak_book/editor/__init__.pyc
+lib/calibre/calibre/gui2/tweak_book/editor/canvas.py
+lib/calibre/calibre/gui2/tweak_book/editor/canvas.pyc
+lib/calibre/calibre/gui2/tweak_book/editor/image.py
+lib/calibre/calibre/gui2/tweak_book/editor/image.pyc
+lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py
+lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.pyc
 lib/calibre/calibre/gui2/tweak_book/editor/syntax/
 lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py
 lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.pyc
@@ -2080,14 +2124,20 @@ lib/calibre/calibre/gui2/tweak_book/file
 lib/calibre/calibre/gui2/tweak_book/file_list.pyc
 lib/calibre/calibre/gui2/tweak_book/job.py
 lib/calibre/calibre/gui2/tweak_book/job.pyc
-lib/calibre/calibre/gui2/tweak_book/keyboard.py
-lib/calibre/calibre/gui2/tweak_book/keyboard.pyc
 lib/calibre/calibre/gui2/tweak_book/main.py
 lib/calibre/calibre/gui2/tweak_book/main.pyc
+lib/calibre/calibre/gui2/tweak_book/preferences.py
+lib/calibre/calibre/gui2/tweak_book/preferences.pyc
 lib/calibre/calibre/gui2/tweak_book/preview.py
 lib/calibre/calibre/gui2/tweak_book/preview.pyc
 lib/calibre/calibre/gui2/tweak_book/save.py
 lib/calibre/calibre/gui2/tweak_book/save.pyc
+lib/calibre/calibre/gui2/tweak_book/search.py
+lib/calibre/calibre/gui2/tweak_book/search.pyc
+lib/calibre/calibre/gui2/tweak_book/templates.py
+lib/calibre/calibre/gui2/tweak_book/templates.pyc
+lib/calibre/calibre/gui2/tweak_book/toc.py
+lib/calibre/calibre/gui2/tweak_book/toc.pyc
 lib/calibre/calibre/gui2/tweak_book/ui.py
 lib/calibre/calibre/gui2/tweak_book/ui.pyc
 lib/calibre/calibre/gui2/tweak_book/undo.py
@@ -2234,11 +2284,13 @@ lib/calibre/calibre/libwand.pyc
 lib/calibre/calibre/linux.py
 lib/calibre/calibre/linux.pyc
 lib/calibre/calibre/plugins/
+lib/calibre/calibre/plugins/_regex.so
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/calibre_style.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/freetype.so
+lib/calibre/calibre/plugins/hunspell.so
 lib/calibre/calibre/plugins/icu.so
 lib/calibre/calibre/plugins/libmtp.so
 lib/calibre/calibre/plugins/libusb.so
@@ -2295,6 +2347,8 @@ lib/calibre/calibre/utils/date.py
 lib/calibre/calibre/utils/date.pyc
 lib/calibre/calibre/utils/dictclient.py
 lib/calibre/calibre/utils/dictclient.pyc
+lib/calibre/calibre/utils/file_associations.py
+lib/calibre/calibre/utils/file_associations.pyc
 lib/calibre/calibre/utils/filenames.py
 lib/calibre/calibre/utils/filenames.pyc
 lib/calibre/calibre/utils/fonts/
@@ -2452,16 +2506,19 @@ lib/calibre/calibre/utils/serve_coffee.p
 lib/calibre/calibre/utils/serve_coffee.pyc
 lib/calibre/calibre/utils/sftp.py
 lib/calibre/calibre/utils/sftp.pyc
-lib/calibre/calibre/utils/sigil.py
-lib/calibre/calibre/utils/sigil.pyc
 lib/calibre/calibre/utils/smartypants.py
 lib/calibre/calibre/utils/smartypants.pyc
 lib/calibre/calibre/utils/smtp.py
 lib/calibre/calibre/utils/smtp.pyc
 lib/calibre/calibre/utils/smtplib.py
 lib/calibre/calibre/utils/smtplib.pyc
+lib/calibre/calibre/utils/socket_inheritance.py
+lib/calibre/calibre/utils/socket_inheritance.pyc
 lib/calibre/calibre/utils/soupparser.py
 lib/calibre/calibre/utils/soupparser.pyc
+lib/calibre/calibre/utils/spell/
+lib/calibre/calibre/utils/spell/__init__.py
+lib/calibre/calibre/utils/spell/__init__.pyc
 lib/calibre/calibre/utils/terminal.py
 lib/calibre/calibre/utils/terminal.pyc
 lib/calibre/calibre/utils/text2int.py
@@ -2748,6 +2805,11 @@ lib/calibre/odf/xforms.pyc
 lib/calibre/qtcurve/
 lib/calibre/qtcurve/test_rendering.py
 lib/calibre/qtcurve/test_rendering.pyc
+lib/calibre/regex/
+lib/calibre/regex/__init__.py
+lib/calibre/regex/__init__.pyc
+lib/calibre/regex/_regex_core.py
+lib/calibre/regex/_regex_core.pyc
 lib/calibre/routes/
 lib/calibre/routes/__init__.py
 lib/calibre/routes/__init__.pyc
@@ -2768,9 +2830,14 @@ lib/calibre/six.pyc
 lib/calibre/templite/
 lib/calibre/templite/__init__.py
 lib/calibre/templite/__init__.pyc
+share/applications/calibre-ebook-edit.desktop
 share/applications/calibre-ebook-viewer.desktop
 share/applications/calibre-gui.desktop
 share/applications/calibre-lrfviewer.desktop
+share/bash_completion.d/
+@sample ${SYSCONFDIR}/bash_completion.d/
+share/bash_completion.d/calibre
+@sample ${SYSCONFDIR}/bash_completion.d/calibre
 share/calibre/
 share/calibre/builtin_recipes.xml
 share/calibre/builtin_recipes.zip
@@ -2863,6 +2930,7 @@ share/calibre/images.qrc
 share/calibre/images/add_book.png
 share/calibre/images/arrow-down.png
 share/calibre/images/arrow-up.png
+share/calibre/images/auto-reload.png
 share/calibre/images/auto_author_sort.png
 share/calibre/images/back.png
 share/calibre/images/blank.png
@@ -2871,6 +2939,7 @@ share/calibre/images/bookmarks.png
 share/calibre/images/books_in_series.png
 share/calibre/images/catalog.png
 share/calibre/images/chapters.png
+share/calibre/images/character-set.png
 share/calibre/images/clear_left.png
 share/calibre/images/column.png
 share/calibre/images/config.png
@@ -2898,6 +2967,7 @@ share/calibre/images/dialog_question.png
 share/calibre/images/dialog_warning.png
 share/calibre/images/dictionary.png
 share/calibre/images/document-encrypt.png
+share/calibre/images/document-new.png
 share/calibre/images/document_open.png
 share/calibre/images/donate.png
 share/calibre/images/dot_green.png
@@ -2914,7 +2984,9 @@ share/calibre/images/edit-select-all.png
 share/calibre/images/edit-undo.png
 share/calibre/images/edit_input.png
 share/calibre/images/eject.png
+share/calibre/images/embed-fonts.png
 share/calibre/images/exec.png
+share/calibre/images/filter.png
 share/calibre/images/font.png
 share/calibre/images/font_size_larger.png
 share/calibre/images/font_size_smaller.png
@@ -2943,6 +3015,7 @@ share/calibre/images/heuristics.png
 share/calibre/images/highlight_only_off.png
 share/calibre/images/highlight_only_on.png
 share/calibre/images/hotmail.png
+share/calibre/images/html-fix.png
 share/calibre/images/icon_choose.png
 share/calibre/images/identifiers.png
 share/calibre/images/insert-link.png
@@ -2955,6 +3028,7 @@ share/calibre/images/lookfeel.png
 share/calibre/images/lt.png
 share/calibre/images/mail.png
 share/calibre/images/marked.png
+share/calibre/images/merge.png
 share/calibre/images/merge_books.png
 share/calibre/images/metadata.png
 share/calibre/images/mimetypes/
@@ -3024,6 +3098,7 @@ share/calibre/images/publisher.png
 share/calibre/images/random.png
 share/calibre/images/rating.png
 share/calibre/images/reader.png
+share/calibre/images/resize.png
 share/calibre/images/rotate-right.png
 share/calibre/images/save.png
 share/calibre/images/scheduler.png
@@ -3034,8 +3109,11 @@ share/calibre/images/search_add_saved.pn
 share/calibre/images/search_copy_saved.png
 share/calibre/images/search_delete_saved.png
 share/calibre/images/series.png
+share/calibre/images/smarten-punctuation.png
 share/calibre/images/store.png
+share/calibre/images/subset-fonts.png
 share/calibre/images/swap.png
+share/calibre/images/sync-right.png
 share/calibre/images/sync.png
 share/calibre/images/tags.png
 share/calibre/images/tb_folder.png
@@ -3050,8 +3128,10 @@ share/calibre/images/toc.png
 share/calibre/images/trash.png
 share/calibre/images/trim.png
 share/calibre/images/tweak.png
+share/calibre/images/unpack-book.png
 share/calibre/images/user_profile.png
 share/calibre/images/view-image.png
+share/calibre/images/view-refresh.png
 share/calibre/images/view.png
 share/calibre/images/viewer.png
 share/calibre/images/welcome_wizard.png
@@ -3166,6 +3246,8 @@ share/calibre/recipes/arcadia.recipe
 share/calibre/recipes/arcamax.recipe
 share/calibre/recipes/archeowiesci.png
 share/calibre/recipes/archeowiesci.recipe
+share/calibre/recipes/argnoticias.png
+share/calibre/recipes/argnoticias.recipe
 share/calibre/recipes/arizona_republic.recipe
 share/calibre/recipes/army_times.recipe
 share/calibre/recipes/arret_sur_images.recipe
@@ -3264,6 +3346,7 @@ share/calibre/recipes/billorielly.recipe
 share/calibre/recipes/biolog_pl.png
 share/calibre/recipes/biolog_pl.recipe
 share/calibre/recipes/birgun_gazetesi.recipe
+share/calibre/recipes/birmingham_evening_mail.recipe
 share/calibre/recipes/birmingham_post.recipe
 share/calibre/recipes/bitacora.recipe
 share/calibre/recipes/biweekly.png
@@ -4259,6 +4342,7 @@ share/calibre/recipes/list_apart.recipe
 share/calibre/recipes/livemint.png
 share/calibre/recipes/livemint.recipe
 share/calibre/recipes/living_stones.recipe
+share/calibre/recipes/loksatta.recipe
 share/calibre/recipes/lomza.png
 share/calibre/recipes/lomza.recipe
 share/calibre/recipes/london_free_press.recipe
@@ -4286,6 +4370,7 @@ share/calibre/recipes/macity.recipe
 share/calibre/recipes/macleans.recipe
 share/calibre/recipes/magazyn_consido.png
 share/calibre/recipes/magazyn_consido.recipe
+share/calibre/recipes/maharashtra_times.recipe
 share/calibre/recipes/mail_and_guardian.recipe
 share/calibre/recipes/mainichi.png
 share/calibre/recipes/mainichi.recipe
@@ -4392,6 +4477,7 @@ share/calibre/recipes/nadacni_fond_proti
 share/calibre/recipes/najwyzszy_czas.png
 share/calibre/recipes/najwyzszy_czas.recipe
 share/calibre/recipes/nakedcapitalism.recipe
+share/calibre/recipes/nanfengchuang.recipe
 share/calibre/recipes/nasa.png
 share/calibre/recipes/nasa.recipe
 share/calibre/recipes/naszdziennik.png
@@ -4475,7 +4561,6 @@ share/calibre/recipes/njp.recipe
 share/calibre/recipes/njuz_net.png
 share/calibre/recipes/njuz_net.recipe
 share/calibre/recipes/nme.recipe
-share/calibre/recipes/no_names_no_jackets.recipe
 share/calibre/recipes/noaa.png
 share/calibre/recipes/noaa.recipe
 share/calibre/recipes/nol.recipe
@@ -4647,6 +4732,7 @@ share/calibre/recipes/plus_info.recipe
 share/calibre/recipes/pnn.recipe
 share/calibre/recipes/pobjeda.png
 share/calibre/recipes/pobjeda.recipe
+share/calibre/recipes/poche.recipe
 share/calibre/recipes/podnikatel.recipe
 share/calibre/recipes/politico.png
 share/calibre/recipes/politico.recipe
@@ -5132,7 +5218,6 @@ share/calibre/recipes/usnews.recipe
 share/calibre/recipes/utne.png
 share/calibre/recipes/utne.recipe
 share/calibre/recipes/utrinski.recipe
-share/calibre/recipes/vancouver_provice.recipe
 share/calibre/recipes/vancouver_province.recipe
 share/calibre/recipes/vancouver_sun.recipe
 share/calibre/recipes/vanityfair.recipe
@@ -5526,6 +5611,7 @@ share/mime/packages/calibre.xml
 share/pixmaps/
 share/pixmaps/calibre-azw2.png
 share/pixmaps/calibre-azw3.png
+share/pixmaps/calibre-ebook-edit.png
 share/pixmaps/calibre-gui.png
 share/pixmaps/calibre-lrf.png
 share/pixmaps/calibre-mobi.png

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: textproc/calibre

David Coppa-4

> From: Stuart Henderson <[hidden email]>
> Date: Wed, Jan 15, 2014 at 12:53 PM
> Subject: UPDATE: textproc/calibre
> To: ports <[hidden email]>
>
>
> Anyone want to give this a spin?

I did.

Basic functionalities work fine in my tests:

Viewing an ebook, editing an ebook, converting an ebook from AWZ
to PDF.

It spews some warnings at startup:

Traceback (most recent call last):
  File "/usr/local/lib/calibre/calibre/gui2/device.py", line 365, in run_startup
    dev.startup()
  File "/usr/local/lib/calibre/calibre/devices/mtp/base.py", line 24, in synchronizer
    return func(self, *args, **kwargs)
  File "/usr/local/lib/calibre/calibre/devices/mtp/unix/driver.py", line 168, in startup
    p = plugins['libmtp']
  File "/usr/local/lib/calibre/calibre/constants.py", line 178, in __getitem__
    raise KeyError('No plugin named %r'%name)
KeyError: "No plugin named u'libmtp'"
Exception in thread Thread-5:
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/threading.py", line 810, in __bootstrap_inner
    self.run()
  File "/usr/local/lib/calibre/calibre/gui2/device.py", line 400, in run
    self.detect_device()
  File "/usr/local/lib/calibre/calibre/gui2/device.py", line 262, in detect_device
    self.scanner.scan()
  File "/usr/local/lib/calibre/calibre/devices/scanner.py", line 324, in scan
    self.devices = self.scanner()
  File "/usr/local/lib/calibre/calibre/devices/scanner.py", line 130, in __call__
    self.libusb, self.libusb_err = plugins['libusb']
  File "/usr/local/lib/calibre/calibre/constants.py", line 178, in __getitem__
    raise KeyError('No plugin named %r'%name)
KeyError: "No plugin named 'libusb'"

Exception in thread Thread-7:
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/threading.py", line 810, in __bootstrap_inner
    self.run()
  File "/usr/local/lib/calibre/calibre/utils/mdns.py", line 42, in run
    _all_ip_addresses = self.get_all_ips()
  File "/usr/local/lib/calibre/calibre/utils/mdns.py", line 23, in get_all_ips
    import netifaces
ImportError: No module named netifaces

But I think it's because OpenBSD lacks support for this stuff.
And there's indeed a comment about requiring "/sys filesystem for HW detection"...

So, I can say I'm ok with this update to go in.

Cheers!
David

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: textproc/calibre

Stuart Henderson
On 2014/01/16 02:09, David Coppa wrote:

>
> > From: Stuart Henderson <[hidden email]>
> > Date: Wed, Jan 15, 2014 at 12:53 PM
> > Subject: UPDATE: textproc/calibre
> > To: ports <[hidden email]>
> >
> >
> > Anyone want to give this a spin?
>
> I did.
>
> Basic functionalities work fine in my tests:
>
> Viewing an ebook, editing an ebook, converting an ebook from AWZ
> to PDF.
>
> It spews some warnings at startup:
..snip..
> But I think it's because OpenBSD lacks support for this stuff.
> And there's indeed a comment about requiring "/sys filesystem for HW detection"...
>
> So, I can say I'm ok with this update to go in.
>
> Cheers!
> David

Thanks - yes these are also present in the previous version and
they're connected with the USB code which pokes in /sys, I don't have
hardware, time or inclination to fix these up for OpenBSD ;)

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: textproc/calibre

David Coppa
In reply to this post by David Coppa-4
On Thu, Jan 16, 2014 at 10:09 AM, David Coppa <[hidden email]> wrote:

>
>> From: Stuart Henderson <[hidden email]>
>> Date: Wed, Jan 15, 2014 at 12:53 PM
>> Subject: UPDATE: textproc/calibre
>> To: ports <[hidden email]>
>>
>>
>> Anyone want to give this a spin?
>
> I did.
>
> Basic functionalities work fine in my tests:
>
> Viewing an ebook, editing an ebook, converting an ebook from AWZ
> to PDF.

It's AZW, not AWZ.

Sorry,
David