[arch-commits] Commit in gourmet/trunk (PKGBUILD gourmet-pillow.patch)

[Balló György]

    Date: Sunday, January 31, 2016 @ 06:00:55
  Author: bgyorgy
Revision: 159656

upgpkg: gourmet 0.17.4-3

Fix for pillow 3 (FS#47615)

Added:
  gourmet/trunk/gourmet-pillow.patch
Modified:
  gourmet/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 +++++++++---
 gourmet-pillow.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-31 04:52:24 UTC (rev 159655)
+++ PKGBUILD	2016-01-31 05:00:55 UTC (rev 159656)
@@ -4,7 +4,7 @@
 
 pkgname=gourmet
 pkgver=0.17.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple but powerful recipe-managing application"
 arch=('any')
 url="http://thinkle.github.io/gourmet/"
@@ -19,8 +19,10 @@
             'python2-poppler: Printing and PDF Export plugin'
             'python2-reportlab: Printing and PDF Export plugin')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/thinkle/$pkgname/archive/$pkgver.tar.gz")
-md5sums=('937334364abc3093709a604c1d473e9f')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/thinkle/$pkgname/archive/$pkgver.tar.gz"
+        "gourmet-pillow.patch")
+md5sums=('937334364abc3093709a604c1d473e9f'
+         '4fec382fd362959e7062c92b1d2b9fa9')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -27,6 +29,10 @@
 
   # python2 fix
   find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+  # Fix for pillow 3
+  # https://github.com/thinkle/gourmet/commit/4d88788a
+  patch -Np1 -i ../gourmet-pillow.patch
 }
 
 build() {

Added: gourmet-pillow.patch
===================================================================
--- gourmet-pillow.patch	                        (rev 0)
+++ gourmet-pillow.patch	2016-01-31 05:00:55 UTC (rev 159656)
@@ -0,0 +1,37 @@
+From 4d88788a6efc68acf243a1a33d854f76b2f26dfd Mon Sep 17 00:00:00 2001
+From: Joe Sapp <joe at babyjoe>
+Date: Tue, 3 Nov 2015 21:23:05 -0500
+Subject: [PATCH] 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
+---
+ gourmet/gtk_extras/ratingWidget.py             | 2 +-
+ gourmet/plugins/browse_recipes/icon_helpers.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gourmet/gtk_extras/ratingWidget.py b/gourmet/gtk_extras/ratingWidget.py
+index 0e01735..efa6463 100644
+--- a/gourmet/gtk_extras/ratingWidget.py
++++ b/gourmet/gtk_extras/ratingWidget.py
+@@ -135,7 +135,7 @@ def get_pixbuf_from_image (self, image, make_white_opaque=True):
+         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 61c772c..2e7b08b 100644
+--- a/gourmet/plugins/browse_recipes/icon_helpers.py
++++ b/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,