diff options
| author | rm <rm@FreeBSD.org> | 2016-12-15 05:35:25 +0800 |
|---|---|---|
| committer | rm <rm@FreeBSD.org> | 2016-12-15 05:35:25 +0800 |
| commit | 59db2d665030d29d4359f3f5ac06f5834f506cdc (patch) | |
| tree | f5ad116c1a390d91cfeb20474a57f6dfd5d19cf9 /deskutils | |
| parent | a36d042486d8962358d7f639d9eb33a51940122b (diff) | |
| download | freebsd-ports-gnome-59db2d665030d29d4359f3f5ac06f5834f506cdc.tar.gz freebsd-ports-gnome-59db2d665030d29d4359f3f5ac06f5834f506cdc.tar.zst freebsd-ports-gnome-59db2d665030d29d4359f3f5ac06f5834f506cdc.zip | |
deskutils/gourmet: fix runtime
- fix runtime by applying upstream patch that adjusts using more fresh
Pillow API calls
- add missing dependency upon BeautifulSoup
- bump PORTREVISION
PR: 214880
Reported by: rhs <rhs.message@gmail.com>
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/gourmet/Makefile | 7 | ||||
| -rw-r--r-- | deskutils/gourmet/files/patch-pillow3 | 34 |
2 files changed, 38 insertions, 3 deletions
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile index d12c9101f3c8..ab84a6924ecd 100644 --- a/deskutils/gourmet/Makefile +++ b/deskutils/gourmet/Makefile @@ -3,7 +3,7 @@ PORTNAME= gourmet PORTVERSION= 0.17.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MAINTAINER= rm@FreeBSD.org @@ -20,13 +20,14 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ ${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 diff --git a/deskutils/gourmet/files/patch-pillow3 b/deskutils/gourmet/files/patch-pillow3 new file mode 100644 index 000000000000..2a0df4cf3fc7 --- /dev/null +++ b/deskutils/gourmet/files/patch-pillow3 @@ -0,0 +1,34 @@ +commit 4d88788a6efc68acf243a1a33d854f76b2f26dfd +Author: Joe Sapp <joe@babyjoe> +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, |