From owner-svn-ports-all@FreeBSD.ORG Tue Feb 11 16:44:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 188558E1; Tue, 11 Feb 2014 16:44:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0337915B2; Tue, 11 Feb 2014 16:44:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BGiCFc080575; Tue, 11 Feb 2014 16:44:12 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BGiCaD080571; Tue, 11 Feb 2014 16:44:12 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201402111644.s1BGiCaD080571@svn.freebsd.org> From: Guido Falsi Date: Tue, 11 Feb 2014 16:44:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343767 - in head/deskutils/calibre: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 16:44:13 -0000 Author: madpilot Date: Tue Feb 11 16:44:11 2014 New Revision: 343767 URL: http://svnweb.freebsd.org/changeset/ports/343767 QAT: https://qat.redports.org/buildarchive/r343767/ Log: - Update to 1.23.0 PR: ports/186609 Submitted by: Rusty Nejdl (maintainer) Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/files/patch-calibre_linux.py head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Tue Feb 11 16:43:35 2014 (r343766) +++ head/deskutils/calibre/Makefile Tue Feb 11 16:44:11 2014 (r343767) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 1.21.0 -PORTREVISION= 1 +PORTVERSION= 1.23.0 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Tue Feb 11 16:43:35 2014 (r343766) +++ head/deskutils/calibre/distinfo Tue Feb 11 16:44:11 2014 (r343767) @@ -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 Modified: head/deskutils/calibre/files/patch-calibre_linux.py ============================================================================== --- head/deskutils/calibre/files/patch-calibre_linux.py Tue Feb 11 16:43:35 2014 (r343766) +++ head/deskutils/calibre/files/patch-calibre_linux.py Tue Feb 11 16:44:11 2014 (r343767) @@ -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): Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Tue Feb 11 16:43:35 2014 (r343766) +++ head/deskutils/calibre/pkg-plist Tue Feb 11 16:44:11 2014 (r343767) @@ -998,11 +998,16 @@ lib/calibre/calibre/gui2/tweak_book/__in 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/diff/__init__.py +lib/calibre/calibre/gui2/tweak_book/diff/highlight.py +lib/calibre/calibre/gui2/tweak_book/diff/main.py +lib/calibre/calibre/gui2/tweak_book/diff/view.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 lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py +lib/calibre/calibre/gui2/tweak_book/editor/smart/__init__.py +lib/calibre/calibre/gui2/tweak_book/editor/smart/html.py lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py @@ -1129,7 +1134,6 @@ lib/calibre/calibre/utils/config.py 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 @@ -1404,6 +1408,9 @@ lib/calibre/routes/route.py lib/calibre/routes/util.py lib/calibre/templite/__init__.py %%PYTHON_SITELIBDIR%%/init_calibre.py +share/appdata/calibre-ebook-edit.appdata.xml +share/appdata/calibre-ebook-viewer.appdata.xml +share/appdata/calibre-gui.appdata.xml share/applications/calibre-ebook-edit.desktop share/applications/calibre-ebook-viewer.desktop share/applications/calibre-gui.desktop @@ -1520,6 +1527,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/dialog_question.png %%DATADIR%%/images/dialog_warning.png %%DATADIR%%/images/dictionary.png +%%DATADIR%%/images/diff.png %%DATADIR%%/images/document-encrypt.png %%DATADIR%%/images/document-new.png %%DATADIR%%/images/document_open.png @@ -1955,6 +1963,7 @@ share/zsh/site-functions/_calibre @dirrmtry share/gnome @dirrmtry share/desktop-directories @dirrmtry share/bash-completion +@dirrmtry share/appdata @dirrmtry share/zsh/site-functions @dirrmtry share/zsh @dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular @@ -2063,7 +2072,6 @@ share/zsh/site-functions/_calibre @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 @@ -2074,7 +2082,9 @@ share/zsh/site-functions/_calibre @dirrm lib/calibre/calibre/gui2/wizard @dirrm lib/calibre/calibre/gui2/viewer @dirrm lib/calibre/calibre/gui2/tweak_book/editor/syntax +@dirrm lib/calibre/calibre/gui2/tweak_book/editor/smart @dirrm lib/calibre/calibre/gui2/tweak_book/editor +@dirrm lib/calibre/calibre/gui2/tweak_book/diff @dirrm lib/calibre/calibre/gui2/tweak_book @dirrm lib/calibre/calibre/gui2/toc @dirrm lib/calibre/calibre/gui2/tag_browser