[arch-commits] Commit in sk1/repos (16 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Thu Oct 10 11:32:25 UTC 2013 

    Date: Thursday, October 10, 2013 @ 13:32:25
  Author: spupykin
Revision: 98434

archrelease: copy trunk to community-i686, community-x86_64

Added:
  sk1/repos/community-i686/PKGBUILD
    (from rev 98433, sk1/trunk/PKGBUILD)
  sk1/repos/community-i686/build-fix.patch
    (from rev 98433, sk1/trunk/build-fix.patch)
  sk1/repos/community-i686/fix_pillow_import.patch
    (from rev 98433, sk1/trunk/fix_pillow_import.patch)
  sk1/repos/community-i686/sk1.desktop
    (from rev 98433, sk1/trunk/sk1.desktop)
  sk1/repos/community-x86_64/PKGBUILD
    (from rev 98433, sk1/trunk/PKGBUILD)
  sk1/repos/community-x86_64/build-fix.patch
    (from rev 98433, sk1/trunk/build-fix.patch)
  sk1/repos/community-x86_64/fix_pillow_import.patch
    (from rev 98433, sk1/trunk/fix_pillow_import.patch)
  sk1/repos/community-x86_64/sk1.desktop
    (from rev 98433, sk1/trunk/sk1.desktop)
Deleted:
  sk1/repos/community-i686/PKGBUILD
  sk1/repos/community-i686/build-fix.patch
  sk1/repos/community-i686/fix_pillow_import.patch
  sk1/repos/community-i686/sk1.desktop
  sk1/repos/community-x86_64/PKGBUILD
  sk1/repos/community-x86_64/build-fix.patch
  sk1/repos/community-x86_64/fix_pillow_import.patch
  sk1/repos/community-x86_64/sk1.desktop

------------------------------------------+
 /PKGBUILD                                |  102 +++++++++++++++++++++++++
 /build-fix.patch                         |   28 ++++++
 /fix_pillow_import.patch                 |   70 +++++++++++++++++
 /sk1.desktop                             |  118 +++++++++++++++++++++++++++++
 community-i686/PKGBUILD                  |   51 ------------
 community-i686/build-fix.patch           |   14 ---
 community-i686/fix_pillow_import.patch   |   35 --------
 community-i686/sk1.desktop               |   59 --------------
 community-x86_64/PKGBUILD                |   51 ------------
 community-x86_64/build-fix.patch         |   14 ---
 community-x86_64/fix_pillow_import.patch |   35 --------
 community-x86_64/sk1.desktop             |   59 --------------
 12 files changed, 318 insertions(+), 318 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-10-10 11:32:04 UTC (rev 98433)
+++ community-i686/PKGBUILD	2013-10-10 11:32:25 UTC (rev 98434)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: ConnorBehan <connor.behan at gmail.com>
-
-pkgname=sk1
-pkgver=0.9.1
-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' '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)
-
-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
-
-  patch -p1 <$srcdir/build-fix.patch
-  python2 setup.py install --prefix=/usr --root=$pkgdir
-
-  mkdir -p $pkgdir/usr/share/pixmaps
-  mkdir -p $pkgdir/usr/share/applications
-
-  cp $pkgdir/usr/lib/python2.7/site-packages/sk1/share/icons/CrystalSVG/icon_sk1_32.png \
-   $pkgdir/usr/share/pixmaps/sk1.png
-
-  cp $srcdir/sk1.desktop $pkgdir/usr/share/applications
-
-  mkdir $pkgdir/usr/lib/${_tcldir}
-  cp -r $pkgdir/usr/lib/python2.7/site-packages/sk1/share/ttk-themes/Plastik \
-    $pkgdir/usr/lib/${_tcldir}/Plastik
-
-  sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1
-}
-md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
-         'bbf6f10b8155838eede93b5abed724f5'
-         '4a44dd89707b19fe58f4c124ed321236'
-         'b22c3c7b6a979c0a4e59ecaa2bd2182b')

