Sun Jul 24 07:08:55 2016 UTC ()
Updated calibre to 2.63.0.

New Features

    News download: Allow controlling which periodicals are automatically sent to a specific email in Preferences->Sharing by email
    Edit Book: Update regex engine to support Unicode 9.0

Bug Fixes

    Edit metadata dialog: Fix pasting ISBN from clipboard not stripping garbage characters after a valid ISBN.

    Closes tickets: 1604956
    Edit Book: Also refresh the Preview and Live CSS panels after performing any action that changes files other than the currently displayed file.
    E-book viewer: Fix the show metadata button not reading EPUB 3 metadata
    MOBI Output: Fix <hr> not being rendered as full-width in old MOBI files
    CSV Catalog output: Fix incorrect formatting of is_multiple custom columns.

    Closes tickets: 1602908
    CSV Catalog Output: Separate multiple authors with & instead of comma. Fixes problems when the author name contains commas.
    EPUB 3 metadata: Fix updating metadata in EPUB 3 files not overwriting existing authors.

    Closes tickets: 1602227
    Fix duplicate detection when adding books not working when the book title has leading or trailing whitespace
    Book details panel: Pick the color used for links from the current system color theme
    Windows: Fix file selection dialogs blurry on HiDPI monitors

Improved news sources

    Gosc Niedzielny
    Nikkei Free
    Financial Times (UK)
    Foreign Affairs
    Berlin Policy Journal
    Gazet van Antwerpen
    Hurriyet


(wiz)
diff -r1.149 -r1.150 pkgsrc/misc/calibre/Makefile
diff -r1.63 -r1.64 pkgsrc/misc/calibre/PLIST
diff -r1.71 -r1.72 pkgsrc/misc/calibre/distinfo
diff -r0 -r1.1 pkgsrc/misc/calibre/patches/patch-setup_build.py
diff -r0 -r1.1 pkgsrc/misc/calibre/patches/patch-setup_extensions.json
diff -r1.1 -r0 pkgsrc/misc/calibre/patches/patch-setup_build__environment.py
diff -r1.7 -r0 pkgsrc/misc/calibre/patches/patch-setup_extensions.py

cvs diff -r1.149 -r1.150 pkgsrc/misc/calibre/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2016/07/10 19:27:52 1.149
+++ pkgsrc/misc/calibre/Makefile 2016/07/24 07:08:54 1.150
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.149 2016/07/10 19:27:52 rillig Exp $ 1# $NetBSD: Makefile,v 1.150 2016/07/24 07:08:54 wiz Exp $
2 2
3DISTNAME= calibre-2.62.0 3DISTNAME= calibre-2.63.0
4CATEGORIES= misc 4CATEGORIES= misc
5#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 5#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
6MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.calibre-ebook.com/ 11HOMEPAGE= http://www.calibre-ebook.com/
12COMMENT= E-book library management application 12COMMENT= E-book library management application
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow 15DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
16#DEPENDS+= help2man>=1.36.4:../../converters/help2man 16#DEPENDS+= help2man>=1.36.4:../../converters/help2man

cvs diff -r1.63 -r1.64 pkgsrc/misc/calibre/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/calibre/PLIST 2016/07/08 11:11:28 1.63
+++ pkgsrc/misc/calibre/PLIST 2016/07/24 07:08:54 1.64
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.63 2016/07/08 11:11:28 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.64 2016/07/24 07:08:54 wiz Exp $
2bin/calibre 2bin/calibre
3bin/calibre-complete 3bin/calibre-complete
4bin/calibre-customize 4bin/calibre-customize
5bin/calibre-debug 5bin/calibre-debug
6bin/calibre-parallel 6bin/calibre-parallel
7bin/calibre-server 7bin/calibre-server
8bin/calibre-smtp 8bin/calibre-smtp
9bin/calibredb 9bin/calibredb
10bin/ebook-convert 10bin/ebook-convert
11bin/ebook-device 11bin/ebook-device
12bin/ebook-edit 12bin/ebook-edit
13bin/ebook-meta 13bin/ebook-meta
14bin/ebook-polish 14bin/ebook-polish
@@ -1179,26 +1179,28 @@ lib/calibre/calibre/plugins/_patiencedif @@ -1179,26 +1179,28 @@ lib/calibre/calibre/plugins/_patiencedif
1179lib/calibre/calibre/plugins/_regex.so 1179lib/calibre/calibre/plugins/_regex.so
1180lib/calibre/calibre/plugins/bzzdec.so 1180lib/calibre/calibre/plugins/bzzdec.so
1181lib/calibre/calibre/plugins/cPalmdoc.so 1181lib/calibre/calibre/plugins/cPalmdoc.so
1182lib/calibre/calibre/plugins/certgen.so 1182lib/calibre/calibre/plugins/certgen.so
1183lib/calibre/calibre/plugins/chm_extra.so 1183lib/calibre/calibre/plugins/chm_extra.so
1184lib/calibre/calibre/plugins/chmlib.so 1184lib/calibre/calibre/plugins/chmlib.so
1185lib/calibre/calibre/plugins/dukpy.so 1185lib/calibre/calibre/plugins/dukpy.so
1186lib/calibre/calibre/plugins/freetype.so 1186lib/calibre/calibre/plugins/freetype.so
1187lib/calibre/calibre/plugins/html.so 1187lib/calibre/calibre/plugins/html.so
1188lib/calibre/calibre/plugins/hunspell.so 1188lib/calibre/calibre/plugins/hunspell.so
1189lib/calibre/calibre/plugins/icu.so 1189lib/calibre/calibre/plugins/icu.so
1190lib/calibre/calibre/plugins/imageops.so 1190lib/calibre/calibre/plugins/imageops.so
1191lib/calibre/calibre/plugins/libheadless.so 1191lib/calibre/calibre/plugins/libheadless.so
 1192lib/calibre/calibre/plugins/libmtp.so
 1193lib/calibre/calibre/plugins/libusb.so
