CVS commit: pkgsrc/misc/calibre

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 24 07:08:55 UTC 2016

Modified Files:
        pkgsrc/misc/calibre: Makefile PLIST distinfo
Added Files:
        pkgsrc/misc/calibre/patches: patch-setup_build.py
            patch-setup_extensions.json
Removed Files:
        pkgsrc/misc/calibre/patches: patch-setup_build__environment.py
            patch-setup_extensions.py

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/misc/calibre/PLIST
cvs rdiff -u -r1.71 -r1.72 pkgsrc/misc/calibre/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/calibre/patches/patch-setup_build.py \
    pkgsrc/misc/calibre/patches/patch-setup_extensions.json
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/misc/calibre/patches/patch-setup_build__environment.py
cvs rdiff -u -r1.7 -r0 pkgsrc/misc/calibre/patches/patch-setup_extensions.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.149 pkgsrc/misc/calibre/Makefile:1.150
--- pkgsrc/misc/calibre/Makefile:1.149  Sun Jul 10 19:27:52 2016
+++ pkgsrc/misc/calibre/Makefile        Sun Jul 24 07:08:54 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.149 2016/07/10 19:27:52 rillig Exp $
+# $NetBSD: Makefile,v 1.150 2016/07/24 07:08:54 wiz Exp $
 
-DISTNAME=      calibre-2.62.0
+DISTNAME=      calibre-2.63.0
 CATEGORIES=    misc
 #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=  http://download.calibre-ebook.com/${PKGVERSION_NOREV}/

Index: pkgsrc/misc/calibre/PLIST
diff -u pkgsrc/misc/calibre/PLIST:1.63 pkgsrc/misc/calibre/PLIST:1.64
--- pkgsrc/misc/calibre/PLIST:1.63      Fri Jul  8 11:11:28 2016
+++ pkgsrc/misc/calibre/PLIST   Sun Jul 24 07:08:54 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.63 2016/07/08 11:11:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.64 2016/07/24 07:08:54 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1189,6 +1189,8 @@ lib/calibre/calibre/plugins/hunspell.so
 lib/calibre/calibre/plugins/icu.so
 lib/calibre/calibre/plugins/imageops.so
 lib/calibre/calibre/plugins/libheadless.so
+lib/calibre/calibre/plugins/libmtp.so
+lib/calibre/calibre/plugins/libusb.so
 lib/calibre/calibre/plugins/lzma_binding.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/matcher.so
@@ -1481,6 +1483,7 @@ share/calibre/catalog/section_list_templ
 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/autoreload.js
 share/calibre/content-server/calibre.png

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

Added files:

Index: pkgsrc/misc/calibre/patches/patch-setup_build.py
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-setup_build.py:1.1
--- /dev/null   Sun Jul 24 07:08:55 2016
+++ pkgsrc/misc/calibre/patches/patch-setup_build.py    Sun Jul 24 07:08:54 2016
@@ -0,0 +1,26 @@
+$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):
Index: pkgsrc/misc/calibre/patches/patch-setup_extensions.json
diff -u /dev/null pkgsrc/misc/calibre/patches/patch-setup_extensions.json:1.1
--- /dev/null   Sun Jul 24 07:08:55 2016
+++ pkgsrc/misc/calibre/patches/patch-setup_extensions.json     Sun Jul 24 07:08:54 2016
@@ -0,0 +1,17 @@
+$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",