Copied: sk1/repos/community-i686/PKGBUILD (from rev 98433, sk1/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-10-10 11:32:25 UTC (rev 98434)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: ConnorBehan <connor.behan at gmail.com>
+
+pkgname=sk1
+pkgver=0.9.1
+pkgrel=12
+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')
+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)
+
+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
+
+  patch -p1 <$srcdir/build-fix.patch
+  python2 setup.py install --prefix=/usr --root=$pkgdir
+
+  mkdir -p $pkgdir/usr/share/pixmaps
+  mkdir -p $pkgdir/usr/share/applications
+
+  cp $pkgdir/usr/lib/python2.7/site-packages/sk1/share/icons/CrystalSVG/icon_sk1_32.png \
+   $pkgdir/usr/share/pixmaps/sk1.png
+
+  cp $srcdir/sk1.desktop $pkgdir/usr/share/applications
+
+  mkdir $pkgdir/usr/lib/${_tcldir}
+  cp -r $pkgdir/usr/lib/python2.7/site-packages/sk1/share/ttk-themes/Plastik \
+    $pkgdir/usr/lib/${_tcldir}/Plastik
+
+  sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1
+}
+md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
+         'bbf6f10b8155838eede93b5abed724f5'
+         '4a44dd89707b19fe58f4c124ed321236'
+         'b22c3c7b6a979c0a4e59ecaa2bd2182b')

Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch	2013-10-10 11:32:04 UTC (rev 98433)
+++ community-i686/build-fix.patch	2013-10-10 11:32:25 UTC (rev 98434)
@@ -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'

Copied: sk1/repos/community-i686/build-fix.patch (from rev 98433, sk1/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch	                        (rev 0)
+++ community-i686/build-fix.patch	2013-10-10 11:32:25 UTC (rev 98434)
@@ -0,0 +1,14 @@
+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'

Deleted: community-i686/fix_pillow_import.patch
===================================================================
--- community-i686/fix_pillow_import.patch	2013-10-10 11:32:04 UTC (rev 98433)
+++ community-i686/fix_pillow_import.patch	2013-10-10 11:32:25 UTC (rev 98434)
@@ -1,35 +0,0 @@
-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):

Copied: sk1/repos/community-i686/fix_pillow_import.patch (from rev 98433, sk1/trunk/fix_pillow_import.patch)
===================================================================
--- community-i686/fix_pillow_import.patch	                        (rev 0)
+++ community-i686/fix_pillow_import.patch	2013-10-10 11:32:25 UTC (rev 98434)
@@ -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):

