Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jan 2018 09:26:25 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r458237 - in head/deskutils/calibre: . files
Message-ID:  <201801060926.w069QPL5049810@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Jan  6 09:26:24 2018
New Revision: 458237
URL: https://svnweb.freebsd.org/changeset/ports/458237

Log:
  - Update calibre to 3.15.0
  - Avoid packaging mime database auto generated files
  
  This version enables MTP devices support on FreeBSD.
  
  Many thanks to cem@ for reporting the lack of support, doing most
  of the coding, taking care of upstreaming patches and testing. Also
  thanks for reminding me to fix the mime database problem!
  
  PR:		224580
  Submitted by:	cem@

Deleted:
  head/deskutils/calibre/files/patch-setup_build__environment.py
Modified:
  head/deskutils/calibre/Makefile
  head/deskutils/calibre/distinfo
  head/deskutils/calibre/files/patch-src_calibre_linux.py
  head/deskutils/calibre/pkg-message
  head/deskutils/calibre/pkg-plist

Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile	Sat Jan  6 09:17:39 2018	(r458236)
+++ head/deskutils/calibre/Makefile	Sat Jan  6 09:26:24 2018	(r458237)
@@ -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}/
 
@@ -93,8 +93,12 @@ do-install:
 		${PYSETUP} install --prefix ${PREFIX} \
 		--staging-root ${STAGEDIR}${PREFIX})
 	@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \
-		${STAGEDIR}${PREFIX}/share/applications/defaults.list
-	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
+		${STAGEDIR}${PREFIX}/share/applications/defaults.list \
+		${STAGEDIR}${PREFIX}/share/mime/application/* \
+		${STAGEDIR}${PREFIX}/share/mime/text/*
+	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories \
+		${STAGEDIR}${PREFIX}/share/mime/application \
+		${STAGEDIR}${PREFIX}/share/mime/text
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
 
 .include <bsd.port.mk>

Modified: head/deskutils/calibre/distinfo
==============================================================================
--- head/deskutils/calibre/distinfo	Sat Jan  6 09:17:39 2018	(r458236)
+++ head/deskutils/calibre/distinfo	Sat Jan  6 09:26:24 2018	(r458237)
@@ -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

Modified: head/deskutils/calibre/files/patch-src_calibre_linux.py
==============================================================================
--- head/deskutils/calibre/files/patch-src_calibre_linux.py	Sat Jan  6 09:17:39 2018	(r458236)
+++ head/deskutils/calibre/files/patch-src_calibre_linux.py	Sat Jan  6 09:26:24 2018	(r458237)
@@ -1,4 +1,4 @@
---- src/calibre/linux.py.orig	2017-07-28 04:07:52 UTC
+--- src/calibre/linux.py.orig	2018-01-05 05:41:54 UTC
 +++ src/calibre/linux.py
 @@ -841,7 +841,7 @@ class PostInstall:
                  f.close()
@@ -18,9 +18,9 @@
  Icon=calibre-viewer
  Categories=Graphics;Viewer;
  '''
-@@ -1021,7 +1021,7 @@ Name=Edit E-book
- GenericName=Edit E-books
- Comment=Edit e-books in various formats
+@@ -1021,7 +1021,7 @@ Name=E-book Editor
+ GenericName=Editor for E-books
+ Comment=Edit E-books in various formats
  TryExec=ebook-edit
 -Exec=ebook-edit --detach %f
 +Exec=ebook-edit %f

Modified: head/deskutils/calibre/pkg-message
==============================================================================
--- head/deskutils/calibre/pkg-message	Sat Jan  6 09:17:39 2018	(r458236)
+++ head/deskutils/calibre/pkg-message	Sat Jan  6 09:26:24 2018	(r458237)
@@ -26,6 +26,30 @@ attack) add the following:
 
 ---
 
+In addition to the above, for USB and MTP 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

Modified: head/deskutils/calibre/pkg-plist
==============================================================================
--- head/deskutils/calibre/pkg-plist	Sat Jan  6 09:17:39 2018	(r458236)
+++ head/deskutils/calibre/pkg-plist	Sat Jan  6 09:26:24 2018	(r458237)
@@ -1181,6 +1181,8 @@ lib/calibre/calibre/plugins/hunspell.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
@@ -2087,12 +2089,4 @@ share/icons/hicolor/64x64/mimetypes/gnome-mime-applica
 share/icons/hicolor/64x64/mimetypes/gnome-mime-application-x-topaz-ebook.png
 share/icons/hicolor/64x64/mimetypes/gnome-mime-text-lrs.png
 share/icons/hicolor/64x64/mimetypes/text-lrs.png
-share/mime/application/epub+zip.xml
-share/mime/application/x-kindle-application.xml
-share/mime/application/x-mobi8-ebook.xml
-share/mime/application/x-mobipocket-ebook.xml
-share/mime/application/x-mobipocket-subscription.xml
-share/mime/application/x-sony-bbeb.xml
-share/mime/application/x-topaz-ebook.xml
 share/mime/packages/calibre-mimetypes.xml
-share/mime/text/lrs.xml



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801060926.w069QPL5049810>