On Sun, Apr 05, 2020 at 07:37:28PM +0200, Alberto Garcia wrote:
> The attached patch fixes the build. The latest upstream release
> candidate still uses the old symbol btw.

I'm also attaching the full debdiff.

Berto
diff -Nru tree-puzzle-5.2/debian/changelog tree-puzzle-5.2/debian/changelog
--- tree-puzzle-5.2/debian/changelog	2018-10-16 11:06:43.000000000 +0200
+++ tree-puzzle-5.2/debian/changelog	2020-04-19 15:29:52.000000000 +0200
@@ -1,3 +1,11 @@
+tree-puzzle (5.2-11.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/fix-mpi3-build.patch:
+    - Fix FTBFS due to the new MPI-3.0 API (Closes: #951984).
+
+ -- Alberto Garcia <be...@igalia.com>  Sun, 19 Apr 2020 15:29:52 +0200
+
 tree-puzzle (5.2-11) unstable; urgency=medium
 
   * debhelper 11
diff -Nru tree-puzzle-5.2/debian/patches/fix-mpi3-build.patch tree-puzzle-5.2/debian/patches/fix-mpi3-build.patch
--- tree-puzzle-5.2/debian/patches/fix-mpi3-build.patch	1970-01-01 01:00:00.000000000 +0100
+++ tree-puzzle-5.2/debian/patches/fix-mpi3-build.patch	2020-04-19 15:26:28.000000000 +0200
@@ -0,0 +1,22 @@
+From: Alberto Garcia <be...@igalia.com>
+Subject: Replace obsolete MPI-2.0 API with their MPI-3.0 equivalents
+Bug-Debian: https://bugs.debian.org/951984
+Index: tree-puzzle-5.2/src/ppuzzle.c
+===================================================================
+--- tree-puzzle-5.2.orig/src/ppuzzle.c
++++ tree-puzzle-5.2/src/ppuzzle.c
+@@ -21,11 +21,14 @@
+ #endif
+ 
+ #define EXTERN extern
++#define OMPI_OMIT_MPI1_COMPAT_DECLS 1
+  
+ #include <mpi.h>
+ #include <time.h>
+ #include "ppuzzle.h"
+  
++#define MPI_Address MPI_Get_address
++#define MPI_Type_struct MPI_Type_create_struct
+ 
+ int PP_IamMaster;
+ int PP_IamSlave;
diff -Nru tree-puzzle-5.2/debian/patches/series tree-puzzle-5.2/debian/patches/series
--- tree-puzzle-5.2/debian/patches/series	2018-10-16 11:06:43.000000000 +0200
+++ tree-puzzle-5.2/debian/patches/series	2020-04-19 15:26:28.000000000 +0200
@@ -1,3 +1,4 @@
 20_no_copy_of_sprng.patch
 tests-need-bash.patch
 spelling.patch
+fix-mpi3-build.patch

Reply via email to