Deleted: community-i686/sk1.desktop
===================================================================
--- community-i686/sk1.desktop	2013-10-10 11:32:04 UTC (rev 98433)
+++ community-i686/sk1.desktop	2013-10-10 11:32:25 UTC (rev 98434)
@@ -1,59 +0,0 @@
-
-[Desktop Entry]
-Encoding=UTF-8
-Name=sk1
-GenericName=Vector-based Drawing Program
-GenericName[af]=Vector-based Teken Program
-GenericName[bg]=ÐекÑоѬна гѬаÑиÑ!на пѬогѬама за ѬиÑýђване
-GenericName[bs]=Program za vektorsko crtanje
-GenericName[ca]=Programa de dibuix basat en els vectors
-GenericName[cs]=Vektorový kreslÃprogram
-GenericName[da]=Vektorbaseret tegneprogram
-GenericName[de]=Vektorbasiertes Zeichenprogramm
-GenericName[el]=Î ÏýÏRγÏýαμμα ÎÏ0γÏýÎ±Ï Î¹ÎºÎ®Ï ÎαϒιϒμνηÏ ϒε ÎιανÏýϒμαÏα
-GenericName[eo]=Vektor-desegnilo
-GenericName[es]=Programa de dibujo vectorial
-GenericName[et]=Vektorgraafika joonistamine
-GenericName[eu]=Marazteko Programa Bektoriala
-GenericName[fa]=بر٠اÙ&Ù!â¬RÛR رسÙ& بردارÛR
-GenericName[fi]=Vektoripohjainen piirto-ohjelma
-GenericName[fr]=Logiciel de dessin vectoriel
-GenericName[he]=ת×"×:× ×"ת צ×"×"ר ×~××"ססת ×"ק×Ü×"ר×"×ý
-GenericName[hr]=Vektorski program za crtanje
-GenericName[hu]=vektoros rajzolóprogram
-GenericName[is]=Vigrað teikniforrit
-GenericName[it]=Programma di disegno vettoriale
-GenericName[ja]=ã’"ã¯ã’Æã’«ã’0ã’¼ã¤ã’³ã°ã’ã’°ã’©ã’ 
-GenericName[lo]=à»àº:ຣà»ýàºýຣມວາàºàº~າàºaà»ýàºaàºa໬ວັàºý໬àº"ີ
-GenericName[lt]=Vektorinio paišymo programa
-GenericName[lv]=Uz Vektoriem bÄýzÄtas ZÄ«mÄÅ¡anas Programma
-GenericName[mk]=ÐекÑоѬÑýки базиѬан пѬогѬам за Ñ Ñ¬ÑаÑaе
-GenericName[mn]=ÐекÑоѬв ÑђлгђђлаÑýан зђѬгийн пѬогѬам
-GenericName[mt]=Programm biex tpinġi b'vektori
-GenericName[nb]=Vektorbasert tegneprogram
-GenericName[nl]=vector-gebaseerd tekenprogramma
-GenericName[nn]=Vektorbasert teikneprogram
-GenericName[nso]=Lenaneo lago Taka leo le Lebisitswego ka Vector
-GenericName[pl]=Wektorowy program do rysowania
-GenericName[pt]=Programa de Desenho Vectorial
-GenericName[pt_BR]=Programa de Desenho baseado em Vetor
-GenericName[ro]=Program de desenare vectorialÄ’
-GenericName[ru]=ÐxѬогѬамма векÑоѬной гѬаÑики
-GenericName[se]=VektorvuoÄÄoduvvon sárgonprográmma
-GenericName[sk]=Vektorový kresliaci program
-GenericName[sl]=Program za vektorsko risanje
-GenericName[sv]=Vektorbaserat ritprogram
-GenericName[th]=à¹à¸:รà¹ýà¸ýรมวาà¸ภาà¸~à¹ýà¸aà¸a๬วà¸ý๬à¸"ุ£à¹R
-GenericName[tr]=Vektor Tabanlı Ã!izim Programı
-GenericName[uk]=ÐxѬогѬама ÑýÑвоѬеннÑý векÑоѬниÑ& зобѬаженÑR
-GenericName[ven]=Mbekanyamushumo yo olwaho sa Vekitha
-GenericName[vi]=Trình vẽ kiỒu Vector
-GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo
-GenericName[zh_CN]=çx¢é!ýç»Üå:¾ç¨9åºý
-GenericName[zh_TW]=åýé!ý繪åSç¨9å¼ý
-GenericName[zu]=Uhlelo lwemisebenzi olusekelwe kwi-Vector
-Exec=/usr/bin/sk1
-Categories=Application;Graphics;
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/sk1.png

