diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-25 13:34:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-25 13:34:49 +0100 |
commit | 416f65d4b97ff26629ddfa1b40ea2041c3e75358 (patch) | |
tree | 61e28b785eb3aa9e55ea269e170277b3d3b6e1fa /community/sk1 | |
parent | b14277452871db749ef4faa7db7e69bfce39f1a7 (diff) | |
parent | 6fbdd2899f39266e458531dcffefb85b9ce8d1b9 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libnewt/PKGBUILD
community/luasec/PKGBUILD
extra/expect/PKGBUILD
extra/fribidi/PKGBUILD
extra/goffice/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
Diffstat (limited to 'community/sk1')
-rw-r--r-- | community/sk1/PKGBUILD | 8 | ||||
-rw-r--r-- | community/sk1/build-fix.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index 4e84fe2d1..64b1b7032 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 78374 2012-10-17 15:45:43Z spupykin $ +# $Id: PKGBUILD 81608 2012-12-25 00:34:13Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=8 +pkgrel=9 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64 'mips64el') url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl>=7.6' 'tk>=4.2' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl' 'tk' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop build-fix.patch) md5sums=('43b82fd85049b078dcf98e9dd81fdc6a' 'bbf6f10b8155838eede93b5abed724f5' - 'de144f0193cf1cd61771ce7bc782dba2') + 'b22c3c7b6a979c0a4e59ecaa2bd2182b') build() { local _tclver=`pacman -Q tcl` diff --git a/community/sk1/build-fix.patch b/community/sk1/build-fix.patch index 37bc8e135..caf3369ee 100644 --- a/community/sk1/build-fix.patch +++ b/community/sk1/build-fix.patch @@ -8,7 +8,7 @@ diff -wbBur sK1-0.9.1pre/setup.py sK1-0.9.1pre.my/setup.py - tcl_include_dirs = [] - tcl_ver='' + tcl_include_dirs = ['/usr/include'] -+ tcl_ver='8.5' ++ tcl_ver='8.6' if os.path.isdir('/usr/include/tcl8.5'): tcl_include_dirs = ['/usr/include/tcl8.5'] tcl_ver ='8.5' |