[arch-commits] Commit in gourmet/repos/community-any (7 files)
Balló György
bgyorgy at archlinux.org
Sun Jan 31 05:01:01 UTC 2016
Date: Sunday, January 31, 2016 @ 06:01:01
Author: bgyorgy
Revision: 159657
archrelease: copy trunk to community-any
Added:
gourmet/repos/community-any/.contrib
(from rev 159656, gourmet/trunk/.contrib)
gourmet/repos/community-any/PKGBUILD
(from rev 159656, gourmet/trunk/PKGBUILD)
gourmet/repos/community-any/gourmet-pillow.patch
(from rev 159656, gourmet/trunk/gourmet-pillow.patch)
gourmet/repos/community-any/gourmet.install
(from rev 159656, gourmet/trunk/gourmet.install)
Deleted:
gourmet/repos/community-any/.contrib
gourmet/repos/community-any/PKGBUILD
gourmet/repos/community-any/gourmet.install
----------------------+
.contrib | 6 +--
PKGBUILD | 86 ++++++++++++++++++++++++++-----------------------
gourmet-pillow.patch | 37 +++++++++++++++++++++
gourmet.install | 22 ++++++------
4 files changed, 97 insertions(+), 54 deletions(-)
Deleted: .contrib
===================================================================
--- .contrib 2016-01-31 05:00:55 UTC (rev 159656)
+++ .contrib 2016-01-31 05:01:01 UTC (rev 159657)
@@ -1,3 +0,0 @@
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-# Contributor: Eric Belanger <belanger at astro.umontreal.ca>
-# Contributor: Andrew Conkling <andrewski at fr.st>
Copied: gourmet/repos/community-any/.contrib (from rev 159656, gourmet/trunk/.contrib)
===================================================================
--- .contrib (rev 0)
+++ .contrib 2016-01-31 05:01:01 UTC (rev 159657)
@@ -0,0 +1,3 @@
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+# Contributor: Eric Belanger <belanger at astro.umontreal.ca>
+# Contributor: Andrew Conkling <andrewski at fr.st>
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-31 05:00:55 UTC (rev 159656)
+++ PKGBUILD 2016-01-31 05:01:01 UTC (rev 159657)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-
-pkgname=gourmet
-pkgver=0.17.4
-pkgrel=2
-pkgdesc="A simple but powerful recipe-managing application"
-arch=('any')
-url="http://thinkle.github.io/gourmet/"
-license=('GPL')
-depends=('pygtk' 'python2-elib-intl' 'python2-pillow' 'python2-sqlalchemy')
-makedepends=('python2-distutils-extra')
-optdepends=('gstreamer0.10-python: play timer sounds'
- 'ipython2: Python Shell plugin'
- 'pyrtf: RTF support'
- 'python2-beautifulsoup3: Webpage import plugin'
- 'python2-gtkspell: Spell Checking plugin'
- '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')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # python2 fix
- find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- python2 setup.py build
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- python2 setup.py install --root="$pkgdir" --optimize=1
-}
Copied: gourmet/repos/community-any/PKGBUILD (from rev 159656, gourmet/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-01-31 05:01:01 UTC (rev 159657)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+
+pkgname=gourmet
+pkgver=0.17.4
+pkgrel=3
+pkgdesc="A simple but powerful recipe-managing application"
+arch=('any')
+url="http://thinkle.github.io/gourmet/"
+license=('GPL')
+depends=('pygtk' 'python2-elib-intl' 'python2-pillow' 'python2-sqlalchemy')
+makedepends=('python2-distutils-extra')
+optdepends=('gstreamer0.10-python: play timer sounds'
+ 'ipython2: Python Shell plugin'
+ 'pyrtf: RTF support'
+ 'python2-beautifulsoup3: Webpage import plugin'
+ 'python2-gtkspell: Spell Checking plugin'
+ '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"
+ "gourmet-pillow.patch")
+md5sums=('937334364abc3093709a604c1d473e9f'
+ '4fec382fd362959e7062c92b1d2b9fa9')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # 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() {
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py build
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py install --root="$pkgdir" --optimize=1
+}
Copied: gourmet/repos/community-any/gourmet-pillow.patch (from rev 159656, gourmet/trunk/gourmet-pillow.patch)
===================================================================
--- gourmet-pillow.patch (rev 0)
+++ gourmet-pillow.patch 2016-01-31 05:01:01 UTC (rev 159657)
@@ -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,
Deleted: gourmet.install
===================================================================
--- gourmet.install 2016-01-31 05:00:55 UTC (rev 159656)
+++ gourmet.install 2016-01-31 05:01:01 UTC (rev 159657)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: gourmet/repos/community-any/gourmet.install (from rev 159656, gourmet/trunk/gourmet.install)
===================================================================
--- gourmet.install (rev 0)
+++ gourmet.install 2016-01-31 05:01:01 UTC (rev 159657)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
More information about the arch-commits
mailing list