Bug#994109: scilab FTBFS with hdf5 1.10.7

2021-09-14 Thread Gilles Filippini

Julien Puydt a écrit le 13/09/2021 à 08:51 :

Excellent! Please commit to salsa but don't upload yet


Done.

Best,

_g.

--
debian-science-maintainers mailing list
debian-science-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers


Bug#994109: scilab FTBFS with hdf5 1.10.7

2021-09-13 Thread Julien Puydt
Hi

Le dim. 12 sept. 2021 à 17:49, Gilles Filippini  a écrit :

>
> Patch proposal attached.
>

Excellent! Please commit to salsa but don't upload yet: I have other things
to do (though lacking time I might still end up uploading with only this).

Thanks!

J. Puydt

>
-- 
debian-science-maintainers mailing list
debian-science-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers


Bug#994109: scilab FTBFS with hdf5 1.10.7

2021-09-12 Thread Gilles Filippini

Adrian Bunk a écrit le 11/09/2021 à 23:35 :

Source: scilab
Version: 6.1.0+dfsg1-7
Severity: serious
Tags: ftbfs

https://buildd.debian.org/status/package.php?p=scilab=sid

...
In file included from /usr/include/hdf5/serial/H5public.h:32,
  from /usr/include/hdf5/serial/hdf5.h:22,
  from src/c/h5_readDataFromFile.c:26:
/usr/include/hdf5/serial/H5version.h:39:4: error: #error "Can't choose old API 
versions when deprecated APIs are disabled"
39 |   #error "Can't choose old API versions when deprecated APIs are 
disabled"
   |^
make[5]: *** [Makefile:1380: src/c/libscihdf5_algo_la-h5_readDataFromFile.lo] 
Error 1



Patch proposal attached.

Best,

_g.
diff -Nru scilab-6.1.1+dfsg2/debian/changelog 
scilab-6.1.1+dfsg2/debian/changelog
--- scilab-6.1.1+dfsg2/debian/changelog 2021-09-10 07:02:44.0 +0200
+++ scilab-6.1.1+dfsg2/debian/changelog 2021-09-12 14:50:46.0 +0200
@@ -1,3 +1,11 @@
+scilab (6.1.1+dfsg2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * New patch hdf5-1.10.7.patch to disable H5_NO_DEPRECATED_SYMBOLS which
+causes FTBFS against HDF5 1.10.7 (Closes: #994109)
+
+ -- Gilles Filippini   Sun, 12 Sep 2021 14:50:46 +0200
+
 scilab (6.1.1+dfsg2-1) unstable; urgency=medium
 
   * Drop even more files from upstream's archive (now dfsg2),
diff -Nru scilab-6.1.1+dfsg2/debian/patches/hdf5-1.10.7.patch 
scilab-6.1.1+dfsg2/debian/patches/hdf5-1.10.7.patch
--- scilab-6.1.1+dfsg2/debian/patches/hdf5-1.10.7.patch 1970-01-01 
01:00:00.0 +0100
+++ scilab-6.1.1+dfsg2/debian/patches/hdf5-1.10.7.patch 2021-09-12 
14:50:46.0 +0200
@@ -0,0 +1,52 @@
+Index: scilab/scilab/modules/hdf5/Makefile.am
+===
+--- scilab.orig/scilab/modules/hdf5/Makefile.am
 scilab/scilab/modules/hdf5/Makefile.am
+@@ -103,8 +103,7 @@ FORCE_HDF_API = \
+ -DH5Gopen_vers=2 \
+ -DH5Tget_array_dims_vers=2 \
+ -DH5Acreate_vers=2 \
+--DH5Rdereference_vers=2 \
+--DNO_DEPRECATED_SYMBOLS
++-DH5Rdereference_vers=2
+ 
+ 
+ libscihdf5_la_CPPFLAGS = \
+Index: scilab/scilab/modules/hdf5/src/c/h5_readDataFromFile.c
+===
+--- scilab.orig/scilab/modules/hdf5/src/c/h5_readDataFromFile.c
 scilab/scilab/modules/hdf5/src/c/h5_readDataFromFile.c
+@@ -13,8 +13,6 @@
+ *
+ */
+ 
+-#define H5_NO_DEPRECATED_SYMBOLS
+-
+ #ifndef _MSC_VER
+ #include 
+ #else
+Index: scilab/scilab/modules/hdf5/includes/HDF5Objects.h
+===
+--- scilab.orig/scilab/modules/hdf5/includes/HDF5Objects.h
 scilab/scilab/modules/hdf5/includes/HDF5Objects.h
+@@ -16,7 +16,6 @@
+ #ifndef __HDF5OBJECTS_H__
+ #define __HDF5OBJECTS_H__
+ 
+-#define H5_NO_DEPRECATED_SYMBOLS
+ #undef H5_USE_16_API
+ 
+ #define H5Eset_auto_vers 2
+Index: scilab/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c
+===
+--- scilab.orig/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c
 scilab/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c
+@@ -13,8 +13,6 @@
+ *
+ */
+ 
+-#define H5_NO_DEPRECATED_SYMBOLS
+-
+ #ifndef _MSC_VER
+ #include 
+ #else
diff -Nru scilab-6.1.1+dfsg2/debian/patches/series 
scilab-6.1.1+dfsg2/debian/patches/series
--- scilab-6.1.1+dfsg2/debian/patches/series2021-09-10 07:02:44.0 
+0200
+++ scilab-6.1.1+dfsg2/debian/patches/series2021-09-12 14:50:46.0 
+0200
@@ -20,3 +20,4 @@
 no-ftbfs-icu.patch
 find_external_libintl_jar.patch
 ocaml_411.patch
+hdf5-1.10.7.patch


OpenPGP_signature
Description: OpenPGP digital signature
-- 
debian-science-maintainers mailing list
debian-science-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers


Bug#994109: scilab FTBFS with hdf5 1.10.7

2021-09-11 Thread Adrian Bunk
Source: scilab
Version: 6.1.0+dfsg1-7
Severity: serious
Tags: ftbfs

https://buildd.debian.org/status/package.php?p=scilab=sid

...
In file included from /usr/include/hdf5/serial/H5public.h:32,
 from /usr/include/hdf5/serial/hdf5.h:22,
 from src/c/h5_readDataFromFile.c:26:
/usr/include/hdf5/serial/H5version.h:39:4: error: #error "Can't choose old API 
versions when deprecated APIs are disabled"
   39 |   #error "Can't choose old API versions when deprecated APIs are 
disabled"
  |^
make[5]: *** [Makefile:1380: src/c/libscihdf5_algo_la-h5_readDataFromFile.lo] 
Error 1

-- 
debian-science-maintainers mailing list
debian-science-maintainers@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers