[Pkg-ocaml-maint-commits] [SCM] perl4caml packaging branch, master, updated. debian/0.9.5-3-6-g38915c0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit fd0406a4e4377e588579a9d4c26be616adaeca94
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jun 4 13:37:51 2010 +0200

    Add 0003-Fix-for-Perl-5.12-SVt_RV-missing.patch (Closes: #578800)

diff --git a/debian/patches/0003-Fix-for-Perl-5.12-SVt_RV-missing.patch b/debian/patches/0003-Fix-for-Perl-5.12-SVt_RV-missing.patch
new file mode 100644
index 0000000..bab3c38
--- /dev/null
+++ b/debian/patches/0003-Fix-for-Perl-5.12-SVt_RV-missing.patch
@@ -0,0 +1,51 @@
+From: Iain Arnell <iarnell at gmail.com>
+Date: Wed, 2 Jun 2010 17:34:43 +0100
+Subject: [PATCH] Fix for Perl 5.12: SVt_RV missing.
+
+Also reported as the following Debian bug:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578800
+
+Comment from the author of this patch:
+"It seems simplest to pretend that SVt_RV still exists on the caml
+side; attached patch will do just that."
+
+Commit taken from upstream Git repository.
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ perl_c.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/perl_c.c b/perl_c.c
+index 7970a81..66f2959 100644
+--- a/perl_c.c
++++ b/perl_c.c
+@@ -199,12 +199,17 @@ perl4caml_sv_no (value unit)
+ static int
+ sv_type (SV *sv)
+ {
++#if PERL_VERSION >= 11
++  if (SvROK(sv)) return 4;
++#endif
+   switch (SvTYPE (sv))
+     {
+     case SVt_IV: return 1;
+     case SVt_NV: return 2;
+     case SVt_PV: return 3;
++#if PERL_VERSION < 11
+     case SVt_RV: return 4;
++#endif
+     case SVt_PVAV: return 5;
+     case SVt_PVHV: return 6;
+     case SVt_PVCV: return 7;
+@@ -302,7 +307,9 @@ perl4caml_deref (value svv)
+   case SVt_IV:
+   case SVt_NV:
+   case SVt_PV:
++#if PERL_VERSION < 11
+   case SVt_RV:
++#endif
+   case SVt_PVMG:
+     break;
+   default:
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index e62ac54..9445804 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix-Makefile-to-detect-ocamlopt.patch
 0002-Disable-libnet-google-perl-wrappers.patch
+0003-Fix-for-Perl-5.12-SVt_RV-missing.patch

-- 
perl4caml packaging