Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package freefem++ [ Reason ] Fix the FTBFS RC bug #957233 (fail to build with GCC-10) [ Impact ] The package is usable again. [ Tests ] Manual tests. [ Risks ] No other package depends on freefem++, so impact and risk are low. [ Checklist ] [X] all changes are documented in the d/changelog [X] I reviewed all changes and I approve them [X] attach debdiff against the package in testing [ Other info ] The package is very active upstream. I've attached the debdiff against the package in stable because the one in testing has been removed due to the RC bug #957233. unblock freefem++/3.61.1+dfsg1-6 -- System Information: Debian Release: 10.9 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable-debug'), (500, 'stable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.19.0-16-amd64 (SMP w/16 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash
diff -Nru freefem++-3.61.1+dfsg1/debian/changelog freefem++-3.61.1+dfsg1/debian/changelog --- freefem++-3.61.1+dfsg1/debian/changelog 2019-01-06 22:28:01.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/changelog 2021-05-13 14:06:33.000000000 +0200 @@ -1,3 +1,27 @@ +freefem++ (3.61.1+dfsg1-6) unstable; urgency=high + + * Team upload. + * Fix FTBFS with GCC-10 (Closes: #957233) + + -- Francois Mazen <franc...@mzf.fr> Thu, 13 May 2021 14:06:33 +0200 + +freefem++ (3.61.1+dfsg1-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with gsl 2.6 (Closes: #960010) + + -- Stefano Rivera <stefa...@debian.org> Sun, 17 May 2020 13:41:04 -0700 + +freefem++ (3.61.1+dfsg1-5) unstable; urgency=medium + + * Team upload. + * Build-Depends non-versioned libpetsc-real-dev and libpetsc-complex-dev + Closes: #939663 + * debhelper-compat 12 + * Rework manual changes in source tree to quilt patches + + -- Andreas Tille <ti...@debian.org> Sat, 05 Oct 2019 09:21:24 +0200 + freefem++ (3.61.1+dfsg1-4) unstable; urgency=medium * Enforce BD to libpetsc-(real,complex)3.10-dev (Closes: #917977) diff -Nru freefem++-3.61.1+dfsg1/debian/compat freefem++-3.61.1+dfsg1/debian/compat --- freefem++-3.61.1+dfsg1/debian/compat 2018-08-05 12:33:22.000000000 +0200 +++ freefem++-3.61.1+dfsg1/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -11 diff -Nru freefem++-3.61.1+dfsg1/debian/control freefem++-3.61.1+dfsg1/debian/control --- freefem++-3.61.1+dfsg1/debian/control 2019-01-06 22:23:45.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/control 2021-05-13 14:06:33.000000000 +0200 @@ -4,7 +4,7 @@ Dimitrios Eftaxiopoulos <eftax...@otenet.gr> Section: science Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 12), libsuperlu-dev, gawk, gfortran, @@ -42,15 +42,15 @@ coinor-libipopt-dev, libgmm++-dev, libtet1.5-dev, - libpetsc-real3.10-dev, - libpetsc-complex3.10-dev + libpetsc-real-dev, + libpetsc-complex-dev # libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint, # libparms2-dev, libitsol-dev, # libhips-dev, libpastix-dev, # libsuperlu-dist-dev -Standards-Version: 4.3.0.1 -Vcs-Git: https://salsa.debian.org/science-team/freefempp.git +Standards-Version: 4.4.1 Vcs-Browser: https://salsa.debian.org/science-team/freefempp +Vcs-Git: https://salsa.debian.org/science-team/freefempp.git Homepage: http://www.freefem.org/ff++/ Package: freefem++ diff -Nru freefem++-3.61.1+dfsg1/debian/.gitlab-ci.yml freefem++-3.61.1+dfsg1/debian/.gitlab-ci.yml --- freefem++-3.61.1+dfsg1/debian/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/.gitlab-ci.yml 2021-05-13 14:06:33.000000000 +0200 @@ -0,0 +1,2 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml diff -Nru freefem++-3.61.1+dfsg1/debian/patches/double-cblas-import.patch freefem++-3.61.1+dfsg1/debian/patches/double-cblas-import.patch --- freefem++-3.61.1+dfsg1/debian/patches/double-cblas-import.patch 1970-01-01 01:00:00.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/patches/double-cblas-import.patch 2021-05-13 14:06:33.000000000 +0200 @@ -0,0 +1,25 @@ +Description: Avoid FTBFS with gsl 2.6 by including 2 incompatible cblas headers +Bug-Debian: https://bugs.debian.org/960010 +Author: Frederic Hecht <frederic.he...@upmc.fr> +Origin: upstream, https://github.com/FreeFem/FreeFem-sources/commit/3bfe3eb669c580583e9290474614b45cee52a96c + +--- a/src/femlib/MatriceCreuse_tpl.hpp ++++ b/src/femlib/MatriceCreuse_tpl.hpp +@@ -12,7 +12,7 @@ + // test blas + // on MacOS9 under MWERKS + // cblas_ddot macos-9 is not +-#ifdef HAVE_CBLAS_H ++#ifdef HAVE_CBLAS_H_BUG + extern "C" { + #define FF_VERSION VERSION + #undef VERSION +@@ -21,7 +21,7 @@ + #define VERSION VERSION + } + #define WITHBLAS 1 +-#elif HAVE_VECLIB_CBLAS_H ++#elif HAVE_VECLIB_CBLAS_BUG + #include <vecLib/cblas.h> + #define WITHBLAS 1 + #endif diff -Nru freefem++-3.61.1+dfsg1/debian/patches/examples-bamg.patch freefem++-3.61.1+dfsg1/debian/patches/examples-bamg.patch --- freefem++-3.61.1+dfsg1/debian/patches/examples-bamg.patch 2018-08-08 01:34:28.000000000 +0200 +++ freefem++-3.61.1+dfsg1/debian/patches/examples-bamg.patch 2021-05-13 14:06:33.000000000 +0200 @@ -1,8 +1,10 @@ +Description: Fix perl interpreter path + --- a/examples-bamg/test/dotest.pl +++ b/examples-bamg/test/dotest.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -+#!/usrbin/perl ++#!/usr/bin/perl # ----- clean --- unlink <*.mesh>; unlink <*.am_fmt>; diff -Nru freefem++-3.61.1+dfsg1/debian/patches/examples++-load.patch freefem++-3.61.1+dfsg1/debian/patches/examples++-load.patch --- freefem++-3.61.1+dfsg1/debian/patches/examples++-load.patch 2018-08-08 02:03:08.000000000 +0200 +++ freefem++-3.61.1+dfsg1/debian/patches/examples++-load.patch 2021-05-13 14:06:33.000000000 +0200 @@ -1,6 +1,11 @@ +Author: Dimitrios Eftaxiopoulos <eftax...@otenet.gr> +Last-Update: Thu, 19 Dec 2013 22:38:49 +0200 +Bug-Debian: https://bugs.debian.org/730738 +Description: Correct architecture names for hurd and kfreebsd + --- a/examples++-load/load.link.in +++ b/examples++-load/load.link.in -@@ -228,7 +228,7 @@ +@@ -228,7 +228,7 @@ case "$WIN32$uu" in LIBS="'$b/libff.dll' $LIBS $DLL" # SUF=dll ;; @@ -9,16 +14,3 @@ SHARED="-shared" FLAGS='-fPIC';; # 64 bit Linux needs -fPIC (ALH) ---- a/examples++-load/Makefile.am -+++ b/examples++-load/Makefile.am -@@ -235,8 +235,8 @@ - sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\ - done - echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref -- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref -- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref -+ echo loadpath += \"$(prefix)/lib/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref -+ echo includepath += \"$(prefix)/include/freefem++/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref - $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir} - $(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir} - $(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir} diff -Nru freefem++-3.61.1+dfsg1/debian/patches/fix_all.edp.patch freefem++-3.61.1+dfsg1/debian/patches/fix_all.edp.patch --- freefem++-3.61.1+dfsg1/debian/patches/fix_all.edp.patch 1970-01-01 01:00:00.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/patches/fix_all.edp.patch 2021-05-13 14:06:33.000000000 +0200 @@ -0,0 +1,184 @@ +Description: Just another hack right into the source tree +Author: Andreas Tille <ti...@debian.org> ... giving up here to disassemble non-clean changes to source tree into sensible quilt patches + +--- freefem++-3.61.1+dfsg1.orig/examples++-3d/all.edp ++++ freefem++-3.61.1+dfsg1/examples++-3d/all.edp +@@ -7,62 +7,6 @@ verbosity=verbosityy;searchMethod=0; + verbosity=verbosityy;searchMethod=0; + { include "ArrayFE-3d.edp";}; + cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "EqPoisson.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Lac.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Lac.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Laplace-Adapt-3d.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Laplace-Adapt-aniso-3d.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Laplace3d.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "LaplaceRT-3d.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "NSI3d-carac.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "NSI3d.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Period-Poisson-cube-ballon.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Poisson-cube-ballon.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Poisson.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Poisson3d.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "Stokes.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +- cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl; +-verbosity=verbosityy;searchMethod=0; +-{ include "TruncLac.edp";}; +- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; + cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl; + verbosity=verbosityy;searchMethod=0; + { include "beam-3d.edp";}; +@@ -91,6 +35,10 @@ verbosity=verbosityy;searchMethod=0; + verbosity=verbosityy;searchMethod=0; + { include "cylinder.edp";}; + cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "EqPoisson.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; + cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl; + verbosity=verbosityy;searchMethod=0; + { include "fallingspheres.edp";}; +@@ -103,10 +51,38 @@ verbosity=verbosityy;searchMethod=0; + verbosity=verbosityy;searchMethod=0; + { include "intlevelset3d.edp";}; + cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Lac.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Lac.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Laplace3d.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Laplace-Adapt-3d.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Laplace-Adapt-aniso-3d.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "LaplaceRT-3d.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; + cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl; + verbosity=verbosityy;searchMethod=0; + { include "meditddm.edp";}; + cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "NSI3d-carac.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "NSI3d.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; + cout << "--------- file : p.edp --------------------------------------------------------" << endl; + verbosity=verbosityy;searchMethod=0; + { include "p.edp";}; +@@ -115,6 +91,22 @@ verbosity=verbosityy;searchMethod=0; + verbosity=verbosityy;searchMethod=0; + { include "periodic-3d.edp";}; + cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Period-Poisson-cube-ballon.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Poisson3d.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Poisson-cube-ballon.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Poisson.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; + cout << "--------- file : pyramide.edp --------------------------------------------------------" << endl; + verbosity=verbosityy;searchMethod=0; + { include "pyramide.edp";}; +@@ -139,6 +131,10 @@ verbosity=verbosityy;searchMethod=0; + verbosity=verbosityy;searchMethod=0; + { include "sphereincube.edp";}; + cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "Stokes.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; + cout << "--------- file : tetgencube.edp --------------------------------------------------------" << endl; + verbosity=verbosityy;searchMethod=0; + { include "tetgencube.edp";}; +@@ -147,3 +143,7 @@ verbosity=verbosityy;searchMethod=0; + verbosity=verbosityy;searchMethod=0; + { include "tetgenholeregion.edp";}; + cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; ++ cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl; ++verbosity=verbosityy;searchMethod=0; ++{ include "TruncLac.edp";}; ++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl; +--- freefem++-3.61.1+dfsg1.orig/examples++-load/Makefile.am ++++ freefem++-3.61.1+dfsg1/examples++-load/Makefile.am +@@ -235,8 +235,8 @@ install-exec-local:: load_compile WHERE_ + sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\ + done + echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref +- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref +- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref ++ echo loadpath += \"$(prefix)/lib/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref ++ echo includepath += \"$(prefix)/include/freefem++/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref + $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir} + $(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir} + $(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir} +--- freefem++-3.61.1+dfsg1.orig/src/fflib/strversionnumber.cpp ++++ freefem++-3.61.1+dfsg1/src/fflib/strversionnumber.cpp +@@ -18,6 +18,6 @@ string StrVersionNumber(){ + // buffer.precision(8); + // buffer<<VersionNumber(); + static char buffer[100]; +- sprintf(buffer," %9f (date Jeu 12 jul 2018 12:05:08 CEST)",VersionNumber()); +- return buffer; //.str()+" (date Jeu 12 jul 2018 12:05:08 CEST)" ; ++ sprintf(buffer," %9f (date Σαβ 08 Δεκ 2018 10:26:36 πμ EET)",VersionNumber()); ++ return buffer; //.str()+" (date Σαβ 08 Δεκ 2018 10:26:36 πμ EET)" ; + } diff -Nru freefem++-3.61.1+dfsg1/debian/patches/fix_gcc10_build_errors.patch freefem++-3.61.1+dfsg1/debian/patches/fix_gcc10_build_errors.patch --- freefem++-3.61.1+dfsg1/debian/patches/fix_gcc10_build_errors.patch 1970-01-01 01:00:00.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/patches/fix_gcc10_build_errors.patch 2021-05-13 14:06:33.000000000 +0200 @@ -0,0 +1,74 @@ +Description: Fix FTBFS with GCC-10, see bug #957233 +Author: Francois Mazen <franc...@mzf.fr> +Forwarded: not-needed + +--- a/src/lglib/lg.ypp ++++ b/src/lglib/lg.ypp +@@ -441,9 +441,9 @@ + | FESPACE ID { $$=Find($1);} + | FESPACE1 ID { $$=Find($1);} + | FESPACE3 ID { $$=Find($1);} +- | ID '=' no_set_expr { $$=make_pair<const char *,const C_F0>($1,$3);} ++ | ID '=' no_set_expr { $$=make_pair<const char *,const C_F0>((const char *) $1,(C_F0) $3);} + | parameters_list ',' no_set_expr { $$ = ($1 += $3);} +- | parameters_list ',' id '=' no_set_expr { $$= ($1+= make_pair<const char *,const C_F0>($3,$5));} ++ | parameters_list ',' id '=' no_set_expr { $$= ($1+= make_pair<const char *,const C_F0>((const char *) $3,(C_F0) $5));} + ; + + type_of_dcl: TYPE +@@ -689,7 +689,7 @@ + | FESPACE {$$ = Find($1);} /*[[file:../fflib/AFunction2.cpp::Find]]*/ + | FESPACE1 {$$ = Find($1);} + | FESPACE3 {$$ = Find($1);} +- | id /*[[id]]*/ '=' no_set_expr /*[[no_set_expr:]]*/ {$$ = make_pair<const char *,const C_F0>($1,$3);} ++ | id /*[[id]]*/ '=' no_set_expr /*[[no_set_expr:]]*/ {$$ = make_pair<const char *,const C_F0>((const char *) $1,(C_F0) $3);} + | sub_script_expr /*[[sub_script_expr:]]*/ {$$ = $1;} + | parameters ',' FESPACE {$$ = ($1 += Find($3));} + | parameters ',' FESPACE1 {$$ = ($1 += Find($3));} +@@ -697,7 +697,7 @@ + | parameters ',' sub_script_expr /*[[sub_script_expr:]]*/ {$$ = ($1 += $3);} + + /* <<named_function_parameters>> */ +- | parameters ',' id '=' no_set_expr /*[[no_set_expr:]]*/ {$$ = ($1+= make_pair<const char *,const C_F0>($3,$5));} ++ | parameters ',' id '=' no_set_expr /*[[no_set_expr:]]*/ {$$ = ($1+= make_pair<const char *,const C_F0>((const char *)$3,(C_F0) $5));} + ; + + array: no_comma_expr {$$=$1;} +--- a/src/lglib/lg.tab.cpp ++++ b/src/lglib/lg.tab.cpp +@@ -2341,7 +2341,7 @@ + + case 39: + #line 444 "lg.ypp" +- { (yyval.args)=make_pair<const char *,const C_F0>((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].cexp));;} ++ { (yyval.args)=make_pair<const char *,const C_F0>((const char *) (yyvsp[(1) - (3)].str),(C_F0) (yyvsp[(3) - (3)].cexp));;} + break; + + case 40: +@@ -2351,7 +2351,7 @@ + + case 41: + #line 446 "lg.ypp" +- { (yyval.args)= ((yyvsp[(1) - (5)].args)+= make_pair<const char *,const C_F0>((yyvsp[(3) - (5)].str),(yyvsp[(5) - (5)].cexp)));;} ++ { (yyval.args)= ((yyvsp[(1) - (5)].args)+= make_pair<const char *,const C_F0>((const char *) (yyvsp[(3) - (5)].str),(C_F0) (yyvsp[(5) - (5)].cexp)));;} + break; + + case 43: +@@ -2953,7 +2953,7 @@ + + case 161: + #line 692 "lg.ypp" +- {(yyval.args) = make_pair<const char *,const C_F0>((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].cexp));;} ++ {(yyval.args) = make_pair<const char *,const C_F0>((const char *) (yyvsp[(1) - (3)].str),(C_F0)(yyvsp[(3) - (3)].cexp));;} + break; + + case 162: +@@ -2983,7 +2983,7 @@ + + case 167: + #line 700 "lg.ypp" +- {(yyval.args) = ((yyvsp[(1) - (5)].args)+= make_pair<const char *,const C_F0>((yyvsp[(3) - (5)].str),(yyvsp[(5) - (5)].cexp)));;} ++ {(yyval.args) = ((yyvsp[(1) - (5)].args)+= make_pair<const char *,const C_F0>((const char *) (yyvsp[(3) - (5)].str),(C_F0)(yyvsp[(5) - (5)].cexp)));;} + break; + + case 168: diff -Nru freefem++-3.61.1+dfsg1/debian/patches/gmm_cxxflags.patch freefem++-3.61.1+dfsg1/debian/patches/gmm_cxxflags.patch --- freefem++-3.61.1+dfsg1/debian/patches/gmm_cxxflags.patch 1970-01-01 01:00:00.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/patches/gmm_cxxflags.patch 2021-05-13 14:06:33.000000000 +0200 @@ -0,0 +1,38 @@ +Author: Andreas Tille <ti...@debian.org> +Last-Update: Sat, 05 Oct 2019 08:02:23 +0200 +Description: This change was done inside master branch of + packaging dir. Its now provided as quilt patch. + It is adding some hardening flags and provides correct + PATH to binaries + +--- a/download/gmm/cxxflags ++++ b/download/gmm/cxxflags +@@ -1,16 +1,16 @@ +-CXX = g++ +-MPICXX = /usr/local/ff++/openmpi-2.1/bin/mpic++ +-ac_ct_CXX = g++ +-CC = gcc +-H5CC = /usr/local/ff++/openmpi-2.1/bin/h5cc +-HDF5_CC = clang +-MPICC = /usr/local/ff++/openmpi-2.1/bin/mpicc ++CXX = g++ -Wl,-z,relro -Wl,--as-needed ++MPICXX = mpic++ -Wl,-z,relro -Wl,--as-needed ++ac_ct_CXX = ++CC = gcc -Wl,-z,relro -Wl,--as-needed ++H5CC = /usr/bin/h5cc ++HDF5_CC = gcc ++MPICC = /usr/bin/mpicc + YACC = bison -y +-ac_ct_CC = gcc +-CXXFLAGS = -Wno-undefined-var-template -m64 -fPIC -DNDEBUG -O3 -O3 -O3 -DBAMG_LONG_LONG -DNCHECKPTR -fPIC +-CFLAGS = -g -m64 -fPIC -DNDEBUG -O3 -O3 -O3 -fPIC +-FCFLAGS = -g -fPIC +-GSL_CFLAGS = -I/usr/local/ff++/openmpi-2.1/include ++ac_ct_CC = gcc -Wl,-z,relro -Wl,--as-needed ++CXXFLAGS = -g -fstack-protector-strong -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -mavx -DBAMG_LONG_LONG -DNCHECKPTR -fPIC ++CFLAGS = -g -fstack-protector-strong -Wformat -Werror=format-security -Wall -pedantic -DNDEBUG -O3 -mmmx -mavx -fPIC ++FCFLAGS = -g -O2 -fstack-protector-strong -fPIC ++GSL_CFLAGS = -I/usr/include + HDF5_CFLAGS = + WGET = wget --no-check-certificate + WIN32DLLTARGET = diff -Nru freefem++-3.61.1+dfsg1/debian/patches/series freefem++-3.61.1+dfsg1/debian/patches/series --- freefem++-3.61.1+dfsg1/debian/patches/series 2018-12-08 09:11:54.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/patches/series 2021-05-13 14:06:33.000000000 +0200 @@ -1,3 +1,7 @@ +gmm_cxxflags.patch examples-bamg.patch examples++-load.patch src_fflib.patch +fix_all.edp.patch +double-cblas-import.patch +fix_gcc10_build_errors.patch diff -Nru freefem++-3.61.1+dfsg1/debian/patches/src_fflib.patch freefem++-3.61.1+dfsg1/debian/patches/src_fflib.patch --- freefem++-3.61.1+dfsg1/debian/patches/src_fflib.patch 2018-12-08 09:21:05.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/patches/src_fflib.patch 2021-05-13 14:06:33.000000000 +0200 @@ -1,7 +1,12 @@ -Fix compilation with gcc-8/g++-8 +Author: Dimitrios Eftaxiopoulos <eftax...@otenet.gr> +Last-Update: Sat, 08 Dec 2018 11:04:55 +0200 +Bug-Debian: https://bugs.debian.org/897751 + https://bugs.debian.org/915732 +Desciption: Fix compilation with gcc-8/g++-8 + --- a/src/fflib/problem.cpp +++ b/src/fflib/problem.cpp -@@ -5810,7 +5810,7 @@ +@@ -5810,7 +5810,7 @@ TypeSolveMat::TSolveMat TypeSolveMat::d template<class R,class FESpace,class v_fes> @@ -10,7 +15,7 @@ MatriceCreuse< typename CadnaType<R>::Scalaire > * & cadnamat ) const { typedef typename FESpace::Mesh Mesh; -@@ -6123,6 +6123,11 @@ +@@ -6123,6 +6123,11 @@ AnyType Problem::eval(Stack stack,Data<F return SetAny<const Problem *>(this); } diff -Nru freefem++-3.61.1+dfsg1/debian/results.txt freefem++-3.61.1+dfsg1/debian/results.txt --- freefem++-3.61.1+dfsg1/debian/results.txt 2018-12-08 10:17:16.000000000 +0100 +++ freefem++-3.61.1+dfsg1/debian/results.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# Automatically generated -# duptype id depth size device inode priority name -DUPTYPE_FIRST_OCCURRENCE 1 0 118953320 2069 13241115 5 debian/tmp/usr/bin/FreeFem++ -DUPTYPE_WITHIN_SAME_TREE -1 0 118953320 2069 13241159 5 debian/tmp/usr/bin/FreeFem++-nw -# end of file diff -Nru freefem++-3.61.1+dfsg1/debian/watch freefem++-3.61.1+dfsg1/debian/watch --- freefem++-3.61.1+dfsg1/debian/watch 2016-04-24 14:39:53.000000000 +0200 +++ freefem++-3.61.1+dfsg1/debian/watch 2021-05-13 14:06:33.000000000 +0200 @@ -1,4 +1,6 @@ version=4 -opts="dversionmangle=s/\+dfsg\d*$//, repacksuffix=+dfsg1, \ - uversionmangle=s/-/./g" \ - http://www.freefem.org/ff++/ftp/ freefem\+\+-(.+)\.tar\.gz \ Pas de fin de ligne à la fin du fichier +opts="dversionmangle=s/\+dfsg\d*$//, \ + repacksuffix=+dfsg1, \ + uversionmangle=s/-/./g, \ + filenamemangle=s/.+\/v?(3\S+)\.tar\.gz/freefem\+\+-(.+)\.tar\.gz/ \" + https://github.com/FreeFem/FreeFem-sources/releases .*/v?(3\S+)\.tar\.gz