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 =================================================================== --- PKGBUILD 2018-04-16 15:46:26 UTC (rev 316525) +++ PKGBUILD 2018-04-16 15:52:11 UTC (rev 316526) @@ -1,27 +1,20 @@ # $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> # Contributor: ConnorBehan <connor.be...@gmail.com> 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.000000000 +0200 -+++ sk1-2.0rc2/src/uc2/libimg/_libimg.c 2018-01-29 11:47:58.377663808 +0100 -@@ -17,7 +17,7 @@ - */ - - #include <Python.h> --#include <wand/MagickWand.h> -+#include <MagickWand/MagickWand.h> - - 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){ -+ return Py_BuildValue("s", "PaletteBilevelAlphaType"); - } - else { - return Py_BuildValue("s", "UndefinedType"); -@@ -281,9 +281,7 @@ - //HSBColorspace, - //HSLColorspace, - //HWBColorspace, --//Rec601LumaColorspace, - //Rec601YCbCrColorspace, --//Rec709LumaColorspace, - //Rec709YCbCrColorspace, - //LogColorspace, - //CMYColorspace -@@ -351,15 +349,9 @@ - else if (cs == HWBColorspace){ - return Py_BuildValue("s", "HWBColorspace"); - } -- else if (cs == Rec601LumaColorspace){ -- return Py_BuildValue("s", "Rec601LumaColorspace"); -- } - else if (cs == Rec601YCbCrColorspace){ - return Py_BuildValue("s", "Rec601YCbCrColorspace"); - } -- else if (cs == Rec709LumaColorspace){ -- return Py_BuildValue("s", "Rec709LumaColorspace"); -- } - else if (cs == Rec709YCbCrColorspace){ - return Py_BuildValue("s", "Rec709YCbCrColorspace"); - } -@@ -425,26 +417,26 @@ - else if (strcmp(mode, "GrayscaleType") == 0) { - return GrayscaleType; - } -- else if (strcmp(mode, "GrayscaleMatteType") == 0) { -- return GrayscaleMatteType; -+ else if (strcmp(mode, "GrayscaleAlphaType") == 0) { -+ return GrayscaleAlphaType; - } - else if (strcmp(mode, "PaletteType") == 0) { - return PaletteType; - } -- else if (strcmp(mode, "PaletteMatteType") == 0) { -- return PaletteMatteType; -+ else if (strcmp(mode, "PaletteAlphaType") == 0) { -+ return PaletteAlphaType; - } - else if (strcmp(mode, "TrueColorType") == 0) { - return TrueColorType; - } -- else if (strcmp(mode, "TrueColorMatteType") == 0) { -- return TrueColorMatteType; -+ else if (strcmp(mode, "TrueColorAlphaType") == 0) { -+ return TrueColorAlphaType; - } - else if (strcmp(mode, "ColorSeparationType") == 0) { - return ColorSeparationType; - } -- else if (strcmp(mode, "ColorSeparationMatteType") == 0) { -- return ColorSeparationMatteType; -+ else if (strcmp(mode, "ColorSeparationAlphaType") == 0) { -+ return ColorSeparationAlphaType; - } - else { - return TrueColorType; -diff -Naur sk1-2.0rc2.orig/src/uc2/libimg/magickwand.py sk1-2.0rc2/src/uc2/libimg/magickwand.py ---- sk1-2.0rc2.orig/src/uc2/libimg/magickwand.py 2016-10-09 12:40:45.000000000 +0200 -+++ sk1-2.0rc2/src/uc2/libimg/magickwand.py 2018-01-29 11:47:05.929701428 +0100 -@@ -19,13 +19,13 @@ - - BILEVEL_TYPE = 'BilevelType' - L_TYPE = 'GrayscaleType' --LA_TYPE = 'GrayscaleMatteType' -+LA_TYPE = 'GrayscaleAlphaType' - P_TYPE = 'PaletteType' --PA_TYPE = 'PaletteMatteType' -+PA_TYPE = 'PaletteAlphaType' - RGB_TYPE = 'TrueColorType' --RGBA_TYPE = 'TrueColorMatteType' -+RGBA_TYPE = 'TrueColorAlphaType' - CMYK_TYPE = 'ColorSeparationType' --CMYKA_TYPE = 'ColorSeparationMatteType' -+CMYKA_TYPE = 'ColorSeparationAlphaType' - - WAND_TYPES = [BILEVEL_TYPE, L_TYPE, LA_TYPE, P_TYPE, PA_TYPE, - RGB_TYPE, RGBA_TYPE, CMYK_TYPE, CMYKA_TYPE, ]
