diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-01 03:07:25 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-01 03:07:25 -0700 |
| commit | a1792bae6f21dd0cca9e5a0d5cfad55edc1c4955 (patch) | |
| tree | 1c6225df5977b18e7eb68340f773a18bd26dc500 /community/sk1 | |
| parent | a1ba981700ea6943bedc5d7bb769b1f893088c7f (diff) | |
Tue Oct 1 03:05:59 PDT 2013
Diffstat (limited to 'community/sk1')
| -rw-r--r-- | community/sk1/PKGBUILD | 19 | ||||
| -rw-r--r-- | community/sk1/fix_pillow_import.patch | 35 |
2 files changed, 47 insertions, 7 deletions
diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index ce9d43be2..cdba8f23c 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 81608 2012-12-25 00:34:13Z foutrelis $ +# $Id: PKGBUILD 97887 2013-09-30 13:21:30Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=9 +pkgrel=11 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64) url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl' 'tk' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'pyxml' 'zenity' 'sk1libs') 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') -build() { +package() { local _tclver=`pacman -Q tcl` local _tclnum=${tclver:4:3} local _tcldir='tcl'${tclnum} 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 @@ build() { sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1 } +md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' + 'bbf6f10b8155838eede93b5abed724f5' + '4a44dd89707b19fe58f4c124ed321236' + 'b22c3c7b6a979c0a4e59ecaa2bd2182b') diff --git a/community/sk1/fix_pillow_import.patch b/community/sk1/fix_pillow_import.patch new file mode 100644 index 000000000..7306dd3b6 --- /dev/null +++ b/community/sk1/fix_pillow_import.patch @@ -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): |