On Fri, Jun 21, 2019 at 07:24:15AM +0200, Xavi Drudis Ferran wrote:
>
> Hello. Maybe you know already (because the problem seems to be lack of
> maintainer). But there is a python-uniconvertor 2.0 that no longer depends on
> python-imaging but on python-pil (python2, I believe)
>
> https://sk1project.net/modules.php?name=Products&product=uniconvertor&op=download
Hi,
Even if that dependency is declared, python-uniconvertor in Debian does
not really depend on python-imaging, but on a copy of it embedded as
sk1libs.imaging in sk1libs, which is not in Debian.
The biggest problem is the lack of sk1libs, because there are some other
functions that are required by uniconvertor as soon as you try to go
beyond the usage message (See https://bugs.debian.org/820748).
I am not a python expert, but for the imaging part I would expect something
similar to attached patch to work. It changes dependency to python-pil and
tries to change calls to sk1libs.imaging stuff to the equivalent PIL calls.
Regards,
--
Agustin
>From eaac5ce28edcab4d022956f8a5eda171de521100 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Thu, 27 Jun 2019 15:51:09 +0200
Subject: [PATCH] Depend on python-pil instead of (fake) python-imaging.
This package had a dependency on python-imaging but its real dependency
was on sk1project sk1libs.imaging, a python-imaging copy embedded in
sk1libs.
This patch tries to change sk1libs.imaging calls to PIL, so dependency
can be set to PIL.
---
debian/changelog | 8 +++
debian/control | 2 +-
debian/patches/05_sklibs.imaging2PIL.patch | 59 ++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 69 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/05_sklibs.imaging2PIL.patch
diff --git a/debian/changelog b/debian/changelog
index 594905a..15be5f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-uniconvertor (1.1.5-5) unstable; urgency=medium
+
+ * QA upload.
+ * Depend on python-pil instead of python-imaging (Really was on
+ sk2libs.imaging) (Closes: #866472).
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Thu, 27 Jun 2019 11:51:10 +0200
+
python-uniconvertor (1.1.5-4) unstable; urgency=medium
* QA upload.
diff --git a/debian/control b/debian/control
index c4e845c..f3703df 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Standards-Version: 3.9.8
Package: python-uniconvertor
Architecture: any
Depends:
- python-imaging,
+ python-pil,
python-reportlab,
${misc:Depends},
${python:Depends},
diff --git a/debian/patches/05_sklibs.imaging2PIL.patch b/debian/patches/05_sklibs.imaging2PIL.patch
new file mode 100644
index 0000000..9fa6921
--- /dev/null
+++ b/debian/patches/05_sklibs.imaging2PIL.patch
@@ -0,0 +1,59 @@
+Author: Agustin Martin Domingo <agmar...@debian.org>
+Description: Try using python-pil instead of python-imaging copy embedded in sk1libs.
+
+
+diff --git a/src/app/Graphics/eps.py b/src/app/Graphics/eps.py
+index e587323..bbd4103 100755
+--- a/src/app/Graphics/eps.py
++++ b/src/app/Graphics/eps.py
+@@ -21,7 +21,7 @@
+
+ import os, math
+
+-from sk1libs.imaging import Image
++from PIL import Image
+
+ from app.Lib import dscparser
+ from sk1libs import utils
+diff --git a/src/app/Graphics/graphics.py b/src/app/Graphics/graphics.py
+index 420f7d4..0f85051 100755
+--- a/src/app/Graphics/graphics.py
++++ b/src/app/Graphics/graphics.py
+@@ -29,7 +29,7 @@ from types import TupleType
+ import operator, string
+ from math import atan2, hypot, pi, sin, cos
+
+-from sk1libs import imaging
++import PIL as imaging
+
+ #from app.X11 import X
+ from app.conf import const
+diff --git a/src/app/Graphics/image.py b/src/app/Graphics/image.py
+index bcb7c05..dbfb518 100755
+--- a/src/app/Graphics/image.py
++++ b/src/app/Graphics/image.py
+@@ -24,8 +24,8 @@
+ import os, app
+ from types import StringType
+
+-from sk1libs.imaging import ImageChops
+-from sk1libs import imaging
++import PIL as imaging
++from imaging import ImageChops
+
+ from app import _, RegisterCommands, colormanager
+ #from app.UI.command import AddCmd
+diff --git a/src/app/scripts/export_raster.py b/src/app/scripts/export_raster.py
+index e548c6c..a92a51d 100755
+--- a/src/app/scripts/export_raster.py
++++ b/src/app/scripts/export_raster.py
+@@ -37,7 +37,8 @@
+
+ import os, tempfile
+
+-from sk1libs import imaging.Image, imaging.ImageChops
++from PIL import Image as imaging.Image
++from PIL import ImageChops as imaging.ImageChops
+
+ import app.Scripting
+ from app import _, PostScriptDevice
diff --git a/debian/patches/series b/debian/patches/series
index bb5d10b..33e36f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
02_fake_fallback_font.patch
03_fontwarning.patch
+05_sklibs.imaging2PIL.patch
--
2.20.1
