Date: Sunday, September 15, 2013 @ 13:29:40 Author: schiv Revision: 97202
upgpkg: gourmet 0.16.0-2 PIL -> Pillow TODO Added: gourmet/trunk/.contrib gourmet/trunk/pil.patch Modified: gourmet/trunk/PKGBUILD -----------+ .contrib | 3 + PKGBUILD | 30 ++++++++++++------- pil.patch | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 11 deletions(-) Added: .contrib =================================================================== --- .contrib (rev 0) +++ .contrib 2013-09-15 11:29:40 UTC (rev 97202) @@ -0,0 +1,3 @@ +# Contributor: Corrado Primier <ba...@aur.archlinux.org> +# Contributor: Eric Belanger <belan...@astro.umontreal.ca> +# Contributor: Andrew Conkling <andrew...@fr.st> Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-09-15 10:39:15 UTC (rev 97201) +++ PKGBUILD 2013-09-15 11:29:40 UTC (rev 97202) @@ -1,17 +1,16 @@ # $Id$ -# Maintainer: Ray Rashif <sc...@archlinux.org> -# Contributor: Corrado Primier <ba...@aur.archlinux.org> -# Contributor: Eric Belanger <belan...@astro.umontreal.ca> -# Contributor: Andrew Conkling <andrew...@fr.st> +# Maintainer: +# Contributor: Ray Rashif <sc...@archlinux.org> +# Contributor: see .contrib pkgname=gourmet pkgver=0.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="A simple but powerful recipe-managing application" -arch=(any) -url="http://thinkle.github.com/gourmet/" +arch=('any') +url="http://thinkle.github.io/gourmet/" license=('GPL') -depends=('pygtk' 'python2-imaging' 'python2-sqlalchemy' 'hicolor-icon-theme') +depends=('pygtk' 'python2-pillow' 'python2-sqlalchemy' 'hicolor-icon-theme') makedepends=('python2-distutils-extra') optdepends=('gstreamer0.10-python: play timer sounds' 'ipython2: Python Shell plugin' @@ -22,10 +21,12 @@ 'python2-reportlab: Printing and PDF Export plugin') changelog=$pkgname.changelog install=$pkgname.install -source=(https://launchpad.net/gourmet/main/$pkgver/+download/$pkgname-$pkgver.tar.bz2) -md5sums=('6a4ddb80b40e1bee7797697f03c9ef82') +source=("https://launchpad.net/gourmet/main/$pkgver/+download/$pkgname-$pkgver.tar.bz2" + "pil.patch") +md5sums=('6a4ddb80b40e1bee7797697f03c9ef82' + '6e90c8021d5949525e565c2607d2e6e6') -package() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # python2 fix @@ -34,5 +35,12 @@ sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done + # python-imaging -> python-pillow (relative PIL import) + patch -Np1 -i "$srcdir/pil.patch" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --root="$pkgdir" --optimize=1 } Added: pil.patch =================================================================== --- pil.patch (rev 0) +++ pil.patch 2013-09-15 11:29:40 UTC (rev 97202) @@ -0,0 +1,94 @@ +diff -bur gourmet-0.16.0.orig/gourmet/exporters/exporter.py gourmet-0.16.0/gourmet/exporters/exporter.py +--- gourmet-0.16.0.orig/gourmet/exporters/exporter.py 2013-09-15 08:40:09.090420987 +0000 ++++ gourmet-0.16.0/gourmet/exporters/exporter.py 2013-09-15 09:00:15.000000000 +0000 +@@ -1,10 +1,15 @@ +-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types ++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types + from gourmet import gglobals, convert + from gourmet.gdebug import * + from gettext import gettext as _ + from gourmet.plugin_loader import Pluggable, pluggable_method + from gourmet.plugin import BaseExporterPlugin, BaseExporterMultiRecPlugin + from gourmet.threadManager import SuspendableThread ++# Require PIL module. ++try: ++ from PIL import Image ++except ImportError: ++ import Image + + REC_ATTR_DIC = gglobals.REC_ATTR_DIC + DEFAULT_ATTR_ORDER = gglobals.DEFAULT_ATTR_ORDER +diff -bur gourmet-0.16.0.orig/gourmet/ImageExtras.py gourmet-0.16.0/gourmet/ImageExtras.py +--- gourmet-0.16.0.orig/gourmet/ImageExtras.py 2013-09-15 08:40:09.097087657 +0000 ++++ gourmet-0.16.0/gourmet/ImageExtras.py 2013-09-15 07:12:30.000000000 +0000 +@@ -1,5 +1,10 @@ +-import os, os.path, tempfile, gtk, Image, StringIO ++import os, os.path, tempfile, gtk, StringIO + from gdebug import * ++# Require PIL module. ++try: ++ from PIL import Image ++except ImportError: ++ import Image + + TMPFILE = tempfile.mktemp(prefix='gourmet_tempfile_') + +diff -bur gourmet-0.16.0.orig/gourmet/plugins/import_export/html_plugin/html_exporter.py gourmet-0.16.0/gourmet/plugins/import_export/html_plugin/html_exporter.py +--- gourmet-0.16.0.orig/gourmet/plugins/import_export/html_plugin/html_exporter.py 2013-09-15 08:40:09.137087303 +0000 ++++ gourmet-0.16.0/gourmet/plugins/import_export/html_plugin/html_exporter.py 2013-09-15 07:13:00.000000000 +0000 +@@ -1,8 +1,13 @@ +-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap ++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap + from gettext import gettext as _ + from gourmet import convert,gglobals + from gourmet.gdebug import * + from gourmet.exporters.exporter import * ++# Require PIL module. ++try: ++ from PIL import Image ++except ImportError: ++ import Image + + + HTML_HEADER_START = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +diff -bur gourmet-0.16.0.orig/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py gourmet-0.16.0/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py +--- gourmet-0.16.0.orig/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py 2013-09-15 08:40:09.137087303 +0000 ++++ gourmet-0.16.0/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py 2013-09-15 07:13:21.000000000 +0000 +@@ -1,8 +1,13 @@ +-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap ++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap + from gourmet import gglobals, convert + from gourmet.exporters.exporter import * + from gourmet.gdebug import * + from gettext import gettext as _ ++# Require PIL module. ++try: ++ from PIL import Image ++except ImportError: ++ import Image + + class mealmaster_exporter (exporter_mult): + def __init__ (self, rd, r, out, conv=None, change_units=True, mult=1): +diff -bur gourmet-0.16.0.orig/gourmet/reccard.py gourmet-0.16.0/gourmet/reccard.py +--- gourmet-0.16.0.orig/gourmet/reccard.py 2013-09-15 08:40:09.137087303 +0000 ++++ gourmet-0.16.0/gourmet/reccard.py 2013-09-15 07:13:54.000000000 +0000 +@@ -1,6 +1,6 @@ + #!/usr/bin/env python + import gc +-import gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, Image, StringIO, pango, string ++import gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, StringIO, pango, string + import types + import xml.sax.saxutils, pango + import exporters.exportManager +@@ -30,6 +30,11 @@ + import plugin_loader + import timeScanner + import defaults ++# Require PIL module. ++try: ++ from PIL import Image ++except ImportError: ++ import Image + + # TODO + #