Inssight : conflict on debug package

[macniaque <macniaque@free.fr>]

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Hi,

I was working on creating an Insight package for Arch linux, with some
patch on m4 files (to right find the include folders on Arch) and
configure.ac (all included in the mail) , there's one big problem
that should be corrected on the sources.

Insight provide on libgui/library/debug.tcl and
libgui/library/pkgIndex.tcl a package named debug which conflict with
tcllib which already provide a standard package named debug
(
https://core.tcl-lang.org/tcllib/doc/tcllib-1-20/embedded/md/tcllib/files/modules/debug/debug.md
).

To test, I changed name of the package from debug to libgui_debug and
it's all working. I joined the patch files to that mail
(debug.tcl.patch and pkgIndex.tcl.patch) . Could you change that in the
Insight sources ?

Another point, it will be great if you could do a new release (6.9 or
7.0) of Insight for package creation.

Kind regards.
-- 
Géballin


[-- Attachment #2: pkgIndex.tcl.patch --]
[-- Type: text/x-patch, Size: 451 bytes --]

diff --git a/libgui/library/pkgIndex.tcl b/libgui/library/pkgIndex.tcl
index 975ae94..9cd0a98 100644
--- a/libgui/library/pkgIndex.tcl
+++ b/libgui/library/pkgIndex.tcl
@@ -9,4 +9,4 @@
 # full path name of this file's directory.
 
 package ifneeded combobox 2.3 [list source [file join $dir combobox.tcl]]
-package ifneeded debug 1.0 [list source [file join $dir debug.tcl]]
+package ifneeded libgui_debug 1.0 [list source [file join $dir debug.tcl]]

[-- Attachment #3: debug.tcl.patch --]
[-- Type: text/x-patch, Size: 381 bytes --]

diff --git a/libgui/library/debug.tcl b/libgui/library/debug.tcl
index 11dfc7d..7e854c6 100644
--- a/libgui/library/debug.tcl
+++ b/libgui/library/debug.tcl
@@ -14,7 +14,7 @@
 #
 # -----------------------------------------------------------------------------
 
-package provide debug 1.0
+package provide libgui_debug 1.0
 
 namespace eval ::debug {
   namespace export debug dbug

[-- Attachment #4: configure.ac.patch --]
[-- Type: text/x-patch, Size: 500 bytes --]

--- ../configure.ac	2020-03-31 21:04:23.921049403 +0200
+++ ./configure.ac	2020-04-08 16:42:00.463683714 +0200
@@ -60,9 +60,9 @@
 else	mkdir bundle
 fi
 
-dnl Was "cp -a -T binutils-gdb bundle", but the following tar-based tree copy
+dnl Was "cp -a -T binut;5Dils-gdb bundle", but the following tar-based tree copy
 dnl is much faster on MinGW.
-(cd binutils-gdb; tar cf - *) | (cd bundle; tar xpf - --same-owner)
+cp -a -T binutils-gdb bundle
 
 cp -a gdbtk bundle/gdb/
 cp -a testsuite bundle/gdb/

[-- Attachment #5: gdb_acinclude.m4.patch --]
[-- Type: text/x-patch, Size: 521 bytes --]

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 11cc0bc241..ad150bac3c 100644
--- a/binutils-gdb/gdb/acinclude.m4
+++ b/binutils-gdb/gdb/acinclude.m4
@@ -258,7 +258,7 @@ dnl Note: you must use first use SC_LOAD_TCLCONFIG!
 AC_DEFUN([CY_AC_TCL_PRIVATE_HEADERS], [
   AC_MSG_CHECKING([for Tcl private headers])
   private_dir=""
-  dir=`echo ${TCL_INCLUDE_SPEC}/tcl-private/generic | sed -e s/-I//`
+  dir=`echo ${TCL_INCLUDE_SPEC} | sed -e s/-I//`
   if test -f ${dir}/tclInt.h ; then
     private_dir=${dir}
   fi

[-- Attachment #6: libgui_acinclude.m4.patch --]
[-- Type: text/x-patch, Size: 566 bytes --]

diff --git a/libgui/acinclude.m4 b/libgui/acinclude.m4
index 1b5a83b..082a49c 100644
--- a/libgui/acinclude.m4
+++ b/libgui/acinclude.m4
@@ -8,8 +8,7 @@ dnl Note: you must use first use SC_LOAD_TCLCONFIG!
 AC_DEFUN([CY_AC_TCL_PRIVATE_HEADERS], [
   AC_MSG_CHECKING([for Tcl private headers])
   private_dir=""
-  for dir in "${TCL_INCLUDE_SPEC}/tcl-private" "${TCL_SRC_DIR}"; do
-    dir=`echo "${dir}/generic" | sed -e s/-I//`
+  for dir in "${TCL_INCLUDE_SPEC}" "${TCL_SRC_DIR}"; do
     if test -f "${dir}/tclInt.h"; then
       private_dir="${dir}"
       break