Control: tags 913854 + pending
Dear maintainer,
I've prepared an NMU for siril (versioned as 0.9.9-1.1) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru siril-0.9.9/debian/changelog siril-0.9.9/debian/changelog
--- siril-0.9.9/debian/changelog 2018-06-07 10:38:17.000000000 +0300
+++ siril-0.9.9/debian/changelog 2018-12-17 16:58:46.000000000 +0200
@@ -1,3 +1,10 @@
+siril (0.9.9-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with glibc 2.28. (Closes: #913854)
+
+ -- Adrian Bunk <b...@debian.org> Mon, 17 Dec 2018 16:58:46 +0200
+
siril (0.9.9-1) unstable; urgency=medium
* New upstream version
diff -Nru siril-0.9.9/debian/patches/0001-Fixes-bug-with-next-release-of-glibc.patch siril-0.9.9/debian/patches/0001-Fixes-bug-with-next-release-of-glibc.patch
--- siril-0.9.9/debian/patches/0001-Fixes-bug-with-next-release-of-glibc.patch 1970-01-01 02:00:00.000000000 +0200
+++ siril-0.9.9/debian/patches/0001-Fixes-bug-with-next-release-of-glibc.patch 2018-12-17 16:58:24.000000000 +0200
@@ -0,0 +1,99 @@
+From 140d7356b390ff7ba52a93e8ae324596ed029df8 Mon Sep 17 00:00:00 2001
+From: lock042 <cyril.richar...@gmail.com>
+Date: Wed, 4 Jul 2018 11:56:17 +0000
+Subject: [PATCH] Fixes bug with next release of glibc
+
+---
+ src/core/command.c | 2 +-
+ src/core/proto.h | 5 ++---
+ src/core/siril.c | 10 +++++-----
+ src/gui/callbacks.c | 2 +-
+ 4 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/src/core/command.c b/src/core/command.c
+index 7d44325..6a83759 100644
+--- a/src/core/command.c
++++ b/src/core/command.c
+@@ -358,7 +358,7 @@ int process_fdiv(int nb){
+ norm = atof(word[2]);
+ if (readfits(word[1], &fit, NULL))
+ return -1;
+- fdiv(&gfit, &fit, norm);
++ siril_fdiv(&gfit, &fit, norm);
+ adjust_cutoff_from_updated_gfit();
+ redraw(com.cvport, REMAP_ALL);
+ redraw_previews();
+diff --git a/src/core/proto.h b/src/core/proto.h
+index cc51643..cbae177 100644
+--- a/src/core/proto.h
++++ b/src/core/proto.h
+@@ -181,9 +181,8 @@ int soper(fits *a, double scalar, char oper);
+ int imoper(fits *a, fits *b, char oper);
+ int sub_background(fits* image, fits* background, int layer);
+ int addmax(fits *a, fits *b);
+-int fdiv(fits *a, fits *b, float scalar);
+-int ndiv(fits *a, fits *b);
+-int fmul(fits *a, float coeff);
++int siril_fdiv(fits *a, fits *b, float scalar);
++int siril_ndiv(fits *a, fits *b);
+ double gaussienne(double sigma, int size, double *gauss);
+ int unsharp(fits *,double sigma, double mult, gboolean verbose);
+ int crop(fits *fit, rectangle *bounds);
+diff --git a/src/core/siril.c b/src/core/siril.c
+index 8e934a2..40cb298 100644
+--- a/src/core/siril.c
++++ b/src/core/siril.c
+@@ -260,8 +260,8 @@ int addmax(fits *a, fits *b) {
+ return 0;
+ }
+
+-/* If fdiv is ok, function returns 0. If overflow, fdiv returns 1*/
+-int fdiv(fits *a, fits *b, float coef) {
++/* If siril_fdiv is ok, function returns 0. If overflow, siril_fdiv returns 1*/
++int siril_fdiv(fits *a, fits *b, float coef) {
+ int i, layer;
+ int retvalue = 0;
+ double temp;
+@@ -289,7 +289,7 @@ int fdiv(fits *a, fits *b, float coef) {
+
+ /* normalized division a/b, stored in a, with max value equal to the original
+ * max value of a, for each layer. */
+-int ndiv(fits *a, fits *b) {
++int siril_ndiv(fits *a, fits *b) {
+ double *div;
+ int layer, i, nb_pixels;
+ if (a->rx != b->rx || a->ry != b->ry || a->naxes[2] != b->naxes[2]) {
+@@ -489,7 +489,7 @@ int ddp(fits *a, int level, float coeff, float sigma) {
+ unsharp(&fit, sigma, 0, FALSE);
+ soper(&fit, (double) level, OPER_ADD);
+ nozero(&fit, 1);
+- fdiv(a, &fit, level);
++ siril_fdiv(a, &fit, level);
+ soper(a, (double) coeff, OPER_MUL);
+ clearfits(&fit);
+ invalidate_stats_from_fit(a);
+@@ -824,7 +824,7 @@ static int preprocess(fits *brut, fits *offset, fits *dark, fits *flat, float le
+ }
+
+ if (com.preprostatus & USE_FLAT) {
+- fdiv(brut, flat, level);
++ siril_fdiv(brut, flat, level);
+ }
+
+ return 0;
+diff --git a/src/gui/callbacks.c b/src/gui/callbacks.c
+index 3c9571e..0e35c5c 100644
+--- a/src/gui/callbacks.c
++++ b/src/gui/callbacks.c
+@@ -4775,7 +4775,7 @@ void on_button_bkg_correct_clicked(GtkButton *button, gpointer user_data) {
+ siril_log_message(_("Subtraction done ...\n"));
+ break;
+ case 1:
+- if (ndiv(&gfit, &background_fit)) {
++ if (siril_ndiv(&gfit, &background_fit)) {
+ set_cursor_waiting(FALSE);
+ return;
+ }
+--
+2.11.0
+
diff -Nru siril-0.9.9/debian/patches/series siril-0.9.9/debian/patches/series
--- siril-0.9.9/debian/patches/series 2017-06-24 15:06:21.000000000 +0300
+++ siril-0.9.9/debian/patches/series 2018-12-17 16:58:46.000000000 +0200
@@ -1 +1,2 @@
LICENSE_remover
+0001-Fixes-bug-with-next-release-of-glibc.patch
