switch py-Imaging to py-Pillow, plus some "s/import Image/from PIL import Image/" patches where necessary

This commit is contained in:
sthen 2014-04-06 21:10:30 +00:00
parent 8d9e5f597d
commit d424d76a23
31 changed files with 262 additions and 51 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.22 2013/09/06 18:26:50 bcallah Exp $
# $OpenBSD: Makefile,v 1.23 2014/04/06 21:10:30 sthen Exp $
SHARED_ONLY= Yes
COMMENT= flash-card tool which optimises your learning process
MODPY_EGG_VERSION=2.2.1
REVISION= 0
DISTNAME= Mnemosyne-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
CATEGORIES= games education
@ -22,7 +23,7 @@ MODPY_SETUPTOOLS=yes
RUN_DEPENDS= x11/py-qt4 \
textproc/py-xml \
graphics/py-Imaging \
graphics/py-Pillow \
graphics/py-matplotlib \
www/py-CherryPy \
devel/desktop-file-utils

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2014/01/20 17:04:36 edd Exp $
# $OpenBSD: Makefile,v 1.17 2014/04/06 21:10:30 sthen Exp $
COMMENT= powerful descriptive vector graphics language
DISTNAME= asymptote-2.24.src
PKGNAME= asymptote-2.24
CATEGORIES= graphics
REVISION = 0
REVISION = 1
HOMEPAGE= http://asymptote.sourceforge.net/
@ -21,7 +21,7 @@ WANTLIB += GL GLU c fftw3 gc glut gsl gslcblas m ncurses pthread
WANTLIB += pthread-stubs readline sigsegv stdc++ z
BUILD_DEPENDS= print/texlive/base
RUN_DEPENDS= graphics/py-Imaging \
RUN_DEPENDS= graphics/py-Pillow \
print/texlive/texmf,-full \
${MODPY_TKINTER_DEPENDS}

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2013/10/11 23:49:46 naddy Exp $
# $OpenBSD: Makefile,v 1.35 2014/04/06 21:10:30 sthen Exp $
COMMENT= gtk2 comic book viewer
DISTNAME= comix-4.0.4
REVISION= 0
REVISION= 1
CATEGORIES= graphics
@ -20,10 +20,10 @@ MODULES= lang/python \
MODGCONF2_LIBDEP= No
MODGCONF2_SCHEMAS_DIR= comix
BUILD_DEPENDS= graphics/py-Imaging \
BUILD_DEPENDS= graphics/py-Pillow \
x11/py-gtk2
RUN_DEPENDS= graphics/py-Imaging \
RUN_DEPENDS= graphics/py-Pillow \
x11/py-gtk2 \
misc/shared-mime-info \
devel/desktop-file-utils \

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-install_py,v 1.3 2009/04/15 08:26:28 landry Exp $
$OpenBSD: patch-install_py,v 1.4 2014/04/06 21:10:30 sthen Exp $
install files in the right place, and don't try to run
update-mime-database and gconftool-2, will be done in fake.
--- install.py.orig Sat Feb 14 12:09:21 2009
+++ install.py Tue Apr 7 20:33:57 2009
--- install.py.orig Sat Feb 14 11:09:21 2009
+++ install.py Sun Apr 6 18:22:10 2014
@@ -35,7 +35,8 @@ TRANSLATIONS = ('ca', 'cs', 'es', 'fr', 'hr', 'hu', 'i
# 'de', 'it', 'nl', 'el', 'fa'
@ -38,6 +38,15 @@ update-mime-database and gconftool-2, will be done in fake.
('mime/comix.xml', 'share/mime/packages'),
('mime/icons/16x16/application-x-cbz.png',
'share/icons/hicolor/16x16/mimetypes'),
@@ -240,7 +238,7 @@ def check_dependencies():
print ' !!! PyGTK .................... Not found'
required_found = False
try:
- import Image
+ from PIL import Image
assert Image.VERSION >= '1.1.5'
print ' Python Imaging Library ....... OK'
except ImportError:
@@ -304,26 +302,11 @@ if args == ['install']:
for lang in TRANSLATIONS:
install(os.path.join('messages', lang, 'LC_MESSAGES/comix.mo'),

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mime_comicthumb,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- mime/comicthumb.orig Sun Apr 6 18:22:54 2014
+++ mime/comicthumb Sun Apr 6 18:23:51 2014
@@ -22,7 +22,7 @@ import tarfile
import subprocess
try:
- import Image
+ from PIL import Image
except ImportError:
print '! Could not import the Image module (PIL).'
print __doc__

View File

@ -1,22 +1,31 @@
$OpenBSD: patch-src_comix_py,v 1.3 2013/04/29 12:57:58 gonzalo Exp $
$OpenBSD: patch-src_comix_py,v 1.4 2014/04/06 21:10:30 sthen Exp $
point python to where comix modules are installed
--- src/comix.py.orig Fri Mar 6 14:54:01 2009
+++ src/comix.py Mon Apr 15 16:27:28 2013
--- src/comix.py.orig Fri Mar 6 16:54:01 2009
+++ src/comix.py Sun Apr 6 18:23:29 2014
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!${MODPY_BIN}
"""Comix - GTK Comic Book Viewer
@@ -25,6 +25,9 @@ import os
import sys
@@ -26,6 +26,9 @@ import sys
import gettext
import getopt
+
+# add path for comix python modules
+sys.path.insert(0, '${PREFIX}/share/comix/src')
+
#Check for PyGTK and PIL dependencies.
try:
import pygtk
@@ -49,7 +52,7 @@ except ImportError:
sys.exit(1)
try:
- import Image
+ from PIL import Image
assert Image.VERSION >= '1.1.5'
except AssertionError:
print "You don't have the required version of the Python Imaging",

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_histogram_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- src/histogram.py.orig Sun Apr 6 18:22:54 2014
+++ src/histogram.py Sun Apr 6 18:23:46 2014
@@ -1,9 +1,9 @@
"""histogram.py - Draw histograms (RGB) from pixbufs."""
import gtk
-import Image
-import ImageDraw
-import ImageOps
+from PIL import Image
+from PIL import ImageDraw
+from PIL import ImageOps
import image

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_image_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- src/image.py.orig Sun Apr 6 18:22:54 2014
+++ src/image.py Sun Apr 6 18:23:23 2014
@@ -1,10 +1,10 @@
"""image.py - Various image manipulations."""
import gtk
-import Image
-import ImageEnhance
-import ImageOps
-import ImageStat
+from PIL import Image
+from PIL import ImageEnhance
+from PIL import ImageOps
+from PIL import ImageStat
from preferences import prefs

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_library_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- src/library.py.orig Sun Apr 6 18:22:54 2014
+++ src/library.py Sun Apr 6 18:23:44 2014
@@ -8,8 +8,8 @@ from xml.sax.saxutils import escape as xmlescape
import gtk
import gobject
import pango
-import Image
-import ImageDraw
+from PIL import Image
+from PIL import ImageDraw
import archive
import encoding

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_thumbbar_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- src/thumbbar.py.orig Sun Apr 6 18:22:54 2014
+++ src/thumbbar.py Sun Apr 6 18:23:36 2014
@@ -4,8 +4,8 @@ import urllib
import gtk
import gobject
-import Image
-import ImageDraw
+from PIL import Image
+from PIL import ImageDraw
import image
from preferences import prefs

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_thumbnail_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- src/thumbnail.py.orig Sun Apr 6 18:22:54 2014
+++ src/thumbnail.py Sun Apr 6 18:23:39 2014
@@ -15,7 +15,7 @@ import shutil
import tempfile
import gtk
-import Image
+from PIL import Image
import archive
import constants

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_thumbremover_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- src/thumbremover.py.orig Sun Apr 6 18:22:54 2014
+++ src/thumbremover.py Sun Apr 6 18:23:41 2014
@@ -7,7 +7,7 @@ import urllib
import gtk
import pango
-import Image
+from PIL import Image
import encoding
import labels

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.11 2013/08/07 21:32:02 naddy Exp $
# $OpenBSD: Makefile,v 1.12 2014/04/06 21:10:30 sthen Exp $
COMMENT= multimedia framework for Python
MODPY_EGG_VERSION= 1.5
DISTNAME= PyGraphics-${MODPY_EGG_VERSION}
PKGNAME= py-graphics-${MODPY_EGG_VERSION}
REVISION= 6
REVISION= 7
EPOCH= 0
CATEGORIES= graphics
@ -24,6 +24,6 @@ PKG_ARCH= *
NO_TEST= Yes
RUN_DEPENDS= ${MODPY_TKINTER_DEPENDS} \
graphics/py-Imaging
graphics/py-Pillow
.include <bsd.port.mk>

View File

@ -1,5 +1,2 @@
MD5 (PyGraphics-1.5.tar.gz) = 7P5HtuZTI9mRIFAy8e452w==
RMD160 (PyGraphics-1.5.tar.gz) = y4pR9bnEbQu8BHefWakNSfBNLw8=
SHA1 (PyGraphics-1.5.tar.gz) = nbHPCF4Ssqua1R4p/V3I3MvXNWg=
SHA256 (PyGraphics-1.5.tar.gz) = RXWBh0HjKhgpTmlPq2boC7vYIteZj3CK752UiHw511g=
SIZE (PyGraphics-1.5.tar.gz) = 11593

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-PyGraphics_picture_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- PyGraphics/picture.py.orig Sun Apr 6 19:45:44 2014
+++ PyGraphics/picture.py Sun Apr 6 19:45:58 2014
@@ -30,10 +30,10 @@
from math import sqrt
from Tkinter import *
-import Image
-import ImageDraw
-import ImageFont
-import ImageTk as imtk
+from PIL import Image
+from PIL import ImageDraw
+from PIL import ImageFont
+from PIL import ImageTk as imtk
import os
import sys
import time

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.48 2014/01/10 19:05:07 landry Exp $
# $OpenBSD: Makefile,v 1.49 2014/04/06 21:10:30 sthen Exp $
COMMENT= Python charting and plotting API
MODPY_EGG_VERSION = 1.2.1
REVISION = 0
DISTNAME = matplotlib-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = graphics devel math
@ -30,7 +31,7 @@ RUN_DEPENDS= devel/py-tz \
devel/py-dateutil \
math/py-numpy \
x11/py-gtk2 \
graphics/py-Imaging \
graphics/py-Pillow \
${MODPY_TKINTER_DEPENDS}
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= graphics/png

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2013/03/11 23:01:31 fgsch Exp $
# $OpenBSD: Makefile,v 1.18 2014/04/06 21:10:30 sthen Exp $
COMMENT = package for creating PostScript/PDF graphics
@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 0.12.1
DISTNAME = PyX-${MODPY_EGG_VERSION}
PKGNAME = py-pyx-${MODPY_EGG_VERSION}
CATEGORIES = graphics devel
REVISION = 0
REVISION = 1
HOMEPAGE = http://pyx.sourceforge.net/
@ -22,7 +22,7 @@ MODULES = lang/python
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyx/}
RUN_DEPENDS = print/texlive/base \
graphics/py-Imaging
graphics/py-Pillow
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-pyx

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-examples_bitmap_pil_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- examples/bitmap/pil.py.orig Sun Apr 6 19:53:10 2014
+++ examples/bitmap/pil.py Sun Apr 6 19:53:14 2014
@@ -1,5 +1,5 @@
from pyx import *
-import Image
+from PIL import Image
im = Image.new("RGB", (3, 1))
im.putpixel((0, 0), (255, 0, 0))

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-pyx_epsfile_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- pyx/epsfile.py.orig Sun Apr 6 19:48:19 2014
+++ pyx/epsfile.py Sun Apr 6 19:48:33 2014
@@ -345,7 +345,7 @@ class epsfile(canvasitem.canvasitem):
def processPDF(self, file, writer, context, registry, bbox):
warnings.warn("EPS file is included as a bitmap created using pipeGS")
from pyx import bitmap, canvas
- import Image
+ from PIL import Image
c = canvas.canvas()
c.insert(self)
i = Image.open(c.pipeGS(device="pngalpha", resolution=600, seekable=True))

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-pyx_mesh_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- pyx/mesh.py.orig Sun Apr 6 19:48:19 2014
+++ pyx/mesh.py Sun Apr 6 19:48:29 2014
@@ -110,7 +110,7 @@ class mesh(canvasitem.canvasitem):
def processPS(self, file, writer, context, registry, bbox):
if writer.mesh_as_bitmap:
from pyx import bitmap, canvas
- import Image
+ from PIL import Image
c = canvas.canvas()
c.insert(self)
i = Image.open(c.pipeGS("pngalpha", resolution=writer.mesh_as_bitmap_resolution, seekable=True))
@@ -140,7 +140,7 @@ class mesh(canvasitem.canvasitem):
def processPDF(self, file, writer, context, registry, bbox):
if writer.mesh_as_bitmap:
from pyx import bitmap, canvas
- import Image
+ from PIL import Image
c = canvas.canvas()
c.insert(self)
i = Image.open(c.pipeGS("pngalpha", resolution=writer.mesh_as_bitmap_resolution, seekable=True))

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.9 2013/11/03 22:04:44 landry Exp $
# $OpenBSD: Makefile.inc,v 1.10 2014/04/06 21:10:30 sthen Exp $
VERSION = 1.0.7
CATEGORIES = multimedia x11
@ -24,7 +24,7 @@ RUN_DEPENDS += audio/libgpod,-python \
devel/py-twisted/web \
devel/py-twisted/web2 \
devel/py-xdg \
graphics/py-Imaging \
graphics/py-Pillow \
graphics/py-cairo \
graphics/py-pigment \
multimedia/coherence \

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.16 2013/11/03 22:04:44 landry Exp $
# $OpenBSD: Makefile,v 1.17 2014/04/06 21:10:30 sthen Exp $
COMMENT = Moovida media center software
DISTNAME = moovida-${VERSION}
REVISION = 11
REVISION = 12
EPOCH = 0
BUILD_DEPENDS = devel/py-twisted/web

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-elisa_extern_coherence_covers_by_amazon_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- elisa/extern/coherence/covers_by_amazon.py.orig Sun Apr 6 20:13:56 2014
+++ elisa/extern/coherence/covers_by_amazon.py Sun Apr 6 20:14:02 2014
@@ -198,7 +198,7 @@ class CoverGetter(object):
if(len(convert_from) and len(convert_to)):
#print "got_image %d, convert to %s" % (len(result), convert_to)
try:
- import Image
+ from PIL import Image
im = Image.open(StringIO.StringIO(result))
name,file_ext = os.path.splitext(self.filename)

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2013/11/03 22:04:44 landry Exp $
# $OpenBSD: Makefile,v 1.15 2014/04/06 21:10:30 sthen Exp $
COMMENT = Moovida media center - bad plugins
DISTNAME = moovida-plugins-bad-${VERSION}
REVISION = 10
REVISION = 11
BUILD_DEPENDS += multimedia/moovida/core

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2013/11/03 22:04:44 landry Exp $
# $OpenBSD: Makefile,v 1.14 2014/04/06 21:10:30 sthen Exp $
COMMENT = Moovida media center - good plugins
DISTNAME = moovida-plugins-good-${VERSION}
REVISION = 10
REVISION = 11
BUILD_DEPENDS += multimedia/moovida/core

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2013/11/03 22:04:44 landry Exp $
# $OpenBSD: Makefile,v 1.14 2014/04/06 21:10:30 sthen Exp $
COMMENT = Moovida media center - ugly plugins
DISTNAME = moovida-plugins-ugly-${VERSION}
REVISION = 10
REVISION = 11
BUILD_DEPENDS += multimedia/moovida/core

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.110 2014/04/01 14:52:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.111 2014/04/06 21:10:30 sthen Exp $
SHARED_ONLY= Yes
@ -21,6 +21,7 @@ PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION= 0
REVISION-main= 1
SHARED_LIBS += hpmud 2.0 # 0.6
SHARED_LIBS += hpip 2.0 # 0.1
@ -59,7 +60,7 @@ RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
${MODGETTEXT_RUN_DEPENDS} \
print/py-reportlab/reportlab \
x11/dbus-python \
graphics/py-Imaging \
graphics/py-Pillow \
print/hplip,-hpcups \
print/hplip,-hpaio

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.22 2013/10/01 09:07:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.23 2014/04/06 21:10:30 sthen Exp $
COMMENT= PDF-generating toolkit for Python
VERSION= 2.1
DISTNAME= ReportLab_${VERSION:S/./_/}
PKGNAME= py-reportlab-${VERSION}
REVISION = 8
REVISION = 9
EPOCH= 0
CATEGORIES= print graphics
@ -25,7 +25,7 @@ EXTRACT_SUFX= .tgz
MODULES= lang/python
RUN_DEPENDS= graphics/py-Imaging
RUN_DEPENDS= graphics/py-Pillow
WRKDIST= ${WRKDIR}/reportlab_${VERSION:S/./_/}
WRKSRC= ${WRKDIST}/reportlab

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.50 2013/05/10 06:03:30 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.51 2014/04/06 21:10:30 sthen Exp $
SHARED_ONLY= Yes
COMMENT= DTP program
DISTNAME= scribus-1.4.2
REVISION= 0
CATEGORIES= print
HOMEPAGE= http://www.scribus.net/
@ -27,7 +28,7 @@ MODPY_RUNDEP= No
BUILD_DEPENDS= devel/boost
RUN_DEPENDS= devel/desktop-file-utils \
graphics/py-Imaging \
graphics/py-Pillow \
print/ghostscript/gnu \
textproc/antiword \
misc/shared-mime-info \

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-scribus_plugins_scriptplugin_scripts_FontSample_py,v 1.1 2014/04/06 21:10:30 sthen Exp $
--- scribus/plugins/scriptplugin/scripts/FontSample.py.orig Sun Apr 6 19:58:15 2014
+++ scribus/plugins/scriptplugin/scripts/FontSample.py Sun Apr 6 19:58:27 2014
@@ -154,7 +154,7 @@ if not os.path.exists(CONFIG_PATH):
try:
- import Image
+ from PIL import Image
except ImportError,err:
print 'You need to install Python Imaging Library (PIL).'
print 'If using gentoo then you need to emerge /dev-python/imaging'
@@ -164,7 +164,7 @@ except ImportError,err:
try:
- import ImageTk
+ from PIL import ImageTk
except ImportError,err:
print 'Module ImageTk not found, font preview disabled'
showPreviewPanel = 0

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.29 2014/04/06 11:32:04 sthen Exp $
# $OpenBSD: Makefile,v 1.30 2014/04/06 21:10:30 sthen Exp $
COMMENT = ebook management application
DISTNAME = calibre-1.30.0
REVISION = 0
REVISION = 1
CATEGORIES = textproc
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=calibre/}
EXTRACT_SUFX = .tar.xz
@ -34,7 +34,7 @@ COMMON_DEPENDS = databases/py-apsw \
devel/xdg-utils \
graphics/ImageMagick \
graphics/libwmf \
graphics/py-Imaging \
graphics/py-Pillow \
net/py-dnspython \
graphics/png \
print/poppler, \