1192lib/calibre/calibre/plugins/lzma_binding.so 1194lib/calibre/calibre/plugins/lzma_binding.so
1193lib/calibre/calibre/plugins/lzx.so 1195lib/calibre/calibre/plugins/lzx.so
1194lib/calibre/calibre/plugins/matcher.so 1196lib/calibre/calibre/plugins/matcher.so
1195lib/calibre/calibre/plugins/monotonic.so 1197lib/calibre/calibre/plugins/monotonic.so
1196lib/calibre/calibre/plugins/msdes.so 1198lib/calibre/calibre/plugins/msdes.so
1197lib/calibre/calibre/plugins/pictureflow.so 1199lib/calibre/calibre/plugins/pictureflow.so
1198lib/calibre/calibre/plugins/podofo.so 1200lib/calibre/calibre/plugins/podofo.so
1199lib/calibre/calibre/plugins/progress_indicator.so 1201lib/calibre/calibre/plugins/progress_indicator.so
1200lib/calibre/calibre/plugins/qt_hack.so 1202lib/calibre/calibre/plugins/qt_hack.so
1201lib/calibre/calibre/plugins/speedup.so 1203lib/calibre/calibre/plugins/speedup.so
1202lib/calibre/calibre/plugins/sqlite_custom.so 1204lib/calibre/calibre/plugins/sqlite_custom.so
1203lib/calibre/calibre/plugins/tokenizer.so 1205lib/calibre/calibre/plugins/tokenizer.so
1204lib/calibre/calibre/plugins/unrar.so 1206lib/calibre/calibre/plugins/unrar.so
@@ -1471,26 +1473,27 @@ ${PYSITELIB}/init_calibre.py @@ -1471,26 +1473,27 @@ ${PYSITELIB}/init_calibre.py
1471share/bash-completion/completions/calibre 1473share/bash-completion/completions/calibre
1472share/calibre/builtin_recipes.xml 1474share/calibre/builtin_recipes.xml
1473share/calibre/builtin_recipes.zip 1475share/calibre/builtin_recipes.zip
1474share/calibre/calibre-ebook-root-CA.crt 1476share/calibre/calibre-ebook-root-CA.crt
1475share/calibre/calibre-mimetypes.xml 1477share/calibre/calibre-mimetypes.xml
1476share/calibre/calibre-portable.bat 1478share/calibre/calibre-portable.bat
1477share/calibre/calibre-portable.sh 1479share/calibre/calibre-portable.sh
1478share/calibre/catalog/DefaultCover.jpg 1480share/calibre/catalog/DefaultCover.jpg
1479share/calibre/catalog/mastheadImage.gif 1481share/calibre/catalog/mastheadImage.gif
1480share/calibre/catalog/section_list_templates.py 1482share/calibre/catalog/section_list_templates.py
1481share/calibre/catalog/stylesheet.css 1483share/calibre/catalog/stylesheet.css
1482share/calibre/catalog/template.xhtml 1484share/calibre/catalog/template.xhtml
1483share/calibre/coffee-script.js 1485share/calibre/coffee-script.js
 1486share/calibre/common-user-agents.txt
1484share/calibre/compiled_coffeescript.zip 1487share/calibre/compiled_coffeescript.zip
1485share/calibre/content-server/autoreload.js 1488share/calibre/content-server/autoreload.js
1486share/calibre/content-server/calibre.png 1489share/calibre/content-server/calibre.png
1487share/calibre/content-server/empty.html 1490share/calibre/content-server/empty.html
1488share/calibre/content-server/index-generated.html 1491share/calibre/content-server/index-generated.html
1489share/calibre/content-server/index.html 1492share/calibre/content-server/index.html
1490share/calibre/content-server/locales.zip 1493share/calibre/content-server/locales.zip
1491share/calibre/content-server/mathjax.version 1494share/calibre/content-server/mathjax.version
1492share/calibre/content-server/mathjax.zip.xz 1495share/calibre/content-server/mathjax.zip.xz
1493share/calibre/content-server/mobile.css 1496share/calibre/content-server/mobile.css
1494share/calibre/content-server/reset.css 1497share/calibre/content-server/reset.css
1495share/calibre/content_server/av.jpg 1498share/calibre/content_server/av.jpg
1496share/calibre/content_server/bg_search_box.png 1499share/calibre/content_server/bg_search_box.png

