CVS commit: pkgsrc/misc/calibre

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb 17 15:43:43 UTC 2017

Modified Files:
        pkgsrc/misc/calibre: Makefile PLIST distinfo
        pkgsrc/misc/calibre/patches: patch-setup_build__environment.py

Log Message:
Updated calibre to 2.79.1.

2.79.1

New Features

    Windows: Make recently opened books show up in the jump lists for the standalone viewer and editor programs
    OS X/Linux: Show an informational popup message when an Android device is plugged in that needs the user to tap Allow for the connection to work.
    Conversion: Log options that are different from the defaults separately, for easy reference

Bug Fixes

    2.79.1 fixes a regression in 2.79.0 that broke the file open dialogs on windows vista
    Conversion: Fix regression that broke conversion of some epub files when using the 'Remove first image' option.
    Get Books: Update Kobo plugin for website changes
    Windows MTP driver: Fix error when enumerating device storage not being reported during debug device detection
    Tag Browser: When dragging and dropping a book onto a series increment the series number.
    Fix crash when generating covers with Qt 5.8 on linux
    Fix Get Books result list and jobs list not being populated on Qt 5.8
    Fix importing rules in the coloring/icon rules dialog not enabling the apply button


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/misc/calibre/PLIST
cvs rdiff -u -r1.86 -r1.87 pkgsrc/misc/calibre/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/misc/calibre/patches/patch-setup_build__environment.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.172 pkgsrc/misc/calibre/Makefile:1.173
--- pkgsrc/misc/calibre/Makefile:1.172  Sun Feb 12 06:25:43 2017
+++ pkgsrc/misc/calibre/Makefile        Fri Feb 17 15:43:43 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.172 2017/02/12 06:25:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.173 2017/02/17 15:43:43 wiz Exp $
 
-DISTNAME=      calibre-2.78.0
-PKGREVISION=   2
+DISTNAME=      calibre-2.79.1
 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.76 pkgsrc/misc/calibre/PLIST:1.77
--- pkgsrc/misc/calibre/PLIST:1.76      Sun Feb  5 18:34:09 2017
+++ pkgsrc/misc/calibre/PLIST   Fri Feb 17 15:43:43 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.76 2017/02/05 18:34:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.77 2017/02/17 15:43:43 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -346,7 +346,6 @@ lib/calibre/calibre/ebooks/metadata/html
 lib/calibre/calibre/ebooks/metadata/imp.py
 lib/calibre/calibre/ebooks/metadata/kdl.py
 lib/calibre/calibre/ebooks/metadata/kfx.py
-lib/calibre/calibre/ebooks/metadata/library_thing.py
 lib/calibre/calibre/ebooks/metadata/lit.py
 lib/calibre/calibre/ebooks/metadata/lrx.py
 lib/calibre/calibre/ebooks/metadata/meta.py
@@ -3314,7 +3313,6 @@ share/calibre/recipes/the_manila_bulleti
 share/calibre/recipes/the_manila_times.recipe
 share/calibre/recipes/the_marker.recipe
 share/calibre/recipes/the_nation.recipe
-share/calibre/recipes/the_nation_thai.recipe
 share/calibre/recipes/the_new_age_za.recipe
 share/calibre/recipes/the_new_republic.recipe
 share/calibre/recipes/the_oz.recipe

Index: pkgsrc/misc/calibre/distinfo
diff -u pkgsrc/misc/calibre/distinfo:1.86 pkgsrc/misc/calibre/distinfo:1.87
--- pkgsrc/misc/calibre/distinfo:1.86   Sun Feb  5 18:34:09 2017
+++ pkgsrc/misc/calibre/distinfo        Fri Feb 17 15:43:43 2017
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.86 2017/02/05 18:34:09 wiz Exp $
+$NetBSD: distinfo,v 1.87 2017/02/17 15:43:43 wiz Exp $
 
-SHA1 (calibre-2.78.0.tar.xz) = 294326a3400b42ca9b734270e6d2ac1963ca0654
-RMD160 (calibre-2.78.0.tar.xz) = ad02b47a4c1a34de0d3f5a88bf2a469129a25d35
-SHA512 (calibre-2.78.0.tar.xz) = 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca
-Size (calibre-2.78.0.tar.xz) = 38739404 bytes
+SHA1 (calibre-2.79.1.tar.xz) = b5449899bcadaf317ae590ecb57a0fb82836baa1
+RMD160 (calibre-2.79.1.tar.xz) = a0c3ea25f752d5a786a3066dcf3f14b5fca0c342
+SHA512 (calibre-2.79.1.tar.xz) = dc3bc6ebe56c3deeb41dcef7ab9e28fe24b13d8a08a46dbbbd4b07f9624ca3281c188bbb7a86038936256b4fed3a8888c474e049642f8513cb08c967ebc92da1
+Size (calibre-2.79.1.tar.xz) = 38738320 bytes
 SHA1 (patch-setup_build.py) = 4a601e44fb69085c1f05ca0f90b73ce3f6d51ba6
-SHA1 (patch-setup_build__environment.py) = d44460d96f9fb76cd80814a9cba8b153c52b5bfc
+SHA1 (patch-setup_build__environment.py) = 84d0084d4fe49c883ba5c4ac6e1c3ba47a88c8d5
 SHA1 (patch-src_calibre_ebooks_oeb_polish_parsing.py) = 62d02b7b901efac6ee3bb1b6628ab99b4a13a926
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662

Index: pkgsrc/misc/calibre/patches/patch-setup_build__environment.py
diff -u pkgsrc/misc/calibre/patches/patch-setup_build__environment.py:1.3 pkgsrc/misc/calibre/patches/patch-setup_build__environment.py:1.4
--- pkgsrc/misc/calibre/patches/patch-setup_build__environment.py:1.3   Thu Sep 29 12:13:43 2016
+++ pkgsrc/misc/calibre/patches/patch-setup_build__environment.py       Fri Feb 17 15:43:43 2017
@@ -1,15 +1,15 @@
-$NetBSD: patch-setup_build__environment.py,v 1.3 2016/09/29 12:13:43 joerg Exp $
+$NetBSD: patch-setup_build__environment.py,v 1.4 2017/02/17 15:43:43 wiz Exp $
 
 Always build like on Linux.
 
---- setup/build_environment.py.orig    2016-09-29 09:55:14.000000000 +0000
+--- setup/build_environment.py.orig    2017-02-12 02:09:49.000000000 +0000
 +++ setup/build_environment.py
 @@ -97,8 +97,8 @@ def get_sip_dir():
  pyqt['pyqt_sip_dir'] = get_sip_dir()
  pyqt['sip_inc_dir'] = os.environ.get('SIP_INC_DIR', sysconfig.get_path('include'))
  
--glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux else ''
--fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux else ''
+-glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux or ishaiku else ''
+-fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux or ishaiku else ''
 +glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip()
 +fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip()
  qt_inc = pyqt['inc']
@@ -19,7 +19,7 @@ Always build like on Linux.
  'WebKit', 'WebKitWidgets', 'Widgets',  'Multimedia', 'MultimediaWidgets', 'Xml',  # 'XmlPatterns',
  )]
  QT_PLUGINS = ('imageformats', 'audio', 'iconengines', 'mediaservice', 'platforms', 'playlistformats', 'printsupport', 'sqldrivers')
--if islinux:
+-if islinux or ishaiku:
 +if True:
      # platformthemes cause crashes in Ubuntu
      QT_PLUGINS += ('platforminputcontexts', 'generic',)