[SCM] FreeFem++ packaging branch, master, updated. debian/3.19-1-1-g5937bf9
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Sun May 13 03:17:04 UTC 2012
The following commit has been merged in the master branch:
commit 5937bf9ecb8198ec2840da1b2d99620686258de3
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sun May 13 06:17:21 2012 +0300
Fix FTBFS due to new g++-4.7
diff --git a/debian/changelog b/debian/changelog
index 57778d2..291378a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ freefem++ (3.19-1) unstable; urgency=low
* New upstream release.
* Add libmumps-seq-dev to build-deps.
* Update standards version to 3.9.3.
+ * Fix FTBFS due to new g++-4.7 (Closes: #672612).
- -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sun, 1 May 2012 18:52:00 +0200
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sun, 12 May 2012 03:59:00 +0200
freefem++ (3.18.1-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index a154e82..93aace4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+src-Graphics-sansgraph-cpp.patch
+src-Graphics-xglrgraf-cpp.patch
examples++-load-Makefile.patch
examples++-load-load-link-in.patch
examples-bamg-test-dotest-pl.patch
diff --git a/debian/patches/src-Graphics-sansgraph-cpp.patch b/debian/patches/src-Graphics-sansgraph-cpp.patch
new file mode 100644
index 0000000..25819b8
--- /dev/null
+++ b/debian/patches/src-Graphics-sansgraph-cpp.patch
@@ -0,0 +1,11 @@
+Fix FTBFS due to recent g++-4.7
+--- a/src/Graphics/sansrgraph.cpp
++++ b/src/Graphics/sansrgraph.cpp
+@@ -34,6 +34,7 @@
+ #include <iostream>
+ #include <cassert>
+ #include "rgraph.hpp"
++#include <unistd.h>
+
+ #include "error.hpp"
+ #ifdef macintoshxx
diff --git a/debian/patches/src-Graphics-xglrgraf-cpp.patch b/debian/patches/src-Graphics-xglrgraf-cpp.patch
new file mode 100644
index 0000000..0696c68
--- /dev/null
+++ b/debian/patches/src-Graphics-xglrgraf-cpp.patch
@@ -0,0 +1,9 @@
+Fix FTBFS due to g++-4.7
+--- a/src/Graphics/xglrgraf.cpp
++++ b/src/Graphics/xglrgraf.cpp
+@@ -27,4 +27,5 @@
+ */
+ #define XGL
+ #define FF_GRAPH_SET_PTR
++#include <unistd.h>
+ #include "glrgraph.hpp"
diff --git a/download/ipopt/config.log b/download/ipopt/config.log
index 3c244a7..f9532c0 100644
--- a/download/ipopt/config.log
+++ b/download/ipopt/config.log
@@ -49,3 +49,105 @@ generated by GNU Autoconf 2.68. Invocation command line was
on filippos
config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile.inc.in
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile.inc.in
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile.inc.in
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile.inc.in
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile.inc.in
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile.inc.in
+
+on filippos
+
+config.status:1059: creating Makefile.inc
diff --git a/download/mumps-seq/config.log b/download/mumps-seq/config.log
index 6c8f5c9..a60a7be 100644
--- a/download/mumps-seq/config.log
+++ b/download/mumps-seq/config.log
@@ -49,3 +49,105 @@ generated by GNU Autoconf 2.68. Invocation command line was
on filippos
config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile-mumps-4.10.0.inc
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile-mumps-4.10.0.inc
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile-mumps-4.10.0.inc
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile-mumps-4.10.0.inc
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile-mumps-4.10.0.inc
+
+on filippos
+
+config.status:1059: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Makefile.inc:Makefile-mumps-4.10.0.inc
+
+on filippos
+
+config.status:1059: creating Makefile.inc
diff --git a/download/nlopt/config.log b/download/nlopt/config.log
index 63cbbd7..de06f41 100644
--- a/download/nlopt/config.log
+++ b/download/nlopt/config.log
@@ -134,3 +134,105 @@ generated by GNU Autoconf 2.68. Invocation command line was
on filippos
config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.19, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
diff --git a/src/Graphics/sansrgraph.cpp b/src/Graphics/sansrgraph.cpp
index a9cf475..f2305df 100644
--- a/src/Graphics/sansrgraph.cpp
+++ b/src/Graphics/sansrgraph.cpp
@@ -34,6 +34,7 @@ using namespace std;
#include <iostream>
#include <cassert>
#include "rgraph.hpp"
+#include <unistd.h>
#include "error.hpp"
#ifdef macintoshxx
diff --git a/src/Graphics/xglrgraf.cpp b/src/Graphics/xglrgraf.cpp
index eb64a34..5ef17c4 100644
--- a/src/Graphics/xglrgraf.cpp
+++ b/src/Graphics/xglrgraf.cpp
@@ -27,4 +27,5 @@
*/
#define XGL
#define FF_GRAPH_SET_PTR
+#include <unistd.h>
#include "glrgraph.hpp"
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list