cvs diff -r1.71 -r1.72 pkgsrc/misc/calibre/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/calibre/distinfo 2016/07/08 11:11:28 1.71
+++ pkgsrc/misc/calibre/distinfo 2016/07/24 07:08:54 1.72
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.71 2016/07/08 11:11:28 wiz Exp $ 1$NetBSD: distinfo,v 1.72 2016/07/24 07:08:54 wiz Exp $
2 2
3SHA1 (calibre-2.62.0.tar.xz) = 28a9db0f97755b091a105fcf3ad6dbc95eb9b03f 3SHA1 (calibre-2.63.0.tar.xz) = df6c16cbf1acbad9644a60383a1d98645bf9c809
4RMD160 (calibre-2.62.0.tar.xz) = 29d26be9067271cda1c0566b6287782aea234cff 4RMD160 (calibre-2.63.0.tar.xz) = 3e37dbda4ae69b87cdacb0ec01ee73f413df261a
5SHA512 (calibre-2.62.0.tar.xz) = a692c336b9c4f4196d1b4da03758832217a0616f17b7289ec374ab81886801a78396a7ebfa6b5acca83c52661a30ad28c9763bafe1f57a78fd2f2a4effad308f 5SHA512 (calibre-2.63.0.tar.xz) = 74df6febe62608ab93502360e7511679102f0cbb260b1b78b4720c1aff34703d60db51a760ecd51596cb7331892d5eb7225e6ec70aa09976c219ba973d064f9b
6Size (calibre-2.62.0.tar.xz) = 40671664 bytes 6Size (calibre-2.63.0.tar.xz) = 40700876 bytes
7SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c 7SHA1 (patch-setup_build.py) = 9699b5badd044aacd72b223c182ab14f38eb1dcb
8SHA1 (patch-setup_extensions.py) = 18edee06e64294ba87a60aafa3e34dfa6f09cd94 8SHA1 (patch-setup_extensions.json) = a08c9c6675f9b7926fa53dbb74846ed47c4298c7
9SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662 9SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662

File Added: pkgsrc/misc/calibre/patches/patch-setup_build.py
$NetBSD: patch-setup_build.py,v 1.1 2016/07/24 07:08:54 wiz Exp $

Add rpath to linker command.
Look in libtool directory for file.

--- setup/build.py.orig	2016-07-22 02:21:05.000000000 +0000
+++ setup/build.py
@@ -251,8 +251,7 @@ class Build(Command):
         return ['-I'+x for x in dirs]
 
     def lib_dirs_to_ldflags(self, dirs):
-        pref = '/LIBPATH:' if iswindows else '-L'
-        return [pref+x for x in dirs]
+        return ['-L'+x+' -Wl,-R'+x for x in dirs]
 
     def libraries_to_ldflags(self, dirs):
         pref = '' if iswindows else '-l'
@@ -452,7 +451,7 @@ class Build(Command):
         if iswindows:
             qmc += ['-spec', qmakespec]
         fext = 'dll' if iswindows else 'dylib' if isosx else 'so'
-        name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext)
+        name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext)
         try:
             os.chdir(src_dir)
             if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers):

File Added: pkgsrc/misc/calibre/patches/patch-setup_extensions.json
$NetBSD: patch-setup_extensions.json,v 1.1 2016/07/24 07:08:54 wiz Exp $

Add X11 libraries to search path.
XXX: should be using ${PREFIX} and ${X11BASE}

--- setup/extensions.json.orig	2016-07-22 02:21:05.000000000 +0000
+++ setup/extensions.json
@@ -141,7 +141,8 @@
         "sources": "calibre/gui2/pictureflow/pictureflow.cpp",
         "headers": "calibre/gui2/pictureflow/pictureflow.h",
         "sip_files": "calibre/gui2/pictureflow/pictureflow.sip",
-        "inc_dirs": "calibre/gui2/pictureflow"
+        "inc_dirs": "calibre/gui2/pictureflow",
+        "lib_dirs": "/usr/X11R7/lib /usr/pkg/X11R7/lib"
     },
     {
         "name": "progress_indicator",

File Deleted: pkgsrc/misc/calibre/patches/Attic/patch-setup_build__environment.py

File Deleted: pkgsrc/misc/calibre/patches/Attic/patch-setup_extensions.py