Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Jan 2015 21:28:35 +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: r377253 - in head/deskutils/calibre: . files
Message-ID:  <201501172128.t0HLSZFI076210@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Jan 17 21:28:35 2015
New Revision: 377253
URL: https://svnweb.freebsd.org/changeset/ports/377253
QAT: https://qat.redports.org/buildarchive/r377253/

Log:
  - Fix .desktop entries [1]
  
  While here:
  
  - Don't create unneeded empty directories
  - Silence one installation command
  
  PR:		196817 [1]
  Submitted by:	Lawrence Chen <beastie at tardisi.com>

Modified:
  head/deskutils/calibre/Makefile
  head/deskutils/calibre/files/patch-calibre_linux.py

Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile	Sat Jan 17 21:28:08 2015	(r377252)
+++ head/deskutils/calibre/Makefile	Sat Jan 17 21:28:35 2015	(r377253)
@@ -3,7 +3,7 @@
 
 PORTNAME=	calibre
 PORTVERSION=	1.48.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
@@ -79,14 +79,14 @@ do-build:
 		${PYSETUP} build)
 
 do-install:
-.for dir in bash-completion desktop-directories gnome/apps mime/packages \
-	icons/hicolor/128x128/apps zsh/site-functions
+.for dir in bash-completion gnome/apps mime/packages \
+	icons/hicolor/128x128 zsh/site-functions
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/${dir}
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} install --prefix ${PREFIX} \
 		--staging-root ${STAGEDIR}${PREFIX})
-	${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall
+	@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall
 
 .include <bsd.port.mk>

Modified: head/deskutils/calibre/files/patch-calibre_linux.py
==============================================================================
--- head/deskutils/calibre/files/patch-calibre_linux.py	Sat Jan 17 21:28:08 2015	(r377252)
+++ head/deskutils/calibre/files/patch-calibre_linux.py	Sat Jan 17 21:28:35 2015	(r377253)
@@ -1,6 +1,6 @@
---- src/calibre/linux.py.orig	2014-02-09 13:42:40.000000000 -0600
-+++ src/calibre/linux.py	2014-02-09 13:43:59.000000000 -0600
-@@ -712,6 +712,7 @@
+--- src/calibre/linux.py.orig	2014-08-08 03:21:35 UTC
++++ src/calibre/linux.py
+@@ -831,6 +831,7 @@ class PostInstall:
                  f.close()
                  des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
                          'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
@@ -8,7 +8,7 @@
                  appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'appdata')
                  if not os.path.exists(appdata):
                      try:
-@@ -726,8 +727,10 @@
+@@ -845,8 +846,10 @@ class PostInstall:
  
                  APPDATA = get_appdata()
                  for x in des:
@@ -21,3 +21,30 @@
                      self.menu_resources.append(x)
                      ak = x.partition('.')[0]
                      if ak in APPDATA and os.access(appdata, os.W_OK):
+@@ -992,7 +995,7 @@ Name=E-book Viewer
+ GenericName=Viewer for E-books
+ Comment=Viewer for E-books in all the major formats
+ TryExec=ebook-viewer
+-Exec=ebook-viewer --detach %f
++Exec=ebook-viewer %f
+ Icon=calibre-viewer
+ Categories=Graphics;Viewer;
+ '''
+@@ -1005,7 +1008,7 @@ Name=Edit E-book
+ GenericName=Edit E-books
+ Comment=Edit e-books in various formats
+ TryExec=ebook-edit
+-Exec=ebook-edit --detach %f
++Exec=ebook-edit %f
+ Icon=calibre-ebook-edit
+ Categories=Office;
+ '''
+@@ -1018,7 +1021,7 @@ Name=calibre
+ GenericName=E-book library management
+ Comment=E-book library management: Convert, view, share, catalogue all your e-books
+ TryExec=calibre
+-Exec=calibre --detach %F
++Exec=calibre %F
+ Icon=calibre-gui
+ Categories=Office;
+ '''



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