@@ -1,85 +0,0 @@
1−From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001
2−From: Arnout Engelen <arnout@bzzt.net>
3−Date: Tue, 24 Nov 2020 15:34:40 +0100
4−Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself
5−
6−Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer
7−start since it'd try to invoke the inkcut.py from the extension
8−instead of the main application
9−---
10− plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +-
11− plugins/inkscape/inkcut_cut.inx | 2 +-
12− plugins/inkscape/inkcut_cut.py | 2 +-
13− plugins/inkscape/inkcut_open.inx | 2 +-
14− plugins/inkscape/inkcut_open.py | 2 +-
15− 5 files changed, 5 insertions(+), 5 deletions(-)
16− rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%)
17−
18−diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py
19−similarity index 98%
20−rename from plugins/inkscape/inkcut.py
21−rename to plugins/inkscape/inkcut4inkscape.py
22−index 5b90475..7dc8d86 100644
23−--- a/plugins/inkscape/inkcut.py
24−+++ b/plugins/inkscape/inkcut4inkscape.py
25−@@ -2,7 +2,7 @@
26− # -*- coding: utf-8 -*-
27− """
28− Inkcut, Plot HPGL directly from Inkscape.
29−- inkcut.py
30−+ inkcut4inkscape.py
31−
32− Copyright 2018 The Inkcut Team
33−
34−diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx
35−index 4b44ae5..3db8721 100644
36−--- a/plugins/inkscape/inkcut_cut.inx
37−+++ b/plugins/inkscape/inkcut_cut.inx
38−@@ -2,7 +2,7 @@
39− <_name>Cut selection...</_name>
40− <id>org.ekips.filter.inkcut.cut</id>
41− <dependency type="executable" location="extensions">inkcut_cut.py</dependency>
42−- <dependency type="executable" location="extensions">inkcut.py</dependency>
43−+ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency>
44− <dependency type="executable" location="extensions">inkex.py</dependency>
45− <effect>
46− <object-type>all</object-type>
47−diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py
48−index acaf812..777629a 100644
49−--- a/plugins/inkscape/inkcut_cut.py
50−+++ b/plugins/inkscape/inkcut_cut.py
51−@@ -37,7 +37,7 @@
52− else:
53− inkex.localize()
54− import subprocess
55−-from inkcut import contains_text, convert_objects_to_paths
56−+from inkcut4inkscape import contains_text, convert_objects_to_paths
57−
58−
59−
60−diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx
61−index 45ee585..2dcd38e 100644
62−--- a/plugins/inkscape/inkcut_open.inx
63−+++ b/plugins/inkscape/inkcut_open.inx
64−@@ -2,7 +2,7 @@
65− <_name>Open current document...</_name>
66− <id>org.ekips.filter.inkcut.open</id>
67− <dependency type="executable" location="extensions">inkcut_open.py</dependency>
68−- <dependency type="executable" location="extensions">inkcut.py</dependency>
69−+ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency>
70− <dependency type="executable" location="extensions">inkex.py</dependency>
71− <effect>
72− <object-type>all</object-type>
73−diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py
74−index b4652eb..e4c2d62 100644
75−--- a/plugins/inkscape/inkcut_open.py
76−+++ b/plugins/inkscape/inkcut_open.py
77−@@ -38,7 +38,7 @@
78− inkex.localize()
79− import subprocess
80−
81−-from inkcut import convert_objects_to_paths
82−+from inkcut4inkscape import convert_objects_to_paths
83−
84− DEBUG = False
85− try: