Date: Sunday, September 22, 2013 @ 13:22:38 Author: jelle Revision: 97494
upgpkg: sk1 0.9.1-10 Replace PIL with Pillow Added: sk1/trunk/fix_pillow_import.patch Modified: sk1/trunk/PKGBUILD -------------------------+ PKGBUILD | 13 +++++++++---- fix_pillow_import.patch | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-09-22 08:18:07 UTC (rev 97493) +++ PKGBUILD 2013-09-22 11:22:38 UTC (rev 97494) @@ -4,7 +4,7 @@ pkgname=sk1 pkgver=0.9.1 -pkgrel=9 +pkgrel=10 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64) url="http://sk1project.org/modules.php?name=Products&product=sk1"; @@ -12,10 +12,8 @@ license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop + fix_pillow_import.patch build-fix.patch) -md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' - 'bbf6f10b8155838eede93b5abed724f5' - 'b22c3c7b6a979c0a4e59ecaa2bd2182b') package() { local _tclver=`pacman -Q tcl` @@ -24,6 +22,9 @@ cd $srcdir/sK1-${pkgver}pre + # pillow import fix + patch -Np1 -i $srcdir/fix_pillow_import.patch + # python2 fix sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py @@ -44,3 +45,7 @@ sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1 } +md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' + 'bbf6f10b8155838eede93b5abed724f5' + '4a44dd89707b19fe58f4c124ed321236' + 'b22c3c7b6a979c0a4e59ecaa2bd2182b') Added: fix_pillow_import.patch =================================================================== --- fix_pillow_import.patch (rev 0) +++ fix_pillow_import.patch 2013-09-22 11:22:38 UTC (rev 97494) @@ -0,0 +1,35 @@ +diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py +--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py 2009-07-16 23:26:15.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py 2013-09-22 09:52:26.543457833 +0000 +@@ -24,7 +24,7 @@ + + import tooltips + +-import Image, ImageTk, ImageDraw ++from PIL import Image, ImageTk, ImageDraw + + DEFAULT_WIDTH=0.283286 + DEFAULT_CORNER=const.JoinMiter +diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py +--- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py 2009-05-15 22:11:39.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py 2013-09-22 09:52:13.216885815 +0000 +@@ -24,7 +24,7 @@ + + import tooltips + +-import Image, ImageTk, ImageDraw ++from PIL import Image, ImageTk, ImageDraw + + DEFAULT_WIDTH=0.283286 + DEFAULT_CORNER=const.JoinMiter +diff -aur sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py +--- sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py 2009-04-30 02:58:41.000000000 +0000 ++++ sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py 2013-09-22 09:52:38.150044124 +0000 +@@ -8,7 +8,7 @@ + # The color sample size is 31x20 px + + from Ttk import TButton +-import Image, ImageTk ++from PIL import Image, ImageTk + + class TColorButton(TButton):
