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 =================================================================== --- PKGBUILD 2018-01-29 11:02:31 UTC (rev 287754) +++ PKGBUILD 2018-01-29 11:22:39 UTC (rev 287755) @@ -1,28 +1,33 @@ # $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> # Contributor: ConnorBehan <connor.be...@gmail.com> 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&target=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.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, ]