Copied: sk1/repos/community-i686/sk1.desktop (from rev 98433, sk1/trunk/sk1.desktop)
===================================================================
--- community-i686/sk1.desktop	                        (rev 0)
+++ community-i686/sk1.desktop	2013-10-10 11:32:25 UTC (rev 98434)
@@ -0,0 +1,59 @@
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=sk1
+GenericName=Vector-based Drawing Program
+GenericName[af]=Vector-based Teken Program
+GenericName[bg]=ÐекÑоѬна гѬаÑиÑ!на пѬогѬама за ѬиÑýђване
+GenericName[bs]=Program za vektorsko crtanje
+GenericName[ca]=Programa de dibuix basat en els vectors
+GenericName[cs]=Vektorový kreslÃprogram
+GenericName[da]=Vektorbaseret tegneprogram
+GenericName[de]=Vektorbasiertes Zeichenprogramm
+GenericName[el]=Î ÏýÏRγÏýαμμα ÎÏ0γÏýÎ±Ï Î¹ÎºÎ®Ï ÎαϒιϒμνηÏ ϒε ÎιανÏýϒμαÏα
+GenericName[eo]=Vektor-desegnilo
+GenericName[es]=Programa de dibujo vectorial
+GenericName[et]=Vektorgraafika joonistamine
+GenericName[eu]=Marazteko Programa Bektoriala
+GenericName[fa]=بر٠اÙ&Ù!â¬RÛR رسÙ& بردارÛR
+GenericName[fi]=Vektoripohjainen piirto-ohjelma
+GenericName[fr]=Logiciel de dessin vectoriel
+GenericName[he]=ת×"×:× ×"ת צ×"×"ר ×~××"ססת ×"ק×Ü×"ר×"×ý
+GenericName[hr]=Vektorski program za crtanje
+GenericName[hu]=vektoros rajzolóprogram
+GenericName[is]=Vigrað teikniforrit
+GenericName[it]=Programma di disegno vettoriale
+GenericName[ja]=ã’"ã¯ã’Æã’«ã’0ã’¼ã¤ã’³ã°ã’ã’°ã’©ã’ 
+GenericName[lo]=à»àº:ຣà»ýàºýຣມວາàºàº~າàºaà»ýàºaàºa໬ວັàºý໬àº"ີ
+GenericName[lt]=Vektorinio paišymo programa
+GenericName[lv]=Uz Vektoriem bÄýzÄtas ZÄ«mÄÅ¡anas Programma
+GenericName[mk]=ÐекÑоѬÑýки базиѬан пѬогѬам за Ñ Ñ¬ÑаÑaе
+GenericName[mn]=ÐекÑоѬв ÑђлгђђлаÑýан зђѬгийн пѬогѬам
+GenericName[mt]=Programm biex tpinġi b'vektori
+GenericName[nb]=Vektorbasert tegneprogram
+GenericName[nl]=vector-gebaseerd tekenprogramma
+GenericName[nn]=Vektorbasert teikneprogram
+GenericName[nso]=Lenaneo lago Taka leo le Lebisitswego ka Vector
+GenericName[pl]=Wektorowy program do rysowania
+GenericName[pt]=Programa de Desenho Vectorial
+GenericName[pt_BR]=Programa de Desenho baseado em Vetor
+GenericName[ro]=Program de desenare vectorialÄ’
+GenericName[ru]=ÐxѬогѬамма векÑоѬной гѬаÑики
+GenericName[se]=VektorvuoÄÄoduvvon sárgonprográmma
+GenericName[sk]=Vektorový kresliaci program
+GenericName[sl]=Program za vektorsko risanje
+GenericName[sv]=Vektorbaserat ritprogram
+GenericName[th]=à¹à¸:รà¹ýà¸ýรมวาà¸ภาà¸~à¹ýà¸aà¸a๬วà¸ý๬à¸"ุ£à¹R
+GenericName[tr]=Vektor Tabanlı Ã!izim Programı
+GenericName[uk]=ÐxѬогѬама ÑýÑвоѬеннÑý векÑоѬниÑ& зобѬаженÑR
+GenericName[ven]=Mbekanyamushumo yo olwaho sa Vekitha
+GenericName[vi]=Trình vẽ kiỒu Vector
+GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo
+GenericName[zh_CN]=çx¢é!ýç»Üå:¾ç¨9åºý
+GenericName[zh_TW]=åýé!ý繪åSç¨9å¼ý
+GenericName[zu]=Uhlelo lwemisebenzi olusekelwe kwi-Vector
+Exec=/usr/bin/sk1
+Categories=Application;Graphics;
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/sk1.png

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-10-10 11:32:04 UTC (rev 98433)
+++ community-x86_64/PKGBUILD	2013-10-10 11:32:25 UTC (rev 98434)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: ConnorBehan <connor.behan at gmail.com>
-
-pkgname=sk1
-pkgver=0.9.1
-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' '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)
-
-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
-
-  patch -p1 <$srcdir/build-fix.patch
-  python2 setup.py install --prefix=/usr --root=$pkgdir
-
-  mkdir -p $pkgdir/usr/share/pixmaps
-  mkdir -p $pkgdir/usr/share/applications
-
-  cp $pkgdir/usr/lib/python2.7/site-packages/sk1/share/icons/CrystalSVG/icon_sk1_32.png \
-   $pkgdir/usr/share/pixmaps/sk1.png
-
-  cp $srcdir/sk1.desktop $pkgdir/usr/share/applications
-
-  mkdir $pkgdir/usr/lib/${_tcldir}
-  cp -r $pkgdir/usr/lib/python2.7/site-packages/sk1/share/ttk-themes/Plastik \
-    $pkgdir/usr/lib/${_tcldir}/Plastik
-
-  sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1
-}
-md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
-         'bbf6f10b8155838eede93b5abed724f5'
-         '4a44dd89707b19fe58f4c124ed321236'
-         'b22c3c7b6a979c0a4e59ecaa2bd2182b')

