[arch-commits] Commit in sk1/trunk (PKGBUILD build-fix.patch)

[Sergej Pupykin]

    Date: Monday, December 8, 2014 @ 13:18:14
  Author: spupykin
Revision: 123646

upgpkg: sk1 0.9.2-1

upd

Modified:
  sk1/trunk/PKGBUILD
Deleted:
  sk1/trunk/build-fix.patch

-----------------+
 PKGBUILD        |   24 +++++++++++-------------
 build-fix.patch |   14 --------------
 2 files changed, 11 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-08 12:01:51 UTC (rev 123645)
+++ PKGBUILD	2014-12-08 12:18:14 UTC (rev 123646)
@@ -3,25 +3,23 @@
 # Contributor: ConnorBehan <connor.behan at gmail.com>
 
 pkgname=sk1
-pkgver=0.9.1
-pkgrel=13
+pkgver=0.9.2
+pkgrel=1
 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' 'python2-pillow' 'zenity' 'sk1libs' 'sk1sdk')
+depends=('tcl' 'tk' 'zenity' 'sk1libs' 'sk1sdk'
+	 'python2-cairo' 'python2-lcms' 'python2-pillow')
 license=('GPL' 'LGPL')
-source=(https://sk1.googlecode.com/files/sk1-${pkgver}pre2_rev1383.tar.gz
-	build-fix.patch)
-md5sums=('ce8a98e99e133b215b7ed67d6b0e0113'
-         'b22c3c7b6a979c0a4e59ecaa2bd2182b')
+source=(http://downloads.sourceforge.net/project/sk1/sk1/sK1_v.$pkgver/sk1-$pkgver.tar.gz)
+md5sums=('60d505332b99c569204249e0b3b434c4')
 
-prepare() {
-  cd $srcdir/sk1-${pkgver}pre2
-  sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/{__init__.py,sk1}
-  patch -p1 <$srcdir/build-fix.patch
+build() {
+  cd $srcdir/sk1-${pkgver}
+  python2 setup.py build
 }
 
 package() {
-  cd $srcdir/sk1-${pkgver}pre2
-  python2 setup.py install --prefix=/usr --root=$pkgdir
+  cd $srcdir/sk1-${pkgver}
+  python2 setup.py install --root=$pkgdir
 }

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2014-12-08 12:01:51 UTC (rev 123645)
+++ build-fix.patch	2014-12-08 12:18:14 UTC (rev 123646)
@@ -1,14 +0,0 @@
-diff -wbBur sK1-0.9.1pre/setup.py sK1-0.9.1pre.my/setup.py
---- sK1-0.9.1pre/setup.py	2010-01-10 06:24:54.000000000 +0000
-+++ sK1-0.9.1pre.my/setup.py	2010-02-24 21:19:02.000000000 +0000
-@@ -149,8 +149,8 @@
- 					filter_src+'stringfilter.c', filter_src+'binfile.c', filter_src+'hexfilter.c'])
- 	
- 	#Fix for Debian based distros
--	tcl_include_dirs = []
--	tcl_ver=''
-+	tcl_include_dirs = ['/usr/include']
-+	tcl_ver='8.6'
- 	if os.path.isdir('/usr/include/tcl8.5'):
- 		tcl_include_dirs = ['/usr/include/tcl8.5']
- 		tcl_ver ='8.5'