Package: vtk9
Version: 9.0.1+dfsg1-5
Severity: important
Tags: patch
Hello,
Just like for vtk7, vtk9 needs fixes on hurd-i386 (for applism), and on
non-java ports, please see the attached patches.
Samuel
-- System Information:
Debian Release: bullseye/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable-debug'), (500,
'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500,
'proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500,
'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'),
(1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.10.0 (SMP w/8 CPU threads)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages vtk9 depends on:
ii libc6 2.31-6
ii libgcc-s1 11-20201216-2
ii libstdc++6 11-20201216-2
pn libvtk9 <none>
vtk9 recommends no packages.
Versions of packages vtk9 suggests:
pn vtk9-doc <none>
pn vtk9-examples <none>
--
Samuel
<m> bouhouhouh, b il m'a abandonné. Tout ca parce que je regardais plus mon
emacs que lui !
<m> s/lui/ses messages irc/
-+- #ens-mim esseulé -+-
https://gitlab.kitware.com/diatomic/diy/-/merge_requests/59
>From bb0d55c8ae34a43354b1002262dad722c410d8cb Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Sat, 13 Jun 2020 13:59:31 +0200
Subject: [PATCH] Fix build on mach-based OS which are not OS X
---
include/diy/time.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
index 692cf36..671e69d 100644
--- a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
+++ b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp
@@ -3,11 +3,11 @@
#ifndef _WIN32
#include <sys/time.h>
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
#include <mach/clock.h>
#include <mach/mach.h>
-#endif // __MACH__
+#endif // __MACH__ && __APPLE__
#endif // ifndef _WIN32
namespace diy
{
@@ -16,7 +16,7 @@ typedef unsigned long time_type;
inline time_type get_time()
{
-#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
+#if defined(__MACH__) && defined(__APPLE__) // OS X does not have
clock_gettime, use clock_get_time
clock_serv_t cclock;
mach_timespec_t ts;
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
--
GitLab
--- debian/control.original 2020-12-29 14:14:29.000000000 +0000
+++ debian/control 2020-12-29 14:15:29.000000000 +0000
@@ -8,7 +8,7 @@
Build-Depends: chrpath,
cmake (>= 3.2.0),
debhelper-compat (= 13),
- default-jdk,
+ default-jdk [!hppa !hurd-any !kfreebsd-any],
default-libmysqlclient-dev,
dh-python,
doxygen-latex,
@@ -115,7 +115,7 @@
libtiff-dev,
libutfcpp-dev,
libvtk9 (= ${binary:Version}),
- libvtk9-java (= ${binary:Version}),
+ libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any],
libx11-dev,
libxft-dev,
libxml2-dev,
@@ -161,7 +161,7 @@
that use VTK.
Package: libvtk9-java
-Architecture: any
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha
ia64 m68k powerpc ppc64 riscv64 sh4 sparc64 x32
Section: java
Depends: ${java:Depends},
${misc:Depends},
--- debian/rules.original 2020-12-29 14:15:37.000000000 +0000
+++ debian/rules 2020-12-29 14:18:12.000000000 +0000
@@ -3,7 +3,11 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+nojava_archs=hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64
+ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(nojava_archs)))
export JAVA_HOME=/usr/lib/jvm/default-java
+extra_flags += -DVTK_WRAP_JAVA=ON
+endif
ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4))
export DEB_CXXFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic
-Wl,--as-needed
@@ -52,7 +56,6 @@
-DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \
-DVTK_PYTHON_VERSION:STRING=3 \
-DVTK_USE_TK=ON \
- -DVTK_WRAP_JAVA=ON \
-DVTK_WRAP_PYTHON=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
@@ -70,8 +73,10 @@
override_dh_auto_install:
dh_auto_install -X.pyc -X.pyo
+ifneq ($(JAVA_HOME),)
# Correct headers for paraview
mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
+endif
sed -i -e "s/FATAL_ERROR/STATUS/g"
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake
override_dh_install:
