View | Details | Raw Unified | Return to bug 224580 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	calibre
4
PORTNAME=	calibre
5
PORTVERSION=	3.14.0
5
PORTVERSION=	3.14.0
6
PORTREVISION=	1
6
CATEGORIES=	deskutils python
7
CATEGORIES=	deskutils python
7
MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
8
MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
8
9
Lines 52-58 Link Here
52
USE_RC_SUBR=	calibre
53
USE_RC_SUBR=	calibre
53
EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
54
EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
54
SHEBANG_GLOB=	*.sh *.py
55
SHEBANG_GLOB=	*.sh *.py
55
python_OLD_CMD=	"/usr/bin/env python2" /bin/python2 /usr/bin/python2 /usr/local/bin/python2
56
python_OLD_CMD=	"/usr/bin/env python2" "/usr/bin/env  python2" /bin/python2 /usr/bin/python2 /usr/local/bin/python2
56
USE_PYQT=	core gui network sip svg webkit widgets webkitwidgets xmlpatterns
57
USE_PYQT=	core gui network sip svg webkit widgets webkitwidgets xmlpatterns
57
USE_QT5=	buildtools_build core dbus gui qmake_build widgets
58
USE_QT5=	buildtools_build core dbus gui qmake_build widgets
58
USE_GL=		egl gl
59
USE_GL=		egl gl
(-)files/patch-setup_build__environment.py (-5 / +18 lines)
Lines 1-11 Link Here
1
--- setup/build_environment.py.orig	2017-06-16 04:00:12 UTC
1
--- setup/build_environment.py.orig	2017-12-15 02:50:37 UTC
2
+++ setup/build_environment.py
2
+++ setup/build_environment.py
3
@@ -84,7 +84,7 @@ pyqt['sip_bin'] = os.environ.get('SIP_BIN', 'sip')
3
@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
4
 from PyQt5.QtCore import PYQT_CONFIGURATION
4
 import os, subprocess, re, sys, sysconfig
5
 from distutils.spawn import find_executable
6
 
7
-from setup import isosx, iswindows, is64bit, islinux, ishaiku
8
+from setup import isbsd, isosx, iswindows, is64bit, islinux, ishaiku
9
 is64bit
10
 
11
 NMAKE = RC = msvc = MT = win_inc = win_lib = None
12
@@ -85,6 +85,12 @@ from PyQt5.QtCore import PYQT_CONFIGURATION
5
 pyqt['sip_flags'] = PYQT_CONFIGURATION['sip_flags']
13
 pyqt['sip_flags'] = PYQT_CONFIGURATION['sip_flags']
6
 def get_sip_dir():
14
 def get_sip_dir():
7
-    q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'sip') if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
15
     q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'sip') if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
8
+    q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'sip') if iswindows else os.path.join(sys.prefix, 'share', 'py-sip'))
16
+    if iswindows:
17
+        q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'sip'))
18
+    elif isbsd:
19
+        q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'py-sip'))
20
+    else:
21
+        q = os.path.join(sys.prefix, 'share', 'sip')
9
     for x in ('', 'Py2-PyQt5', 'PyQt5', 'sip/PyQt5'):
22
     for x in ('', 'Py2-PyQt5', 'PyQt5', 'sip/PyQt5'):
10
         base = os.path.join(q, x)
23
         base = os.path.join(q, x)
11
         if os.path.exists(os.path.join(base, 'QtWidgets')):
24
         if os.path.exists(os.path.join(base, 'QtWidgets')):
(-)files/patch-setup_extensions.json (+18 lines)
Line 0 Link Here
1
--- setup/extensions.json.orig	2017-12-15 02:50:37 UTC
2
+++ setup/extensions.json
3
@@ -194,8 +194,14 @@
4
         "libraries": "usb-1.0"
5
     },
6
     {
7
+        "name": "libusb-bsd",
8
+        "only": "bsd",
9
+        "sources": "calibre/devices/libusb/libusb.c",
10
+        "libraries": "usb"
11
+    },
12
+    {
13
         "name": "libmtp",
14
-        "only": "osx linux haiku",
15
+        "only": "osx linux haiku bsd",
16
         "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
17
         "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
18
         "libraries": "mtp"
(-)files/patch-src_calibre_devices_libusb_libusb.c (+14 lines)
Line 0 Link Here
1
--- src/calibre/devices/libusb/libusb.c.orig	2017-12-15 02:50:37 UTC
2
+++ src/calibre/devices/libusb/libusb.c
3
@@ -8,7 +8,11 @@
4
 #define UNICODE
5
 
6
 #include <Python.h>
7
+#ifdef __FreeBSD__
8
+#include <libusb.h>
9
+#else
10
 #include <libusb-1.0/libusb.h>
11
+#endif
12
 
13
 static PyObject *Error = NULL;
14
 static PyObject *cache = NULL;
(-)pkg-plist (+2 lines)
Lines 1181-1186 Link Here
1181
lib/calibre/calibre/plugins/icu.so
1181
lib/calibre/calibre/plugins/icu.so
1182
lib/calibre/calibre/plugins/imageops.so
1182
lib/calibre/calibre/plugins/imageops.so
1183
lib/calibre/calibre/plugins/libheadless.so
1183
lib/calibre/calibre/plugins/libheadless.so
1184
lib/calibre/calibre/plugins/libmtp.so
1185
lib/calibre/calibre/plugins/libusb-bsd.so
1184
lib/calibre/calibre/plugins/lzma_binding.so
1186
lib/calibre/calibre/plugins/lzma_binding.so
1185
lib/calibre/calibre/plugins/lzx.so
1187
lib/calibre/calibre/plugins/lzx.so
1186
lib/calibre/calibre/plugins/matcher.so
1188
lib/calibre/calibre/plugins/matcher.so

Return to bug 224580