calibre: include libusb and libmtp in the build for NetBSD.

[Olaf Seibert <rhialto%falu.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sat Jan 8 14:23:12 2022 +0100
Changeset:	cb21ed369de69755ef242107b1c7599055b2a582

Modified Files:
	calibre/Makefile
	calibre/PLIST
	calibre/TODO
	calibre/distinfo
	calibre/patches/patch-setup_build.py

Log Message:
calibre: include libusb and libmtp in the build for NetBSD.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cb21ed369de69755ef242107b1c7599055b2a582

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

diffstat:
 calibre/Makefile                     |  3 +++
 calibre/PLIST                        |  5 +++++
 calibre/TODO                         |  8 --------
 calibre/distinfo                     |  4 +++-
 calibre/patches/patch-setup_build.py | 36 +++++++++++++++++++++++++++++++++---
 5 files changed, 44 insertions(+), 12 deletions(-)

diffs:
diff --git a/calibre/Makefile b/calibre/Makefile
index 5def074bc9..c557bce5de 100644
--- a/calibre/Makefile
+++ b/calibre/Makefile
@@ -109,6 +109,9 @@ post-install:
 	    COPYRIGHT INSTALL.rst LICENSE.* \
 	    ${DESTDIR}${PREFIX}/share/doc/calibre
 
+do-test:
+	cd ${WRKSRC} && ${PYTHONBIN} ./setup.py test
+
 .include "../../lang/python/application.mk"
 .include "../../archivers//bzip2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/calibre/PLIST b/calibre/PLIST
index 7ca077c581..e95078f58c 100644
--- a/calibre/PLIST
+++ b/calibre/PLIST
@@ -1,4 +1,7 @@
 @comment $NetBSD$
+lib/calibre/calibre/plugins/libmtp.so
+lib/calibre/calibre/plugins/libusb.so
+
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1153,6 +1156,8 @@ lib/calibre/calibre/plugins/hyphen.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
diff --git a/calibre/TODO b/calibre/TODO
index 57de0e3caa..d12e9c2b80 100644
--- a/calibre/TODO
+++ b/calibre/TODO
@@ -1,14 +1,6 @@
 Clean up a bit.
 Go on with Calibre 5.x.
 
->> Startup method for device MTP_DEVICE threw exception
->> KeyError: u"No plugin named u'libmtp'"
->> KeyError: u"No plugin named u'libusb'"
-
-this probably "just" means you can't connect to the actual reader device;
-but libmtp and libusb are included in the dependencies, so probably this
-could be improved.
-
 >> Failed to create system tray icon, your desktop environment probably does
 >> not support the StatusNotifier spec
 >> https://www.freedesktop.org/wiki/Specifications/StatusNotifierItem/
diff --git a/calibre/distinfo b/calibre/distinfo
index c514aeb182..29a825d786 100644
--- a/calibre/distinfo
+++ b/calibre/distinfo
@@ -3,8 +3,10 @@ $NetBSD: distinfo,v 1.104 2019/09/24 16:39:50 kamil Exp $
 BLAKE2s (calibre-4.11.0.tar.xz) = 5fdcbbb4e9bb5c9a9f8f8f44433c6dec79b4be9e4ec7633b6059815bbe02ca81
 SHA512 (calibre-4.11.0.tar.xz) = 866e86c926ec6508573c5ad9f382fbc8815103d7248c93ce24a87795b2fb144523cb237bb75dffe024a075e2d4f1bbd7f608ca624d66c898f6840a4b4f3081e3
 Size (calibre-4.11.0.tar.xz) = 37038104 bytes
-SHA1 (patch-setup_build.py) = b5f4b651721c8db7df97a59c166800865835efbd
+SHA1 (patch-setup_build.py) = cf76a594264cd38a530a2964687b20ab1fbbd710
+SHA1 (patch-setup_extensions.json) = 90f61a7c776220bfa16439eeb599eb2132e410b1
 SHA1 (patch-setup_install.py) = 758dc31959a6a850602abfcd5d58b19f6b9c6939
+SHA1 (patch-src_calibre_constants.py) = a72594b5a68fa42e7133d8be42dd30e73c8db205
 SHA1 (patch-src_calibre_ebooks_BeautifulSoup.py) = b0775f55806a67322eaaae340c6f80ed87aa2332
 SHA1 (patch-src_calibre_headless_fontconfig__database.cpp) = 55e7bd7b779ec2ff4a28fdd3ca9d9c10811b6bb1
 SHA1 (patch-src_calibre_linux.py) = 382191b8c8c6c893c4f2385613c599fcfc3bff09
diff --git a/calibre/patches/patch-setup_build.py b/calibre/patches/patch-setup_build.py
index 9c1365d8e1..979f4d80f5 100644
--- a/calibre/patches/patch-setup_build.py
+++ b/calibre/patches/patch-setup_build.py
@@ -1,10 +1,40 @@
 $NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
 
-Fix linking against native X.
+- Fix linking against native X.
+- Include netbsd in various conditional building criteria.
+
+$NetBSD$
 
 --- setup/build.py.orig	2020-02-21 03:27:12.000000000 +0000
 +++ setup/build.py
-@@ -412,6 +412,7 @@ class Build(Command):
+@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
+ import textwrap, os, shlex, subprocess, glob, shutil, re, sys, json
+ from collections import namedtuple
+ 
+-from setup import Command, islinux, isbsd, isfreebsd, isosx, ishaiku, SRC, iswindows, __version__, ispy3
++from setup import Command, islinux, isbsd, isfreebsd, isnetbsd, isosx, ishaiku, SRC, iswindows, __version__, ispy3
+ isunix = islinux or isosx or isbsd or ishaiku
+ 
+ py_lib = os.path.join(sys.prefix, 'libs', 'python%d%d.lib' % sys.version_info[:2])
+@@ -103,7 +103,7 @@ def is_ext_allowed(ext):
+     only = ext.get('only', '')
+     if only:
+         only = set(only.split())
+-        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "osx", "windows"]))
++        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "osx", "windows", "netbsd"]))
+         return len(q.intersection(only)) > 0
+     return True
+ 
+@@ -124,6 +124,8 @@ def parse_extension(ext):
+             ans = ext.pop('bsd_' + k, ans)
+         elif isfreebsd:
+             ans = ext.pop('freebsd_' + k, ans)
++        elif isnetbsd:
++            ans = ext.pop('netbsd_' + k, ans)
+         elif ishaiku:
+             ans = ext.pop('haiku_' + k, ans)
+         else:
+@@ -412,6 +414,7 @@ class Build(Command):
              INCLUDEPATH += {freetype}
              DESTDIR = {destdir}
              CONFIG -= create_cmake  # Prevent qmake from generating a cmake build file which it puts in the calibre src directory
@@ -12,7 +42,7 @@ Fix linking against native X.
              ''').format(
                  headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
                      target), freetype=' '.join(ft_inc_dirs))
-@@ -472,6 +473,7 @@ class Build(Command):
+@@ -472,6 +475,7 @@ class Build(Command):
          SOURCES = {sources}
          INCLUDEPATH += {sipinc} {pyinc}
          VERSION = {ver}