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

[Balló György via arch-commits]

Date: Monday, April 16, 2018 @ 15:52:11
  Author: bgyorgy
Revision: 316526

upgpkg: sk1 1:2.0rc3-1

Update to new version

Modified:
  sk1/trunk/PKGBUILD
Deleted:
  sk1/trunk/imagemagick7.patch

+
 PKGBUILD   |   20 ++
 imagemagick7.patch |  158 ---
 2 files changed, 7 insertions(+), 171 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-16 15:46:26 UTC (rev 316525)
+++ PKGBUILD2018-04-16 15:52:11 UTC (rev 316526)
@@ -1,27 +1,20 @@
 # $Id$
+# Maintainer: Balló György 
 # Contributor: Sergej Pupykin 
 # Contributor: ConnorBehan 
 
 pkgname=sk1
-pkgver=2.0rc2
-pkgrel=2
+pkgver=2.0rc3
+pkgrel=1
 epoch=1
 pkgdesc="Professional quality illustration program"
 arch=(x86_64)
 url="https://sk1project.net/;
-depends=('lcms2' 'libmagick' 'python2-cairo' 'python2-pillow' 'python2-pycups' 
'python2-reportlab' 'wxpython')
+depends=('lcms2' 'libmagick' 'python2-cairo' 'python2-pillow' 'python2-pycups' 
'python2-reportlab' 'python2-wxpython3')
 license=('GPL3')
