Package: mgltools-gle
Version: 1.5.7~rc1+cvs.20140424-1
Followup-For: Bug #813065
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* typemap-comments.patch: Fix FTBFS with stricter new swig (LP: #1562470)
Turns out the FTBFS was just a result of using an incorrect comment style
in the code which the newer swig is stricter about. This patch fixes that.
... Adam
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety
APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-21-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru mgltools-gle-1.5.7~rc1+cvs.20140424/debian/patches/series mgltools-gle-1.5.7~rc1+cvs.20140424/debian/patches/series
--- mgltools-gle-1.5.7~rc1+cvs.20140424/debian/patches/series 1969-12-31 17:00:00.0 -0700
+++ mgltools-gle-1.5.7~rc1+cvs.20140424/debian/patches/series 2016-04-30 22:22:43.0 -0600
@@ -0,0 +1 @@
+typemap-comments.patch
diff -Nru mgltools-gle-1.5.7~rc1+cvs.20140424/debian/patches/typemap-comments.patch mgltools-gle-1.5.7~rc1+cvs.20140424/debian/patches/typemap-comments.patch
--- mgltools-gle-1.5.7~rc1+cvs.20140424/debian/patches/typemap-comments.patch 1969-12-31 17:00:00.0 -0700
+++ mgltools-gle-1.5.7~rc1+cvs.20140424/debian/patches/typemap-comments.patch 2016-04-30 22:23:05.0 -0600
@@ -0,0 +1,42 @@
+Description: Fix FTBFS with stricter new swig
+Author: Adam Conrad
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1562470
+
+--- mgltools-gle-1.5.7~rc1+cvs.20140424.orig/gle/gle.i
mgltools-gle-1.5.7~rc1+cvs.20140424/gle/gle.i
+@@ -149,7 +149,7 @@ glePolyCone_c4f (int npoints, /* numpoi
+gleColor4f color_array[1], /* colors at polyline verts */
+gleDouble radius_array[1]); /* cone radii at polyline verts */
+
+-#typemaps for Numeric arrays
++/* typemaps for Numeric arrays */
+ DOUBLE_ARRAY2D( contour, [1][2], ncp )
+ %apply double ARRAY2D[ANY][ANY] { double cont_normal[1][2] };
+ %apply double VECTOR_NULL[ANY] { double up[3] };
+@@ -172,7 +172,7 @@ gleExtrusion_c4f (int ncp, /* nu
+ gleDouble point_array[1][3], /* polyline vertices */
+ gleColor4f color_array[1]); /* colors at polyline verts */
+
+-#typemaps for Numeric arrays
++/* typemaps for Numeric arrays */
+ %apply double VECTOR[ANY] { double twist_array[1] };
+
+ /* extrude 2D contour, specifying local rotations (twists) */
+@@ -195,7 +195,7 @@ gleTwistExtrusion_c4f (int ncp,
+ gleDouble twist_array[1]); /* countour twists (in degrees) */
+
+
+-#typemaps for Numeric arrays
++/* typemaps for Numeric arrays */
+ %apply double ARRAY3D_NULL[ANY][ANY][ANY] { double xform_array[1][2][3] };
+
+ /* extrude 2D contour, specifying local affine tranformations */
+@@ -218,7 +218,7 @@ gleSuperExtrusion_c4f (int ncp, /* numb
+ gleColor4f color_array[1],/* color at polyline verts */
+ gleDouble xform_array[1][2][3]); /* 2D contour xforms */
+
+-#typemaps for Numeric arrays
++/* typemaps for Numeric arrays */
+ %apply double ARRAY2D_NULL[ANY][ANY] { double startXform[2][3] };
+ %apply double ARRAY2D_NULL[ANY][ANY] { double dXformdTheta[2][3] };
+