summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Shadura <andrewsh@debian.org>2018-05-08 16:21:30 +0200
committerAndrej Shadura <andrewsh@debian.org>2018-05-08 17:10:32 +0200
commit9a54cf6b4a9b9b46c701adaeb31346fea414752f (patch)
tree3690f81f8fb3c2ea259411bef63c0fb37e51372d
parent38b514a8c892416a5d11f535071fb12c6d3490f3 (diff)
Refresh the Signal patch
-rw-r--r--debian/patches/use-signal-not-tclx.patch53
1 files changed, 34 insertions, 19 deletions
diff --git a/debian/patches/use-signal-not-tclx.patch b/debian/patches/use-signal-not-tclx.patch
index 55342eb..4dffeea 100644
--- a/debian/patches/use-signal-not-tclx.patch
+++ b/debian/patches/use-signal-not-tclx.patch
@@ -1,40 +1,55 @@
Description: Use signal package instead of tclx
Since tclx package is deprecated the tcl-signal package was used as
a replacement.
-Author: Andrew Shadura <bugzilla@tut.by>
+Author: Andrej Shadura <andrewsh@debian.org>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/lib/main.tcl
+++ b/lib/main.tcl
-@@ -79,7 +79,7 @@
+@@ -82,14 +82,11 @@
{Tk 8.5}
{img::png 1.3}
{tdom 0.8}
- {Tclx 8.0}
-+ {Signal 1.4}
+ {Signal 1.4}
{Tcl 8.2}
}
-@@ -192,9 +192,9 @@
+ set OPTIONAL_LIBRARIES {
+- Signal
+- Tclx
+ }
+
+ ## Bool:
+@@ -104,7 +101,7 @@
+ # TclX is used here only to handle signals (e.g. SIGINT), so the IDE can run
+ # without it, that's the reason for this variable. If TCLX_AVAILABLE is 0 then
+ # we are not able to handle signals, but everything else works normally.
+-set ::TCLX_AVAILABLE 1
++set ::TCLX_AVAILABLE 0
+
+ ## Bool:
+ # 1 == library Signal is available
+@@ -212,16 +209,16 @@
}
- # Tclx workarond for Debian
+ # Tclx workarond for Debian (1/2)
- } elseif {$library == {Tclx}} {
+- set ::TCLX_AVAILABLE 0
+- puts stderr "\nERROR: Unable to load library Tclx, MCU 805 1IDE functionality might be limited."
+ } elseif {$library == {Signal}} {
- set ::TCLX_AVAILABLE 0
-- puts stderr "\nERROR: Unable to load Tclx library, functionality will be limited"
-+ puts stderr "\nERROR: Unable to load Signal library, functionality will be limited"
++ set ::SIGNAL_AVAILABLE 0
++ puts stderr "\nERROR: Unable to load library Signal, MCU 8051 IDE functionality might be limited."
return
- }
-@@ -759,8 +759,8 @@
- exit 1
+ # Tclx workarond for Debian (2/2)
+- } elseif { $library == {Signal} } {
+- set ::SIGNAL_AVAILABLE 0
++ } elseif { $library == {Tclx} } {
++ set ::TCLX_AVAILABLE 0
+ if {!$::TCLX_AVAILABLE} {
+- puts stderr "\nERROR: Unable to load library Signal, MCU 805 1IDE functionality might be limited."
++ puts stderr "\nERROR: Unable to load library Tcl, MCU 8051 IDE functionality might be limited."
+ }
+ return
}
-
-- signal trap SIGINT {signal_handler SIGINT}
-- signal trap SIGTERM {signal_handler SIGTERM}
-+ signal add SIGINT {signal_handler SIGINT}
-+ signal add SIGTERM {signal_handler SIGTERM}
- }
-
-