Copied: sk1/repos/community-x86_64/PKGBUILD (from rev 98433, sk1/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-10-10 11:32:25 UTC (rev 98434)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: ConnorBehan <connor.behan at gmail.com>
+
+pkgname=sk1
+pkgver=0.9.1
+pkgrel=12
+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')
+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)
+
+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
+
+  patch -p1 <$srcdir/build-fix.patch
+  python2 setup.py install --prefix=/usr --root=$pkgdir
+
+  mkdir -p $pkgdir/usr/share/pixmaps
+  mkdir -p $pkgdir/usr/share/applications
+
+  cp $pkgdir/usr/lib/python2.7/site-packages/sk1/share/icons/CrystalSVG/icon_sk1_32.png \
+   $pkgdir/usr/share/pixmaps/sk1.png
+
+  cp $srcdir/sk1.desktop $pkgdir/usr/share/applications
+
+  mkdir $pkgdir/usr/lib/${_tcldir}
+  cp -r $pkgdir/usr/lib/python2.7/site-packages/sk1/share/ttk-themes/Plastik \
+    $pkgdir/usr/lib/${_tcldir}/Plastik
+
+  sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1
+}
+md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
+         'bbf6f10b8155838eede93b5abed724f5'
+         '4a44dd89707b19fe58f4c124ed321236'
+         'b22c3c7b6a979c0a4e59ecaa2bd2182b')

Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch	2013-10-10 11:32:04 UTC (rev 98433)
+++ community-x86_64/build-fix.patch	2013-10-10 11:32:25 UTC (rev 98434)
@@ -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'

Copied: sk1/repos/community-x86_64/build-fix.patch (from rev 98433, sk1/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch	                        (rev 0)
+++ community-x86_64/build-fix.patch	2013-10-10 11:32:25 UTC (rev 98434)
@@ -0,0 +1,14 @@
+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'

Deleted: community-x86_64/fix_pillow_import.patch
===================================================================
--- community-x86_64/fix_pillow_import.patch	2013-10-10 11:32:04 UTC (rev 98433)
+++ community-x86_64/fix_pillow_import.patch	2013-10-10 11:32:25 UTC (rev 98434)
@@ -1,35 +0,0 @@
-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):

Copied: sk1/repos/community-x86_64/fix_pillow_import.patch (from rev 98433, sk1/trunk/fix_pillow_import.patch)
===================================================================
--- community-x86_64/fix_pillow_import.patch	                        (rev 0)
+++ community-x86_64/fix_pillow_import.patch	2013-10-10 11:32:25 UTC (rev 98434)
@@ -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):

