Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Dec 2016 21:35:25 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428594 - in head/deskutils/gourmet: . files
Message-ID:  <201612142135.uBELZP0p027913@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Wed Dec 14 21:35:25 2016
New Revision: 428594
URL: https://svnweb.freebsd.org/changeset/ports/428594

Log:
  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>

Added:
  head/deskutils/gourmet/files/
  head/deskutils/gourmet/files/patch-pillow3   (contents, props changed)
Modified:
  head/deskutils/gourmet/Makefile

Modified: head/deskutils/gourmet/Makefile
==============================================================================
--- head/deskutils/gourmet/Makefile	Wed Dec 14 21:03:19 2016	(r428593)
+++ head/deskutils/gourmet/Makefile	Wed Dec 14 21:35:25 2016	(r428594)
@@ -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}sqli
 		${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

Added: head/deskutils/gourmet/files/patch-pillow3
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/gourmet/files/patch-pillow3	Wed Dec 14 21:35:25 2016	(r428594)
@@ -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,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612142135.uBELZP0p027913>