[Pkg-ocaml-maint-commits] r1811 - in trunk/packages/cairo-ocaml/trunk/debian: . patches

[Samuel Mimram]

Author: smimram-guest
Date: 2005-10-07 19:40:47 +0000 (Fri, 07 Oct 2005)
New Revision: 1811

Added:
   trunk/packages/cairo-ocaml/trunk/debian/patches/not_align_double.dpatch
Removed:
   trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch
Modified:
   trunk/packages/cairo-ocaml/trunk/debian/changelog
   trunk/packages/cairo-ocaml/trunk/debian/patches/00list
Log:
Fix various issues in upstream source code.

Modified: trunk/packages/cairo-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/changelog	2005-10-03 21:41:22 UTC (rev 1810)
+++ trunk/packages/cairo-ocaml/trunk/debian/changelog	2005-10-07 19:40:47 UTC (rev 1811)
@@ -1,3 +1,11 @@
+cairo-ocaml (20050918-5) unstable; urgency=low
+
+  * The code breakage on archs where ARCH_ALIGN_DOUBLE is not defined was
+    deeper than I thought. The not_align_double.dpatch patch was tested and
+    should really solve the FTBS.
+
+ -- Samuel Mimram <smimram at debian.org>  Fri,  7 Oct 2005 21:32:22 +0200
+
 cairo-ocaml (20050918-4) unstable; urgency=low
 
   * Updated caml_stat.dpatch to correct a mission semicolon.

Modified: trunk/packages/cairo-ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/00list	2005-10-03 21:41:22 UTC (rev 1810)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/00list	2005-10-07 19:40:47 UTC (rev 1811)
@@ -1 +1 @@
-caml_stat
+not_align_double

Deleted: trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch	2005-10-03 21:41:22 UTC (rev 1810)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch	2005-10-07 19:40:47 UTC (rev 1811)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## caml_stat.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use the new caml names convention (functions should be prefixed by
-## DP: caml_).
-
- at DPATCH@
-diff -urNad cairo-ocaml-20050918~/src/ml_cairo.c cairo-ocaml-20050918/src/ml_cairo.c
---- cairo-ocaml-20050918~/src/ml_cairo.c	2005-09-30 23:28:37.000000000 +0200
-+++ cairo-ocaml-20050918/src/ml_cairo.c	2005-09-30 23:29:13.000000000 +0200
-@@ -70,11 +70,11 @@
- 		  Double_array_length (d), Double_val (off));
- #else
-   int i, ndash = Double_array_length (d);
--  double *dashes = stat_alloc (ndash * sizeof (double));
--  for (i = 0; i < ndash, i++)
-+  double *dashes = caml_stat_alloc (ndash * sizeof (double));
-+  for (i = 0; i < ndash; i++)
-     dashes[i] = Double_field (d, i);
-   cairo_set_dash (cairo_t_val (cr), dashes, ndash, Double_val (off));
--  stat_free (dashes);
-+  caml_stat_free (dashes);
- #endif
-   check_cairo_status (cr);
-   return Val_unit;

Copied: trunk/packages/cairo-ocaml/trunk/debian/patches/not_align_double.dpatch (from rev 1801, trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch)
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/caml_stat.dpatch	2005-09-30 21:33:24 UTC (rev 1801)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/not_align_double.dpatch	2005-10-07 19:40:47 UTC (rev 1811)
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## not_align_double.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix various code issues on archs where ARCH_ALIGN_DOUBLE is not defined,
+## DP: obviously this code was not tested recently...
+
+ at DPATCH@
+diff -urNad cairo-ocaml-20050918~/src/ml_cairo.c cairo-ocaml-20050918/src/ml_cairo.c
+--- cairo-ocaml-20050918~/src/ml_cairo.c	2005-10-06 13:50:14.000000000 +0200
++++ cairo-ocaml-20050918/src/ml_cairo.c	2005-10-06 13:50:17.000000000 +0200
+@@ -70,11 +70,11 @@
+ 		  Double_array_length (d), Double_val (off));
+ #else
+   int i, ndash = Double_array_length (d);
+-  double *dashes = stat_alloc (ndash * sizeof (double));
+-  for (i = 0; i < ndash, i++)
++  double *dashes = caml_stat_alloc (ndash * sizeof (double));
++  for (i = 0; i < ndash; i++)
+     dashes[i] = Double_field (d, i);
+   cairo_set_dash (cairo_t_val (cr), dashes, ndash, Double_val (off));
+-  stat_free (dashes);
++  caml_stat_free (dashes);
+ #endif
+   check_cairo_status (cr);
+   return Val_unit;
+diff -urNad cairo-ocaml-20050918~/src/ml_cairo_matrix.c cairo-ocaml-20050918/src/ml_cairo_matrix.c
+--- cairo-ocaml-20050918~/src/ml_cairo_matrix.c	2005-09-18 20:18:51.000000000 +0200
++++ cairo-ocaml-20050918/src/ml_cairo_matrix.c	2005-10-06 13:50:53.000000000 +0200
+@@ -87,7 +87,7 @@
+ #else
+   cairo_matrix_t mat;
+   ml_convert_cairo_matrix_in (m, &mat);
+-  cairo_matrix_rotate (&mat, Double_val (a);
++  cairo_matrix_rotate (&mat, Double_val (a));
+   return ml_convert_cairo_matrix_out (&mat);
+ #endif
+ }
+diff -urNad cairo-ocaml-20050918~/src/ml_cairo_pattern.c cairo-ocaml-20050918/src/ml_cairo_pattern.c
+--- cairo-ocaml-20050918~/src/ml_cairo_pattern.c	2005-10-06 13:50:14.000000000 +0200
++++ cairo-ocaml-20050918/src/ml_cairo_pattern.c	2005-10-06 13:50:17.000000000 +0200
+@@ -85,7 +85,7 @@
+   cairo_matrix_t mat;
+   cairo_pattern_get_matrix (cairo_pattern_t_val (p), &mat);
+   check_pattern_status (p);
+-  return ml_convert_cairo_matrix_out (m, &mat);
++  return ml_convert_cairo_matrix_out (&mat);
+ #else
+   CAMLparam1(p);
+   value m = caml_alloc_small (6 * Double_wosize, Double_array_tag);