[micropolis-activity] 08/09: Add remove-matherr.patch and work around a FTBFS.

Markus Koschany apo at moszumanska.debian.org
Tue Mar 13 20:57:25 UTC 2018


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository micropolis-activity.

commit 4b15b7d27135ff78ba95cc29a63ee6afb6986d2a
Author: Markus Koschany <apo at debian.org>
Date:   Tue Mar 13 21:43:23 2018 +0100

    Add remove-matherr.patch and work around a FTBFS.
---
 debian/changelog                    |  1 +
 debian/patches/remove-matherr.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e12e74f..bcb510b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ micropolis-activity (0.0.20071228-9) unstable; urgency=medium
   * Drop deprecated menu file and xpm icon. Remove imagemagick from B-D.
   * Use https for Format field.
   * Use secure VCS-URI.
+  * Add remove-matherr.patch and work around a FTBFS.
 
  -- Markus Koschany <apo at debian.org>  Tue, 13 Mar 2018 20:32:14 +0100
 
diff --git a/debian/patches/remove-matherr.patch b/debian/patches/remove-matherr.patch
new file mode 100644
index 0000000..c6bb1a1
--- /dev/null
+++ b/debian/patches/remove-matherr.patch
@@ -0,0 +1,31 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 13 Mar 2018 21:42:31 +0100
+Subject: remove matherr
+
+Work around "tclxmerr.c:40:30: error: dereferencing pointer to incomplete type
+'struct exception'"
+
+---
+ src/tclx/src/tclxmerr.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/src/tclx/src/tclxmerr.c b/src/tclx/src/tclxmerr.c
+index dc3596b..06aad3a 100644
+--- a/src/tclx/src/tclxmerr.c
++++ b/src/tclx/src/tclxmerr.c
+@@ -33,15 +33,6 @@
+  *
+  *-----------------------------------------------------------------------------
+  */
+-int
+-matherr (except)
+-    struct exception *except;
+-{
+-    if (Tcl_MathError (except->name, except->type))
+-        return 1;
+-    else
+-        return 0;
+-}
+ 
+ #else
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 900caed..3786a63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ micropolis-path.patch
 makefile.patch
 clang-FTBFS.patch
 glibc-2.27.patch
+remove-matherr.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/micropolis-activity.git



More information about the Pkg-games-commits mailing list