kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deskutils/gourmet: fix runtime

Browse source 
- 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>
This commit is contained in:
Ruslan Makhmatkhanov 2016-12-14 21:35:25 +00:00
parent fbe7b82b75
commit b59279d61e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=428594
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
deskutils/gourmet/Makefile
View file

@ -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

34
deskutils/gourmet/files/patch-pillow3 Normal file
View file

@ -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,