Deleted: community-x86_64/sk1.desktop
===================================================================
--- community-x86_64/sk1.desktop	2013-10-10 11:32:04 UTC (rev 98433)
+++ community-x86_64/sk1.desktop	2013-10-10 11:32:25 UTC (rev 98434)
@@ -1,59 +0,0 @@
-
-[Desktop Entry]
-Encoding=UTF-8
-Name=sk1
-GenericName=Vector-based Drawing Program
-GenericName[af]=Vector-based Teken Program
-GenericName[bg]=ÐекÑоѬна гѬаÑиÑ!на пѬогѬама за ѬиÑýђване
-GenericName[bs]=Program za vektorsko crtanje
-GenericName[ca]=Programa de dibuix basat en els vectors
-GenericName[cs]=Vektorový kreslÃprogram
-GenericName[da]=Vektorbaseret tegneprogram
-GenericName[de]=Vektorbasiertes Zeichenprogramm
-GenericName[el]=Î ÏýÏRγÏýαμμα ÎÏ0γÏýÎ±Ï Î¹ÎºÎ®Ï ÎαϒιϒμνηÏ ϒε ÎιανÏýϒμαÏα
-GenericName[eo]=Vektor-desegnilo
-GenericName[es]=Programa de dibujo vectorial
-GenericName[et]=Vektorgraafika joonistamine
-GenericName[eu]=Marazteko Programa Bektoriala
-GenericName[fa]=بر٠اÙ&Ù!â¬RÛR رسÙ& بردارÛR
-GenericName[fi]=Vektoripohjainen piirto-ohjelma
-GenericName[fr]=Logiciel de dessin vectoriel
-GenericName[he]=ת×"×:× ×"ת צ×"×"ר ×~××"ססת ×"ק×Ü×"ר×"×ý
-GenericName[hr]=Vektorski program za crtanje
-GenericName[hu]=vektoros rajzolóprogram
-GenericName[is]=Vigrað teikniforrit
-GenericName[it]=Programma di disegno vettoriale
-GenericName[ja]=ã’"ã¯ã’Æã’«ã’0ã’¼ã¤ã’³ã°ã’ã’°ã’©ã’ 
-GenericName[lo]=à»àº:ຣà»ýàºýຣມວາàºàº~າàºaà»ýàºaàºa໬ວັàºý໬àº"ີ
-GenericName[lt]=Vektorinio paišymo programa
-GenericName[lv]=Uz Vektoriem bÄýzÄtas ZÄ«mÄÅ¡anas Programma
-GenericName[mk]=ÐекÑоѬÑýки базиѬан пѬогѬам за Ñ Ñ¬ÑаÑaе
-GenericName[mn]=ÐекÑоѬв ÑђлгђђлаÑýан зђѬгийн пѬогѬам
-GenericName[mt]=Programm biex tpinġi b'vektori
-GenericName[nb]=Vektorbasert tegneprogram
-GenericName[nl]=vector-gebaseerd tekenprogramma
-GenericName[nn]=Vektorbasert teikneprogram
-GenericName[nso]=Lenaneo lago Taka leo le Lebisitswego ka Vector
-GenericName[pl]=Wektorowy program do rysowania
-GenericName[pt]=Programa de Desenho Vectorial
-GenericName[pt_BR]=Programa de Desenho baseado em Vetor
-GenericName[ro]=Program de desenare vectorialÄ’
-GenericName[ru]=ÐxѬогѬамма векÑоѬной гѬаÑики
-GenericName[se]=VektorvuoÄÄoduvvon sárgonprográmma
-GenericName[sk]=Vektorový kresliaci program
-GenericName[sl]=Program za vektorsko risanje
-GenericName[sv]=Vektorbaserat ritprogram
-GenericName[th]=à¹à¸:รà¹ýà¸ýรมวาà¸ภาà¸~à¹ýà¸aà¸a๬วà¸ý๬à¸"ุ£à¹R
-GenericName[tr]=Vektor Tabanlı Ã!izim Programı
-GenericName[uk]=ÐxѬогѬама ÑýÑвоѬеннÑý векÑоѬниÑ& зобѬаженÑR
-GenericName[ven]=Mbekanyamushumo yo olwaho sa Vekitha
-GenericName[vi]=Trình vẽ kiỒu Vector
-GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo
-GenericName[zh_CN]=çx¢é!ýç»Üå:¾ç¨9åºý
-GenericName[zh_TW]=åýé!ý繪åSç¨9å¼ý
-GenericName[zu]=Uhlelo lwemisebenzi olusekelwe kwi-Vector
-Exec=/usr/bin/sk1
-Categories=Application;Graphics;
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/sk1.png

