Attachment 189442 Details for Bug 224580 – Update to version including upstreamed changes

[patch] Update to version including upstreamed changes

calibre.diff (text/plain), 3.51 KB, created by Guido Falsi on 2018-01-05 14:02:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2018-01-05 14:02:15 UTC

Size: 3.51 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 458122)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	calibre
>-PORTVERSION=	3.14.0
>+PORTVERSION=	3.15.0
> CATEGORIES=	deskutils python
> MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 458122)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1513325134
>-SHA256 (calibre-3.14.0.tar.xz) = a14c37514850e5b9eedf53d5f80005e631cdf1f8ae82d1fca652c22a1094c78c
>-SIZE (calibre-3.14.0.tar.xz) = 38059200
>+TIMESTAMP = 1515144901
>+SHA256 (calibre-3.15.0.tar.xz) = 8746f52315561d606fd7120fec8284c2e4433f6ead14639c40b4b5f1522273ff
>+SIZE (calibre-3.15.0.tar.xz) = 38177684
>Index: files/patch-setup_build__environment.py
>===================================================================
>--- files/patch-setup_build__environment.py	(revision 458122)
>+++ files/patch-setup_build__environment.py	(nonexistent)
>@@ -1,11 +0,0 @@
>---- setup/build_environment.py.orig	2017-06-16 04:00:12 UTC
>-+++ setup/build_environment.py
>-@@ -84,7 +84,7 @@ pyqt['sip_bin'] = os.environ.get('SIP_BIN', 'sip')
>- from PyQt5.QtCore import PYQT_CONFIGURATION
>- pyqt['sip_flags'] = PYQT_CONFIGURATION['sip_flags']
>- def get_sip_dir():
>--    q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'sip') if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
>-+    q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'sip') if iswindows else os.path.join(sys.prefix, 'share', 'py-sip'))
>-     for x in ('', 'Py2-PyQt5', 'PyQt5', 'sip/PyQt5'):
>-         base = os.path.join(q, x)
>-         if os.path.exists(os.path.join(base, 'QtWidgets')):
>
>Property changes on: files/patch-setup_build__environment.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 458122)
>+++ pkg-message	(working copy)
>@@ -26,6 +26,29 @@
> 
> ---
> 
>+In addition to the above, for USB and MPT devices the user needs
>+to be able to access the device node in /dev.
>+
>+to be aware of USB devices attached to the machine, the user needs
>+to be a member of the operator group:
>+
>+# pw groupmod operator -m yourusername
>+
>+Then, add the following to /etc/devfs.rules, or create this file
>+if it does not exist yet:
>+
>+[system=10] add path 'usb/*' mode 0660 group operator
>+
>+To load these new rules, add the following to /etc/rc.conf:
>+
>+devfs_system_ruleset="system"
>+
>+Then, restart devfs
>+
>+# service devfs restart
>+
>+---
>+
> If you are using an Android device as your e-book reader, please note
> that the stock Google Books app uses a storage format that is not
> supported by calibre.  The calibre FAQ recommends that either of the
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 458122)
>+++ pkg-plist	(working copy)
>@@ -1181,6 +1181,8 @@
> 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

Actions: View | Diff

Attachments on bug 224580: 189110 | 189442