Date: Sun, 9 Feb 2014 15:49:37 -0600 (CST) From: Rusty Nejdl <rnejdl@ringofsaturn.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/186609: Update port deskutils/calibre to 1.23.0 Message-ID: <assp.0117111541.201402092149.s19Lnb2b072445@tethys.ringofsaturn.com> Resent-Message-ID: <201402092220.s19MK1vI013062@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186609 >Category: ports >Synopsis: Update port deskutils/calibre to 1.23.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Feb 09 22:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Rusty Nejdl >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: System: FreeBSD tethys.ringofsaturn.com 9.2-STABLE FreeBSD 9.2-STABLE #0 r260195: Thu Jan 2 16:53:15 CST 2014 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update deskutils/calibre from 1.21.0 to 1.23.0. >How-To-Repeat: >Fix: --- calibre-1.23.0.diff begins here --- diff -ruN calibre/Makefile calibre.new/Makefile --- calibre/Makefile 2014-02-07 07:42:49.000000000 -0600 +++ calibre.new/Makefile 2014-02-07 16:16:28.000000000 -0600 @@ -2,7 +2,7 @@ # $FreeBSD: head/deskutils/calibre/Makefile 343214 2014-02-07 11:44:08Z bapt $ PORTNAME= calibre -PORTVERSION= 1.21.0 +PORTVERSION= 1.23.0 PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ diff -ruN calibre/distinfo calibre.new/distinfo --- calibre/distinfo 2014-01-30 16:10:15.000000000 -0600 +++ calibre.new/distinfo 2014-02-07 16:19:20.000000000 -0600 @@ -1,2 +1,2 @@ -SHA256 (calibre-1.21.0.tar.xz) = 30327d0b298b02dc80b9724ab847e1ff2d9b717e713705c79c4f8cf893b71c16 -SIZE (calibre-1.21.0.tar.xz) = 32437820 +SHA256 (calibre-1.23.0.tar.xz) = a95076588ae047b9f75f036da4c8b1eb573e7f0d8fd8b3afc5d38ac046d9a6ea +SIZE (calibre-1.23.0.tar.xz) = 32690648 diff -ruN calibre/files/patch-calibre_linux.py calibre.new/files/patch-calibre_linux.py --- calibre/files/patch-calibre_linux.py 2014-01-30 16:10:15.000000000 -0600 +++ calibre.new/files/patch-calibre_linux.py 2014-02-09 13:44:23.000000000 -0600 @@ -1,10 +1,16 @@ ---- src/calibre/linux.py.orig 2014-01-24 05:56:21.000000000 +0100 -+++ src/calibre/linux.py 2014-01-29 00:30:43.102775394 +0100 -@@ -712,9 +712,12 @@ +--- 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 @@ f.close() des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') -+ dtpdirs = ('gnome/apps', 'applications') ++ dtpdirs = ('gnome/apps', 'applications') + appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'appdata') + if not os.path.exists(appdata): + try: +@@ -726,8 +727,10 @@ + + APPDATA = get_appdata() for x in des: - cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] - cc(' '.join(cmd), shell=True) @@ -13,5 +19,5 @@ + cmd = ['cp', './'+x, dest] + cc(' '.join(cmd), shell=True) self.menu_resources.append(x) - cc(['xdg-desktop-menu', 'forceupdate']) - f = open('calibre-mimetypes.xml', 'wb') + ak = x.partition('.')[0] + if ak in APPDATA and os.access(appdata, os.W_OK): diff -ruN calibre/pkg-plist calibre.new/pkg-plist --- calibre/pkg-plist 2014-01-30 16:10:15.000000000 -0600 +++ calibre.new/pkg-plist 2014-02-09 13:55:37.000000000 -0600 @@ -998,7 +998,6 @@ lib/calibre/calibre/gui2/tweak_book/boss.py lib/calibre/calibre/gui2/tweak_book/char_select.py lib/calibre/calibre/gui2/tweak_book/check.py -lib/calibre/calibre/gui2/tweak_book/diff.py lib/calibre/calibre/gui2/tweak_book/editor/__init__.py lib/calibre/calibre/gui2/tweak_book/editor/canvas.py lib/calibre/calibre/gui2/tweak_book/editor/image.py @@ -1129,7 +1128,6 @@ lib/calibre/calibre/utils/config_base.py lib/calibre/calibre/utils/date.py lib/calibre/calibre/utils/dictclient.py -lib/calibre/calibre/utils/diff/__init__.py lib/calibre/calibre/utils/file_associations.py lib/calibre/calibre/utils/filenames.py lib/calibre/calibre/utils/fonts/__init__.py @@ -2063,7 +2061,6 @@ @dirrm lib/calibre/calibre/utils/fonts/sfnt/cff @dirrm lib/calibre/calibre/utils/fonts/sfnt @dirrm lib/calibre/calibre/utils/fonts -@dirrm lib/calibre/calibre/utils/diff @dirrm lib/calibre/calibre/utils/chm @dirrm lib/calibre/calibre/utils @dirrm lib/calibre/calibre/translations --- calibre-1.23.0.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?assp.0117111541.201402092149.s19Lnb2b072445>