Copied: sk1/repos/community-x86_64/sk1.desktop (from rev 98433, sk1/trunk/sk1.desktop)
===================================================================
--- community-x86_64/sk1.desktop	                        (rev 0)
+++ community-x86_64/sk1.desktop	2013-10-10 11:32:25 UTC (rev 98434)
@@ -0,0 +1,59 @@
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=sk1
+GenericName=Vector-based Drawing Program
+GenericName[af]=Vector-based Teken Program
+GenericName[bg]=ÐекÑоѬна гѬаÑиÑ!на пѬогѬама за ѬиÑýђване
+GenericName[bs]=Program za vektorsko crtanje
+GenericName[ca]=Programa de dibuix basat en els vectors
+GenericName[cs]=Vektorový kreslÃprogram
+GenericName[da]=Vektorbaseret tegneprogram
+GenericName[de]=Vektorbasiertes Zeichenprogramm
+GenericName[el]=Î ÏýÏRγÏýαμμα ÎÏ0γÏýÎ±Ï Î¹ÎºÎ®Ï ÎαϒιϒμνηÏ ϒε ÎιανÏýϒμαÏα
+GenericName[eo]=Vektor-desegnilo
+GenericName[es]=Programa de dibujo vectorial
+GenericName[et]=Vektorgraafika joonistamine
+GenericName[eu]=Marazteko Programa Bektoriala
+GenericName[fa]=بر٠اÙ&Ù!â¬RÛR رسÙ& بردارÛR
+GenericName[fi]=Vektoripohjainen piirto-ohjelma
+GenericName[fr]=Logiciel de dessin vectoriel
+GenericName[he]=ת×"×:× ×"ת צ×"×"ר ×~××"ססת ×"ק×Ü×"ר×"×ý
+GenericName[hr]=Vektorski program za crtanje
+GenericName[hu]=vektoros rajzolóprogram
+GenericName[is]=Vigrað teikniforrit
+GenericName[it]=Programma di disegno vettoriale
+GenericName[ja]=ã’"ã¯ã’Æã’«ã’0ã’¼ã¤ã’³ã°ã’ã’°ã’©ã’ 
+GenericName[lo]=à»àº:ຣà»ýàºýຣມວາàºàº~າàºaà»ýàºaàºa໬ວັàºý໬àº"ີ
+GenericName[lt]=Vektorinio paišymo programa
+GenericName[lv]=Uz Vektoriem bÄýzÄtas ZÄ«mÄÅ¡anas Programma
+GenericName[mk]=ÐекÑоѬÑýки базиѬан пѬогѬам за Ñ Ñ¬ÑаÑaе
+GenericName[mn]=ÐекÑоѬв ÑђлгђђлаÑýан зђѬгийн пѬогѬам
+GenericName[mt]=Programm biex tpinġi b'vektori
+GenericName[nb]=Vektorbasert tegneprogram
+GenericName[nl]=vector-gebaseerd tekenprogramma
+GenericName[nn]=Vektorbasert teikneprogram
+GenericName[nso]=Lenaneo lago Taka leo le Lebisitswego ka Vector
+GenericName[pl]=Wektorowy program do rysowania
+GenericName[pt]=Programa de Desenho Vectorial
+GenericName[pt_BR]=Programa de Desenho baseado em Vetor
+GenericName[ro]=Program de desenare vectorialÄ’
+GenericName[ru]=ÐxѬогѬамма векÑоѬной гѬаÑики
+GenericName[se]=VektorvuoÄÄoduvvon sárgonprográmma
+GenericName[sk]=Vektorový kresliaci program
+GenericName[sl]=Program za vektorsko risanje
+GenericName[sv]=Vektorbaserat ritprogram
+GenericName[th]=à¹à¸:รà¹ýà¸ýรมวาà¸ภาà¸~à¹ýà¸aà¸a๬วà¸ý๬à¸"ุ£à¹R
+GenericName[tr]=Vektor Tabanlı Ã!izim Programı
+GenericName[uk]=ÐxѬогѬама ÑýÑвоѬеннÑý векÑоѬниÑ& зобѬаженÑR
+GenericName[ven]=Mbekanyamushumo yo olwaho sa Vekitha
+GenericName[vi]=Trình vẽ kiỒu Vector
+GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo
+GenericName[zh_CN]=çx¢é!ýç»Üå:¾ç¨9åºý
+GenericName[zh_TW]=åýé!ý繪åSç¨9å¼ý
+GenericName[zu]=Uhlelo lwemisebenzi olusekelwe kwi-Vector
+Exec=/usr/bin/sk1
+Categories=Application;Graphics;
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/sk1.png

More information about the arch-commits mailing list