Index: head/deskutils/gourmet/Makefile =================================================================== --- head/deskutils/gourmet/Makefile (revision 428593) +++ head/deskutils/gourmet/Makefile (revision 428594) @@ -1,43 +1,44 @@ # Created by: Adam Weinberger # $FreeBSD$ PORTNAME= gourmet PORTVERSION= 0.17.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MAINTAINER= rm@FreeBSD.org COMMENT= GNOME recipe manager LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \ ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy07>=0:databases/py-sqlalchemy07 \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler \ ${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab \ - ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl + ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 OPTIONS_DEFINE= IPYTHON IPYTHON_DESC= Interactive shell support IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython -USES= gettext python:2 +USES= gettext python:2.7+ USE_GNOME= intltool pygnome2 pygtk2 USE_PYTHON= autoplist distutils PLIST_FILES+= man/man1/gourmet.1.gz USE_GITHUB= yes GH_ACCOUNT= thinkle post-patch: @${REINPLACE_CMD} -e "s,'spellcheck',#'spellcheck',g" \ ${WRKSRC}/gourmet/plugin_loader.py post-install: ${INSTALL_MAN} ${WRKSRC}/gourmet.1 ${STAGEDIR}${PREFIX}/man/man1/ .include Index: head/deskutils/gourmet/files/patch-pillow3 =================================================================== --- head/deskutils/gourmet/files/patch-pillow3 (nonexistent) +++ head/deskutils/gourmet/files/patch-pillow3 (revision 428594) @@ -0,0 +1,34 @@ +commit 4d88788a6efc68acf243a1a33d854f76b2f26dfd +Author: Joe Sapp +Date: Tue Nov 3 21:23:05 2015 -0500 + + Use Image.tobytes() instead of tostring() + + tostring() was deprecated (in Pillow at least) in version 2.0. See https://github.com/python-pillow/Pillow/commit/baa5143394708704328dcd46b0387f36a276a762 + +diff --git a/gourmet/gtk_extras/ratingWidget.py b/gourmet/gtk_extras/ratingWidget.py +index 0e01735d..efa64638 100644 +--- gourmet/gtk_extras/ratingWidget.py ++++ gourmet/gtk_extras/ratingWidget.py +@@ -135,7 +135,7 @@ class StarGenerator: + if is_rgba: rowstride = 4 + else: rowstride = 3 + pb=gtk.gdk.pixbuf_new_from_data( +- image.tostring(), ++ image.tobytes(), + gtk.gdk.COLORSPACE_RGB, + is_rgba, + 8, +diff --git a/gourmet/plugins/browse_recipes/icon_helpers.py b/gourmet/plugins/browse_recipes/icon_helpers.py +index 61c772c0..2e7b08b1 100644 +--- gourmet/plugins/browse_recipes/icon_helpers.py ++++ gourmet/plugins/browse_recipes/icon_helpers.py +@@ -38,7 +38,7 @@ def get_pixbuf_from_image (image): + if is_rgba: rowstride = 4 + else: rowstride = 3 + pb=gtk.gdk.pixbuf_new_from_data( +- image.tostring(), ++ image.tobytes(), + gtk.gdk.COLORSPACE_RGB, + is_rgba, + 8, Property changes on: head/deskutils/gourmet/files/patch-pillow3 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property