Source: plplot
Version: 5.10.0+dfsg2-0.4
Severity: wishlist
Tags: patch
Dear Maintainer,
I'm planning to switch the iwidgets4 package from Itcl/Itk 3 to Itcl/Itk 4.
And I'd like to do that before the buster's release. Currently, plplot depends
on iwidgets4 and itcl3, itk3 (actualy, if you look at the build log [1] you'll
find that itcl stuff is disabled, but anyway, it's probably the subject of
another bugreport).
Upstream seems to have support for Itcl/Itk 4 (there's one option in
tcl-related.cmake
to switch on, thought I also had to change the Itcl headers search path).
The proposed changes are in the attached patch.
So could you test if the plplot-tcl is indeed working with Itcl/Itk 4? You
could upload this package into experimental, iwidgets4 built against Itcl/Itk
4 is already there.
[1]
https://buildd.debian.org/status/fetch.php?pkg=plplot&arch=amd64&ver=5.13.0%2Bdfsg-7&stamp=1511279089&raw=0
-- System Information:
Debian Release: 9.4
APT prefers stable-debug
APT policy: (500, 'stable-debug'), (500, 'proposed-updates'), (500,
'stable'), (500, 'oldstable'), (1, 'experimental'), (1, 'unstable'), (1,
'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.14.0-0.bpo.3-amd64 (SMP w/12 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru plplot-5.13.0+dfsg/debian/changelog
plplot-5.13.0+dfsg/debian/changelog
--- plplot-5.13.0+dfsg/debian/changelog 2017-11-21 17:11:16.000000000 +0300
+++ plplot-5.13.0+dfsg/debian/changelog 2018-03-18 17:57:33.000000000 +0300
@@ -1,3 +1,10 @@
+plplot (5.13.0+dfsg-7.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Switch to Itcl 4 and Itk 4.
+
+ -- Sergei Golovan <sgolo...@debian.org> Sun, 18 Mar 2018 17:57:33 +0300
+
plplot (5.13.0+dfsg-7) unstable; urgency=low
* Fix build with OCaml 4.06
diff -Nru plplot-5.13.0+dfsg/debian/control plplot-5.13.0+dfsg/debian/control
--- plplot-5.13.0+dfsg/debian/control 2017-11-21 17:11:16.000000000 +0300
+++ plplot-5.13.0+dfsg/debian/control 2018-03-16 11:45:49.000000000 +0300
@@ -12,9 +12,9 @@
dh-python,
gfortran,
gnat,
- itcl3-dev,
- itk3-dev,
- iwidgets4,
+ tcl-itcl4-dev,
+ tk-itk4-dev,
+ iwidgets4 (>= 4.1.0-2),
libgl1-mesa-dri,
libltdl3-dev,
liblua5.1-0-dev,
diff -Nru plplot-5.13.0+dfsg/debian/patches/Build-with-Itcl4.patch
plplot-5.13.0+dfsg/debian/patches/Build-with-Itcl4.patch
--- plplot-5.13.0+dfsg/debian/patches/Build-with-Itcl4.patch 1970-01-01
03:00:00.000000000 +0300
+++ plplot-5.13.0+dfsg/debian/patches/Build-with-Itcl4.patch 2018-03-18
17:57:12.000000000 +0300
@@ -0,0 +1,35 @@
+Author Sergei Golovan
+Description: Patch enables Itcl 4 for the build. This includes
+ switching ON variable USE_INCRTCL_VERSION_4 and adding the itcl
+ suffix to the include search paths because for tcl-itcl4 the
+ headers are placed in /usr/include/itcl.
+
+--- a/cmake/modules/tcl-related.cmake
++++ b/cmake/modules/tcl-related.cmake
+@@ -32,7 +32,7 @@
+ option(ENABLE_itk "Enable Itk interface code" ON)
+ endif(DEFAULT_NO_BINDINGS)
+
+-option(USE_INCRTCL_VERSION_4 "Use version 4 of Itcl and Itcl, version 4.1 of
Iwidgets" OFF)
++option(USE_INCRTCL_VERSION_4 "Use version 4 of Itcl and Itcl, version 4.1 of
Iwidgets" ON)
+
+ option(USE_TCL_TK_STUBS "Use Tcl/Tk stubs libraries" OFF)
+
+@@ -191,7 +191,7 @@
+ message(STATUS "PLPLOT_ITCL_VERSION = ${PLPLOT_ITCL_VERSION}")
+ string(SUBSTRING ${PLPLOT_ITCL_VERSION} 0 1 SHORT_PLPLOT_ITCL_VERSION)
+ # N.B. Debian jessie itcl3-dev package stores itcl.h in
/usr/include/itcl${SHORT_PLPLOT_ITCL_VERSION}
+- find_path(ITCL_INCLUDE_PATH itcl.h HINTS "${TCL_INCLUDE_PATH}"
PATH_SUFFIXES itcl${SHORT_PLPLOT_ITCL_VERSION})
++ find_path(ITCL_INCLUDE_PATH itcl.h HINTS "${TCL_INCLUDE_PATH}"
PATH_SUFFIXES itcl itcl${SHORT_PLPLOT_ITCL_VERSION})
+
+ if(ITCL_INCLUDE_PATH)
+ message(STATUS "Looking for itcl.h - found")
+@@ -424,7 +424,7 @@
+ endif(NOT USE_INCRTCL_VERSION_4)
+ message(STATUS "PLPLOT_ITK_VERSION = ${PLPLOT_ITK_VERSION}")
+ # N.B. Debian jessie itk3-dev package stores itk.h in
/usr/include/itcl${SHORT_PLPLOT_ITCL_VERSION}
+- find_path(ITK_INCLUDE_PATH itk.h HINTS "${TCL_INCLUDE_PATH}"
PATH_SUFFIXES itcl${SHORT_PLPLOT_ITCL_VERSION})
++ find_path(ITK_INCLUDE_PATH itk.h HINTS "${TCL_INCLUDE_PATH}"
PATH_SUFFIXES itcl itcl${SHORT_PLPLOT_ITCL_VERSION})
+
+ if(ITK_INCLUDE_PATH)
+ message(STATUS "Looking for itk.h - found")
diff -Nru plplot-5.13.0+dfsg/debian/patches/series
plplot-5.13.0+dfsg/debian/patches/series
--- plplot-5.13.0+dfsg/debian/patches/series 2017-11-21 17:11:10.000000000
+0300
+++ plplot-5.13.0+dfsg/debian/patches/series 2018-03-18 17:53:56.000000000
+0300
@@ -4,3 +4,4 @@
Disable-octave-UTF-8-tests.patch
Disable-failing-ocaml-tests.patch
Fix-build-with-OCaml-4.06.patch
+Build-with-Itcl4.patch
--
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
