Attachment 147755 Details for Bug 193397 – calibre.diff

[patch] calibre.diff

calibre.diff (text/plain), 4.25 KB, created by Guido Falsi on 2014-09-28 15:59:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2014-09-28 15:59:43 UTC

Size: 4.25 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>--- UPDATING	(revision 369452)
>+++ UPDATING	(working copy)
>@@ -5,6 +5,19 @@
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20140928:
>+  AFFECTS: users of deskutils/calibre
>+  AUTHOR: madpilot@FreeBSD.org
>+
>+  The dependency on graphics/py-imaging in calibre has been changed
>+  to using the graphics/py-pillow port.
>+
>+  Due to this change automatic updating of the port will not work
>+  correctly.
>+
>+  It is suggested to remove calibre and py-imaging from the system
>+  and then reinstall calibre again using binary packages or ports.
>+
> 20140927:
>   AFFECTS: users of net/foreman-proxy
>   AUTHOR: mm@FreeBSD.org
>Index: deskutils/calibre/Makefile
>===================================================================
>--- deskutils/calibre/Makefile	(revision 369452)
>+++ deskutils/calibre/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	calibre
>-PORTVERSION=	1.47.0
>-PORTREVISION=	2
>+PORTVERSION=	1.48.0
> CATEGORIES=	deskutils python
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
> 
>@@ -24,7 +23,7 @@
> 		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
> 		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
>-		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
>+		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
> 		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
> RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
> 		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
>@@ -31,7 +30,7 @@
> 		${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
> 		${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
>-		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
>+		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
> 		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
> 		${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
>@@ -51,11 +50,10 @@
> USE_RC_SUBR=	calibre
> EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
> 
>-USES=		desktop-file-utils pkgconfig shared-mime-info shebangfix tar:xz
>+USES=		desktop-file-utils pkgconfig python:2 shared-mime-info shebangfix tar:xz
> SHEBANG_FILES=	src/calibre/ebooks/metadata/odt.py \
> 		src/calibre/utils/*.py \
> 		src/odf/*.py
>-USE_PYTHON=	2
> USE_QT4=	dbus qmake_build moc_build
> INSTALLS_ICONS=	yes
> WRKSRC=		${WRKDIR}/${PORTNAME}-src
>Index: deskutils/calibre/distinfo
>===================================================================
>--- deskutils/calibre/distinfo	(revision 369452)
>+++ deskutils/calibre/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (calibre-1.47.0.tar.xz) = efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2
>-SIZE (calibre-1.47.0.tar.xz) = 36581960
>+SHA256 (calibre-1.48.0.tar.xz) = e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472
>+SIZE (calibre-1.48.0.tar.xz) = 35126680
>Index: deskutils/calibre/pkg-plist
>===================================================================
>--- deskutils/calibre/pkg-plist	(revision 369452)
>+++ deskutils/calibre/pkg-plist	(working copy)
>@@ -1045,7 +1045,6 @@
> lib/calibre/calibre/gui2/update.py
> lib/calibre/calibre/gui2/viewer/__init__.py
> lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
>-lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
> lib/calibre/calibre/gui2/viewer/config.py
> lib/calibre/calibre/gui2/viewer/config_ui.py
> lib/calibre/calibre/gui2/viewer/documentview.py
>@@ -1056,11 +1055,11 @@
> lib/calibre/calibre/gui2/viewer/javascript.py
> lib/calibre/calibre/gui2/viewer/keys.py
> lib/calibre/calibre/gui2/viewer/main.py
>-lib/calibre/calibre/gui2/viewer/main_ui.py
> lib/calibre/calibre/gui2/viewer/position.py
> lib/calibre/calibre/gui2/viewer/printing.py
> lib/calibre/calibre/gui2/viewer/table_popup.py
> lib/calibre/calibre/gui2/viewer/toc.py
>+lib/calibre/calibre/gui2/viewer/ui.py
> lib/calibre/calibre/gui2/widgets.py
> lib/calibre/calibre/gui2/widgets2.py
> lib/calibre/calibre/gui2/wizard/__init__.py

Flags:

madpilot: maintainer-approval? (rnejdl)

Actions: View | Diff

Attachments on bug 193397: 146955 | 147071 | 147755