-source=("https://downloads.sk1project.net/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz;
-"imagemagick7.patch")
-sha256sums=('ee1f03e6705e2063d0a1f032e475b24868c68fc26410fb1f2a536d3541b88a67'
-'d70fe3ffe32fa0c8ec8bee587b56e5cb08a0981a4bbbe92964bb057b83885c5b')
+source=("https://downloads.sk1project.net/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz;)
+sha256sums=('d3b94131794d42d7c80c678e11a28a8e6a50401af4a35e42ed534d02b14abdff')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # Port to ImageMagick 7
-  patch -Np1 -i ../imagemagick7.patch
-}
-
 build() {
   cd $pkgname-$pkgver
   python2 setup-sk1.py build
@@ -30,4 +23,5 @@
 package() {
   cd $pkgname-$pkgver
   python2 setup-sk1.py install --root="$pkgdir" --optimize=1
+  find "$pkgdir"/usr/{lib,share} -type f | xargs chmod 644
 }

Deleted: imagemagick7.patch
===
--- imagemagick7.patch  2018-04-16 15:46:26 UTC (rev 316525)
+++ imagemagick7.patch  2018-04-16 15:52:11 UTC (rev 316526)
@@ -1,158 +0,0 @@
-diff -Naur sk1-2.0rc2.orig/src/uc2/libimg/_libimg.c 
sk1-2.0rc2/src/uc2/libimg/_libimg.c
 sk1-2.0rc2.orig/src/uc2/libimg/_libimg.c   2016-10-09 12:40:45.0 
+0200
-+++ sk1-2.0rc2/src/uc2/libimg/_libimg.c2018-01-29 11:47:58.377663808 
+0100
-@@ -17,7 +17,7 @@
-  */
- 
- #include 
--#include 
-+#include 
- 
- static PyObject *
- im_InitMagick(PyObject *self, PyObject *args) {
-@@ -199,15 +199,15 @@
- //  UndefinedType,
- //  BilevelType,
- //  GrayscaleType,
--//  GrayscaleMatteType,
-+//  GrayscaleAlphaType,
- //  PaletteType,
--//  PaletteMatteType,
-+//  PaletteAlphaType,
- //  TrueColorType,
--//  TrueColorMatteType,
-+//  TrueColorAlphaType,
- //  ColorSeparationType,
--//  ColorSeparationMatteType,
-+//  ColorSeparationAlphaType,
- //  OptimizeType,
--//  PaletteBilevelMatteType
-+//  PaletteBilevelAlphaType
- 
- static PyObject *
- im_GetImageType(PyObject *self, PyObject *args) {
-@@ -230,32 +230,32 @@
-   else if (img_type == GrayscaleType){
-   return Py_BuildValue("s", "GrayscaleType");
-   }
--  else if (img_type == GrayscaleMatteType){
--  return Py_BuildValue("s", "GrayscaleMatteType");
-+  else if (img_type == GrayscaleAlphaType){
-+  return Py_BuildValue("s", "GrayscaleAlphaType");
-   }
-   else if (img_type == PaletteType){
-   return Py_BuildValue("s", "PaletteType");
-   }
--  else if (img_type == PaletteMatteType){
--  return Py_BuildValue("s", "PaletteMatteType");
-+  else if (img_type == PaletteAlphaType){
-+  return Py_BuildValue("s", "PaletteAlphaType");
-   }
-   else if (img_type == TrueColorType){
-   return Py_BuildValue("s", "TrueColorType");
-   }
--  else if (img_type == TrueColorMatteType){
--  return Py_BuildValue("s", "TrueColorMatteType");
-+  else if (img_type == TrueColorAlphaType){
-+  return Py_BuildValue("s", "TrueColorAlphaType");
-   }
-   else if (img_type == ColorSeparationType){
-   return Py_BuildValue("s", "ColorSeparationType");
-   }
--  else if (img_type == ColorSeparationMatteType){
--  return Py_BuildValue("s", "ColorSeparationMatteType");
-+  else if (img_type == ColorSeparationAlphaType){
-+  return Py_BuildValue("s", "ColorSeparationAlphaType");
-   }
-   else if (img_type == OptimizeType){
-   return Py_BuildValue("s", "OptimizeType");
-   }
--  else if (img_type == PaletteBilevelMatteType){
--  return Py_BuildValue("s", "PaletteBilevelMatteType");
-+  else if (img_type == PaletteBilevelAlphaType){
-+

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

[Balló György via arch-commits]

Date: Monday, January 29, 2018 @ 11:22:39
  Author: bgyorgy
Revision: 287755

upgpkg: sk1 1:2.0rc2-2

Port to ImageMagick 7, fix dependencies

Added:
  sk1/trunk/imagemagick7.patch
Modified:
  sk1/trunk/PKGBUILD

+
 PKGBUILD   |   29 +
 imagemagick7.patch |  158 +++
 2 files changed, 175 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-29 11:02:31 UTC (rev 287754)
+++ PKGBUILD2018-01-29 11:22:39 UTC (rev 287755)
@@ -1,28 +1,33 @@
 # $Id$
-# Maintainer: Sergej Pupykin 
+# Contributor: Sergej Pupykin 
 # Contributor: ConnorBehan 
 
 pkgname=sk1
 pkgver=2.0rc2
-pkgrel=1
+pkgrel=2
 epoch=1
-pkgdesc="Fork of skencil with improved CMYK support"
+pkgdesc="Professional quality illustration program"
 arch=(x86_64)
-url="http://sk1project.net/;
-depends=('zenity' 'python2-cairo' 'python2-lcms' 'python2-pillow'
-'libmagick6' 'python2-reportlab' 'wxpython')
-provides=('sk1sdk')
-license=('GPL' 'LGPL')
-source=("$pkgname-$pkgver.tar.gz::https://sk1project.net/dc3.php?version=$pkgver=sk1-$pkgver.tar.gz;)
-sha256sums=('ee1f03e6705e2063d0a1f032e475b24868c68fc26410fb1f2a536d3541b88a67')
+url="https://sk1project.net/;
+depends=('lcms2' 'libmagick' 'python2-cairo' 'python2-pillow' 'python2-pycups' 
'python2-reportlab' 'wxpython')
+license=('GPL3')
+source=("https://downloads.sk1project.net/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz;
+"imagemagick7.patch")
+sha256sums=('ee1f03e6705e2063d0a1f032e475b24868c68fc26410fb1f2a536d3541b88a67'
+'d70fe3ffe32fa0c8ec8bee587b56e5cb08a0981a4bbbe92964bb057b83885c5b')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Port to ImageMagick 7
+  patch -Np1 -i ../imagemagick7.patch
+}
+
 build() {
   cd $pkgname-$pkgver
-  export PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig"
   python2 setup-sk1.py build
 }
 
 package() {
   cd $pkgname-$pkgver
-  python2 setup-sk1.py install --root="$pkgdir"
+  python2 setup-sk1.py install --root="$pkgdir" --optimize=1
 }

Added: imagemagick7.patch
===
--- imagemagick7.patch  (rev 0)
+++ imagemagick7.patch  2018-01-29 11:22:39 UTC (rev 287755)
@@ -0,0 +1,158 @@
+diff -Naur sk1-2.0rc2.orig/src/uc2/libimg/_libimg.c 
sk1-2.0rc2/src/uc2/libimg/_libimg.c
+--- sk1-2.0rc2.orig/src/uc2/libimg/_libimg.c   2016-10-09 12:40:45.0 
+0200
 sk1-2.0rc2/src/uc2/libimg/_libimg.c2018-01-29 11:47:58.377663808 
+0100
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include 
+-#include 
++#include 
+ 
+ static PyObject *
+ im_InitMagick(PyObject *self, PyObject *args) {
+@@ -199,15 +199,15 @@
+ //  UndefinedType,
+ //  BilevelType,
+ //  GrayscaleType,
+-//  GrayscaleMatteType,
++//  GrayscaleAlphaType,
+ //  PaletteType,
+-//  PaletteMatteType,
++//  PaletteAlphaType,
+ //  TrueColorType,
+-//  TrueColorMatteType,
++//  TrueColorAlphaType,
+ //  ColorSeparationType,
+-//  ColorSeparationMatteType,
++//  ColorSeparationAlphaType,
+ //  OptimizeType,
+-//  PaletteBilevelMatteType
++//  PaletteBilevelAlphaType
+ 
+ static PyObject *
+ im_GetImageType(PyObject *self, PyObject *args) {
+@@ -230,32 +230,32 @@
+   else if (img_type == GrayscaleType){
+   return Py_BuildValue("s", "GrayscaleType");
+   }
+-  else if (img_type == GrayscaleMatteType){
+-  return Py_BuildValue("s", "GrayscaleMatteType");
++  else if (img_type == GrayscaleAlphaType){
++  return Py_BuildValue("s", "GrayscaleAlphaType");
+   }
+   else if (img_type == PaletteType){
+   return Py_BuildValue("s", "PaletteType");
+   }
+-  else if (img_type == PaletteMatteType){
+-  return Py_BuildValue("s", "PaletteMatteType");
++  else if (img_type == PaletteAlphaType){
++  return Py_BuildValue("s", "PaletteAlphaType");
+   }
+   else if (img_type == TrueColorType){
+   return Py_BuildValue("s", "TrueColorType");
+   }
+-  else if (img_type == TrueColorMatteType){
+-  return Py_BuildValue("s", "TrueColorMatteType");
++  else if (img_type == TrueColorAlphaType){
++  return Py_BuildValue("s", "TrueColorAlphaType");
+   }
+   else if (img_type == ColorSeparationType){
+   return Py_BuildValue("s", "ColorSeparationType");
+   }
+-  else if (img_type == ColorSeparationMatteType){
+-  return Py_BuildValue("s", "ColorSeparationMatteType");
++  else if (img_type == ColorSeparationAlphaType){
++  return Py_BuildValue("s", "ColorSeparationAlphaType");
+   }
+   else if (img_type == OptimizeType){
+   return Py_BuildValue("s", "OptimizeType");
+   }
+-  else if