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 Hurriyetdiff -r1.149 -r1.150 pkgsrc/misc/calibre/Makefile
(wiz)
@@ -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 | |||
3 | DISTNAME= calibre-2.62.0 | 3 | DISTNAME= calibre-2.63.0 | |
4 | CATEGORIES= misc | 4 | CATEGORIES= misc | |
5 | #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} | 5 | #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} | |
6 | MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/ | 6 | MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/ | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | DISTFILES= ${DISTNAME}${EXTRACT_SUFX} | 8 | DISTFILES= ${DISTNAME}${EXTRACT_SUFX} | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.calibre-ebook.com/ | 11 | HOMEPAGE= http://www.calibre-ebook.com/ | |
12 | COMMENT= E-book library management application | 12 | COMMENT= E-book library management application | |
13 | LICENSE= gnu-gpl-v3 | 13 | LICENSE= gnu-gpl-v3 | |
14 | 14 | |||
15 | DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow | 15 | DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow | |
16 | #DEPENDS+= help2man>=1.36.4:../../converters/help2man | 16 | #DEPENDS+= help2man>=1.36.4:../../converters/help2man |
@@ -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 $ | |
2 | bin/calibre | 2 | bin/calibre | |
3 | bin/calibre-complete | 3 | bin/calibre-complete | |
4 | bin/calibre-customize | 4 | bin/calibre-customize | |
5 | bin/calibre-debug | 5 | bin/calibre-debug | |
6 | bin/calibre-parallel | 6 | bin/calibre-parallel | |
7 | bin/calibre-server | 7 | bin/calibre-server | |
8 | bin/calibre-smtp | 8 | bin/calibre-smtp | |
9 | bin/calibredb | 9 | bin/calibredb | |
10 | bin/ebook-convert | 10 | bin/ebook-convert | |
11 | bin/ebook-device | 11 | bin/ebook-device | |
12 | bin/ebook-edit | 12 | bin/ebook-edit | |
13 | bin/ebook-meta | 13 | bin/ebook-meta | |
14 | bin/ebook-polish | 14 | bin/ebook-polish | |
@@ -1179,26 +1179,28 @@ lib/calibre/calibre/plugins/_patiencedif | @@ -1179,26 +1179,28 @@ lib/calibre/calibre/plugins/_patiencedif | |||
1179 | lib/calibre/calibre/plugins/_regex.so | 1179 | lib/calibre/calibre/plugins/_regex.so | |
1180 | lib/calibre/calibre/plugins/bzzdec.so | 1180 | lib/calibre/calibre/plugins/bzzdec.so | |
1181 | lib/calibre/calibre/plugins/cPalmdoc.so | 1181 | lib/calibre/calibre/plugins/cPalmdoc.so | |
1182 | lib/calibre/calibre/plugins/certgen.so | 1182 | lib/calibre/calibre/plugins/certgen.so | |
1183 | lib/calibre/calibre/plugins/chm_extra.so | 1183 | lib/calibre/calibre/plugins/chm_extra.so | |
1184 | lib/calibre/calibre/plugins/chmlib.so | 1184 | lib/calibre/calibre/plugins/chmlib.so | |
1185 | lib/calibre/calibre/plugins/dukpy.so | 1185 | lib/calibre/calibre/plugins/dukpy.so | |
1186 | lib/calibre/calibre/plugins/freetype.so | 1186 | lib/calibre/calibre/plugins/freetype.so | |
1187 | lib/calibre/calibre/plugins/html.so | 1187 | lib/calibre/calibre/plugins/html.so | |
1188 | lib/calibre/calibre/plugins/hunspell.so | 1188 | lib/calibre/calibre/plugins/hunspell.so | |
1189 | lib/calibre/calibre/plugins/icu.so | 1189 | lib/calibre/calibre/plugins/icu.so | |
1190 | lib/calibre/calibre/plugins/imageops.so | 1190 | lib/calibre/calibre/plugins/imageops.so | |
1191 | lib/calibre/calibre/plugins/libheadless.so | 1191 | lib/calibre/calibre/plugins/libheadless.so | |
1192 | lib/calibre/calibre/plugins/libmtp.so | |||
1193 | lib/calibre/calibre/plugins/libusb.so | |||
1192 | lib/calibre/calibre/plugins/lzma_binding.so | 1194 | lib/calibre/calibre/plugins/lzma_binding.so | |
1193 | lib/calibre/calibre/plugins/lzx.so | 1195 | lib/calibre/calibre/plugins/lzx.so | |
1194 | lib/calibre/calibre/plugins/matcher.so | 1196 | lib/calibre/calibre/plugins/matcher.so | |
1195 | lib/calibre/calibre/plugins/monotonic.so | 1197 | lib/calibre/calibre/plugins/monotonic.so | |
1196 | lib/calibre/calibre/plugins/msdes.so | 1198 | lib/calibre/calibre/plugins/msdes.so | |
1197 | lib/calibre/calibre/plugins/pictureflow.so | 1199 | lib/calibre/calibre/plugins/pictureflow.so | |
1198 | lib/calibre/calibre/plugins/podofo.so | 1200 | lib/calibre/calibre/plugins/podofo.so | |
1199 | lib/calibre/calibre/plugins/progress_indicator.so | 1201 | lib/calibre/calibre/plugins/progress_indicator.so | |
1200 | lib/calibre/calibre/plugins/qt_hack.so | 1202 | lib/calibre/calibre/plugins/qt_hack.so | |
1201 | lib/calibre/calibre/plugins/speedup.so | 1203 | lib/calibre/calibre/plugins/speedup.so | |
1202 | lib/calibre/calibre/plugins/sqlite_custom.so | 1204 | lib/calibre/calibre/plugins/sqlite_custom.so | |
1203 | lib/calibre/calibre/plugins/tokenizer.so | 1205 | lib/calibre/calibre/plugins/tokenizer.so | |
1204 | lib/calibre/calibre/plugins/unrar.so | 1206 | lib/calibre/calibre/plugins/unrar.so | |
@@ -1471,26 +1473,27 @@ ${PYSITELIB}/init_calibre.py | @@ -1471,26 +1473,27 @@ ${PYSITELIB}/init_calibre.py | |||
1471 | share/bash-completion/completions/calibre | 1473 | share/bash-completion/completions/calibre | |
1472 | share/calibre/builtin_recipes.xml | 1474 | share/calibre/builtin_recipes.xml | |
1473 | share/calibre/builtin_recipes.zip | 1475 | share/calibre/builtin_recipes.zip | |
1474 | share/calibre/calibre-ebook-root-CA.crt | 1476 | share/calibre/calibre-ebook-root-CA.crt | |
1475 | share/calibre/calibre-mimetypes.xml | 1477 | share/calibre/calibre-mimetypes.xml | |
1476 | share/calibre/calibre-portable.bat | 1478 | share/calibre/calibre-portable.bat | |
1477 | share/calibre/calibre-portable.sh | 1479 | share/calibre/calibre-portable.sh | |
1478 | share/calibre/catalog/DefaultCover.jpg | 1480 | share/calibre/catalog/DefaultCover.jpg | |
1479 | share/calibre/catalog/mastheadImage.gif | 1481 | share/calibre/catalog/mastheadImage.gif | |
1480 | share/calibre/catalog/section_list_templates.py | 1482 | share/calibre/catalog/section_list_templates.py | |
1481 | share/calibre/catalog/stylesheet.css | 1483 | share/calibre/catalog/stylesheet.css | |
1482 | share/calibre/catalog/template.xhtml | 1484 | share/calibre/catalog/template.xhtml | |
1483 | share/calibre/coffee-script.js | 1485 | share/calibre/coffee-script.js | |
1486 | share/calibre/common-user-agents.txt | |||
1484 | share/calibre/compiled_coffeescript.zip | 1487 | share/calibre/compiled_coffeescript.zip | |
1485 | share/calibre/content-server/autoreload.js | 1488 | share/calibre/content-server/autoreload.js | |
1486 | share/calibre/content-server/calibre.png | 1489 | share/calibre/content-server/calibre.png | |
1487 | share/calibre/content-server/empty.html | 1490 | share/calibre/content-server/empty.html | |
1488 | share/calibre/content-server/index-generated.html | 1491 | share/calibre/content-server/index-generated.html | |
1489 | share/calibre/content-server/index.html | 1492 | share/calibre/content-server/index.html | |
1490 | share/calibre/content-server/locales.zip | 1493 | share/calibre/content-server/locales.zip | |
1491 | share/calibre/content-server/mathjax.version | 1494 | share/calibre/content-server/mathjax.version | |
1492 | share/calibre/content-server/mathjax.zip.xz | 1495 | share/calibre/content-server/mathjax.zip.xz | |
1493 | share/calibre/content-server/mobile.css | 1496 | share/calibre/content-server/mobile.css | |
1494 | share/calibre/content-server/reset.css | 1497 | share/calibre/content-server/reset.css | |
1495 | share/calibre/content_server/av.jpg | 1498 | share/calibre/content_server/av.jpg | |
1496 | share/calibre/content_server/bg_search_box.png | 1499 | share/calibre/content_server/bg_search_box.png |
@@ -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 | |||
3 | SHA1 (calibre-2.62.0.tar.xz) = 28a9db0f97755b091a105fcf3ad6dbc95eb9b03f | 3 | SHA1 (calibre-2.63.0.tar.xz) = df6c16cbf1acbad9644a60383a1d98645bf9c809 | |
4 | RMD160 (calibre-2.62.0.tar.xz) = 29d26be9067271cda1c0566b6287782aea234cff | 4 | RMD160 (calibre-2.63.0.tar.xz) = 3e37dbda4ae69b87cdacb0ec01ee73f413df261a | |
5 | SHA512 (calibre-2.62.0.tar.xz) = a692c336b9c4f4196d1b4da03758832217a0616f17b7289ec374ab81886801a78396a7ebfa6b5acca83c52661a30ad28c9763bafe1f57a78fd2f2a4effad308f | 5 | SHA512 (calibre-2.63.0.tar.xz) = 74df6febe62608ab93502360e7511679102f0cbb260b1b78b4720c1aff34703d60db51a760ecd51596cb7331892d5eb7225e6ec70aa09976c219ba973d064f9b | |
6 | Size (calibre-2.62.0.tar.xz) = 40671664 bytes | 6 | Size (calibre-2.63.0.tar.xz) = 40700876 bytes | |
7 | SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c | 7 | SHA1 (patch-setup_build.py) = 9699b5badd044aacd72b223c182ab14f38eb1dcb | |
8 | SHA1 (patch-setup_extensions.py) = 18edee06e64294ba87a60aafa3e34dfa6f09cd94 | 8 | SHA1 (patch-setup_extensions.json) = a08c9c6675f9b7926fa53dbb74846ed47c4298c7 | |
9 | SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662 | 9 | SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662 |
$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):
$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",