Bug#804765: Don't disable deprecated functions
On 24 November 2015 at 11:14, Dirk Eddelbuettel wrote: | | On 24 November 2015 at 17:07, Iain Lane wrote: | | Control: reopen -1 = | | Control: block 805814 by -1 | | | | On Fri, Nov 13, 2015 at 09:12:09AM +, Iain Lane wrote: | | > On Thu, Nov 12, 2015 at 02:17:16PM -0600, Dirk Eddelbuettel wrote: | | > > | | > > On 11 November 2015 at 11:45, Iain Lane wrote: | | > > | Package: gsl | | > > | Version: 2.0+dfsg-1 | | > > | Severity: normal | | > > | Tags: patch | | > > | User: ubuntu-de...@lists.ubuntu.com | | > > | Usertags: origin-ubuntu xenial ubuntu-patch | | > > | | | > > | I noticed when rebuilding packages for the gsl transition in Ubuntu that | | > > | mrtrix FTBFS due to disabled deprecatead functions. Maybe we should | | > > | re-enable them for now to ease the transition? Patch attached. | | > > | | > > Did you report that upstream too? Looks like I no longer need the patch in | | > > the brand new gsl 2.1. | | > | | > No I didn't, sorry - in Ubuntu the transition got entangled with a whole | | > bunch of other stuff (poppler, ocaml, ...) and so I was frantically | | > fixing many packages at once. | | > | | > If mrtrix continues to build with 2.1 then by all means drop it. :) | | | | Ah. OK. Now I've looked again and here's the situation. | | | | mrtrix build-depends on the old libgsl0-dev. If you update this then it | | fails to build on a missing cstddef include. After adding that it then | | fails to build on the deprecated functions. | | | | So the patch is still needed to fully transition Debian. Sorry. | | No -- my bad, and I am sorry. I was too hopeful as I saw similar language in | the new _and_ the patch failed to apply. | | If you have a moment, can you see if applies cleanly for you? Maybe I messed | something else up. Would be happy to apply (carefully) by hand, but am | sadly not that fluent with quilt et al. On second thought it is not bad. Your patch had two (small, self-contained) changes: i) change configure.ac to not disable deprecated functions -- and this we still need and can apply ii) a minimal fix adding NULL to the fdjac() call in multifit/fdjac.c -- which is already in upstream and which is why the patch series failed. I will just reduce the patch in half and should be good. Dirk -- http://dirk.eddelbuettel.com | @eddelbuettel | e...@debian.org
Bug#804765: Don't disable deprecated functions
On 24 November 2015 at 17:07, Iain Lane wrote: | Control: reopen -1 = | Control: block 805814 by -1 | | On Fri, Nov 13, 2015 at 09:12:09AM +, Iain Lane wrote: | > On Thu, Nov 12, 2015 at 02:17:16PM -0600, Dirk Eddelbuettel wrote: | > > | > > On 11 November 2015 at 11:45, Iain Lane wrote: | > > | Package: gsl | > > | Version: 2.0+dfsg-1 | > > | Severity: normal | > > | Tags: patch | > > | User: ubuntu-de...@lists.ubuntu.com | > > | Usertags: origin-ubuntu xenial ubuntu-patch | > > | | > > | I noticed when rebuilding packages for the gsl transition in Ubuntu that | > > | mrtrix FTBFS due to disabled deprecatead functions. Maybe we should | > > | re-enable them for now to ease the transition? Patch attached. | > > | > > Did you report that upstream too? Looks like I no longer need the patch in | > > the brand new gsl 2.1. | > | > No I didn't, sorry - in Ubuntu the transition got entangled with a whole | > bunch of other stuff (poppler, ocaml, ...) and so I was frantically | > fixing many packages at once. | > | > If mrtrix continues to build with 2.1 then by all means drop it. :) | | Ah. OK. Now I've looked again and here's the situation. | | mrtrix build-depends on the old libgsl0-dev. If you update this then it | fails to build on a missing cstddef include. After adding that it then | fails to build on the deprecated functions. | | So the patch is still needed to fully transition Debian. Sorry. No -- my bad, and I am sorry. I was too hopeful as I saw similar language in the new _and_ the patch failed to apply. If you have a moment, can you see if applies cleanly for you? Maybe I messed something else up. Would be happy to apply (carefully) by hand, but am sadly not that fluent with quilt et al. Dirk -- http://dirk.eddelbuettel.com | @eddelbuettel | e...@debian.org
Bug#804765: Don't disable deprecated functions
Control: reopen -1 = Control: block 805814 by -1 On Fri, Nov 13, 2015 at 09:12:09AM +, Iain Lane wrote: > On Thu, Nov 12, 2015 at 02:17:16PM -0600, Dirk Eddelbuettel wrote: > > > > On 11 November 2015 at 11:45, Iain Lane wrote: > > | Package: gsl > > | Version: 2.0+dfsg-1 > > | Severity: normal > > | Tags: patch > > | User: ubuntu-de...@lists.ubuntu.com > > | Usertags: origin-ubuntu xenial ubuntu-patch > > | > > | I noticed when rebuilding packages for the gsl transition in Ubuntu that > > | mrtrix FTBFS due to disabled deprecatead functions. Maybe we should > > | re-enable them for now to ease the transition? Patch attached. > > > > Did you report that upstream too? Looks like I no longer need the patch in > > the brand new gsl 2.1. > > No I didn't, sorry - in Ubuntu the transition got entangled with a whole > bunch of other stuff (poppler, ocaml, ...) and so I was frantically > fixing many packages at once. > > If mrtrix continues to build with 2.1 then by all means drop it. :) Ah. OK. Now I've looked again and here's the situation. mrtrix build-depends on the old libgsl0-dev. If you update this then it fails to build on a missing cstddef include. After adding that it then fails to build on the deprecated functions. So the patch is still needed to fully transition Debian. Sorry. Cheers, -- Iain Lane [ i...@orangesquash.org.uk ] Debian Developer [ la...@debian.org ] Ubuntu Developer [ la...@ubuntu.com ] signature.asc Description: Digital signature
Bug#804765: Don't disable deprecated functions
On Thu, Nov 12, 2015 at 02:17:16PM -0600, Dirk Eddelbuettel wrote: > > On 11 November 2015 at 11:45, Iain Lane wrote: > | Package: gsl > | Version: 2.0+dfsg-1 > | Severity: normal > | Tags: patch > | User: ubuntu-de...@lists.ubuntu.com > | Usertags: origin-ubuntu xenial ubuntu-patch > | > | I noticed when rebuilding packages for the gsl transition in Ubuntu that > | mrtrix FTBFS due to disabled deprecatead functions. Maybe we should > | re-enable them for now to ease the transition? Patch attached. > > Did you report that upstream too? Looks like I no longer need the patch in > the brand new gsl 2.1. No I didn't, sorry - in Ubuntu the transition got entangled with a whole bunch of other stuff (poppler, ocaml, ...) and so I was frantically fixing many packages at once. If mrtrix continues to build with 2.1 then by all means drop it. :) -- Iain Lane [ i...@orangesquash.org.uk ] Debian Developer [ la...@debian.org ] Ubuntu Developer [ la...@ubuntu.com ] signature.asc Description: Digital signature
Bug#804765: Don't disable deprecated functions
On 11 November 2015 at 11:45, Iain Lane wrote: | Package: gsl | Version: 2.0+dfsg-1 | Severity: normal | Tags: patch | User: ubuntu-de...@lists.ubuntu.com | Usertags: origin-ubuntu xenial ubuntu-patch | | I noticed when rebuilding packages for the gsl transition in Ubuntu that | mrtrix FTBFS due to disabled deprecatead functions. Maybe we should | re-enable them for now to ease the transition? Patch attached. Did you report that upstream too? Looks like I no longer need the patch in the brand new gsl 2.1. Dirk -- http://dirk.eddelbuettel.com | @eddelbuettel | e...@debian.org
Bug#804765: Don't disable deprecated functions
On 11 November 2015 at 11:45, Iain Lane wrote: | Package: gsl | Version: 2.0+dfsg-1 | Severity: normal | Tags: patch | User: ubuntu-de...@lists.ubuntu.com | Usertags: origin-ubuntu xenial ubuntu-patch | | I noticed when rebuilding packages for the gsl transition in Ubuntu that | mrtrix FTBFS due to disabled deprecatead functions. Maybe we should | re-enable them for now to ease the transition? Patch attached. Great idea -- will do. Dirk | Cheers, | | -- | Iain Lane [ i...@orangesquash.org.uk ] | Debian Developer [ la...@debian.org ] | Ubuntu Developer [ la...@ubuntu.com ] | x[DELETED ATTACHMENT gsl_2.0+dfsg-1ubuntu1.debdiff, text/x-diff] -- http://dirk.eddelbuettel.com | @eddelbuettel | e...@debian.org
Bug#804765: Don't disable deprecated functions
Package: gsl
Version: 2.0+dfsg-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch
I noticed when rebuilding packages for the gsl transition in Ubuntu that
mrtrix FTBFS due to disabled deprecatead functions. Maybe we should
re-enable them for now to ease the transition? Patch attached.
Cheers,
--
Iain Lane [ i...@orangesquash.org.uk ]
Debian Developer [ la...@debian.org ]
Ubuntu Developer [ la...@ubuntu.com ]
diff -Nru gsl-2.0+dfsg/debian/patches/dont-disable-deprecated gsl-2.0+dfsg/debian/patches/dont-disable-deprecated
--- gsl-2.0+dfsg/debian/patches/dont-disable-deprecated 1970-01-01 01:00:00.0 +0100
+++ gsl-2.0+dfsg/debian/patches/dont-disable-deprecated 2015-11-11 11:18:43.0 +
@@ -0,0 +1,28 @@
+Index: b/configure.ac
+===
+--- a/configure.ac
b/configure.ac
+@@ -566,10 +566,6 @@
+ AH_BOTTOM([#define RETURN_IF_NULL(x) if (!x) { return ; }
+ ])
+
+-AH_VERBATIM([GSL_DISABLE_DEPRECATED],
+-[/* Disable deprecated functions and enums while building */
+-#define GSL_DISABLE_DEPRECATED 1])
+-
+ dnl
+ AC_CONFIG_FILES([ \
+ Makefile \
+Index: b/multifit/fdjac.c
+===
+--- a/multifit/fdjac.c
b/multifit/fdjac.c
+@@ -135,7 +135,7 @@
+ if (status)
+ return status;
+
+- status = fdjac(x, fdf, f, J);
++ status = fdjac(x, NULL, fdf, f, J);
+ if (status)
+ return status;
+
diff -Nru gsl-2.0+dfsg/debian/patches/series gsl-2.0+dfsg/debian/patches/series
--- gsl-2.0+dfsg/debian/patches/series 1970-01-01 01:00:00.0 +0100
+++ gsl-2.0+dfsg/debian/patches/series 2015-11-11 11:13:47.0 +
@@ -0,0 +1 @@
+dont-disable-deprecated
