[libsereal-decoder-perl] 01/02: replace my patch with a newer one from upstream

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libsereal-decoder-perl.

commit 46a039148570855f0438024a678c648ca0a6be51
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri May 16 15:52:50 2014 +0200

    replace my patch with a newer one from upstream
    
    Git-Dch: Ignore
---
 debian/patches/fix-arm-compilation-errors.patch | 28 ----------
 debian/patches/fix_arm_arch_stuff.patch         | 69 +++++++++++++++++++++++++
 debian/patches/series                           |  2 +-
 3 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/debian/patches/fix-arm-compilation-errors.patch b/debian/patches/fix-arm-compilation-errors.patch
deleted file mode 100644
index 39456e3..0000000
--- a/debian/patches/fix-arm-compilation-errors.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: fix some occurances of undeclared variables
-Origin: vendor
-Forwarded: https://github.com/Sereal/Sereal/issues/47
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-05-16
-
---- a/srl_decoder.c
-+++ b/srl_decoder.c
-@@ -857,8 +857,9 @@
- {
-     union myfloat val;
- #ifdef __ARM_ARCH
-+    U8 tmp[sizeof(double)];
-     ASSERT_BUF_SPACE(dec, sizeof(float), " while reading FLOAT");
--    Copy(dec->pos,v.c,sizeof(float),U8);
-+    Copy(dec->pos,val.c,sizeof(float),U8);
-     val.f= *((float *)tmp);
- #else
-     ASSERT_BUF_SPACE(dec, sizeof(float), " while reading FLOAT");
-@@ -894,7 +895,7 @@
- #ifdef __ARM_ARCH
-     U8 tmp[sizeof(long double)];
-     ASSERT_BUF_SPACE(dec, sizeof(long double), " while reading LONG_DOUBLE");
--    Copy(dec->pos,v.c,sizeof(long double),U8);
-+    Copy(dec->pos,val.c,sizeof(long double),U8);
-     val.ld= *((long double *)tmp);
- #else
-     ASSERT_BUF_SPACE(dec, sizeof(long double), " while reading LONG_DOUBLE");
diff --git a/debian/patches/fix_arm_arch_stuff.patch b/debian/patches/fix_arm_arch_stuff.patch
new file mode 100644
index 0000000..323ae93
--- /dev/null
+++ b/debian/patches/fix_arm_arch_stuff.patch
@@ -0,0 +1,69 @@
+From fde30528dfa634032cb94bab42457477786de711 Mon Sep 17 00:00:00 2001
+From: Yves Orton <yves.orton at booking.com>
+Date: Fri, 16 May 2014 15:36:00 +0200
+Subject: [PATCH] fix ARM_ARCH stuff
+
+I was so tired when I pushed that last patch I did not notice it was totally
+half baked. This is a much better, and actualy tested version.
+---
+ Perl/Decoder/srl_decoder.c | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/Perl/Decoder/srl_decoder.c b/Perl/Decoder/srl_decoder.c
+index 71ce384..923a858 100644
+--- a/srl_decoder.c
++++ b/srl_decoder.c
+@@ -852,14 +852,20 @@ union myfloat {
+     long double ld;
+ };
+ 
++/*
++#define TEST_ARM_ARCH
++*/
++#if (defined(TEST_ARM_ARCH) || defined(__ARM_ARCH))
++#define SRL_ARM_ARCH 1
++#endif
++
+ SRL_STATIC_INLINE void
+ srl_read_float(pTHX_ srl_decoder_t *dec, SV* into)
+ {
+     union myfloat val;
+-#ifdef __ARM_ARCH
++#ifdef SRL_ARM_ARCH
+     ASSERT_BUF_SPACE(dec, sizeof(float), " while reading FLOAT");
+-    Copy(dec->pos,v.c,sizeof(float),U8);
+-    val.f= *((float *)tmp);
++    Copy(dec->pos,val.c,sizeof(float),U8);
+ #else
+     ASSERT_BUF_SPACE(dec, sizeof(float), " while reading FLOAT");
+     val.f= *((float *)dec->pos);
+@@ -873,11 +879,9 @@ SRL_STATIC_INLINE void
+ srl_read_double(pTHX_ srl_decoder_t *dec, SV* into)
+ {
+     union myfloat val;
+-#ifdef __ARM_ARCH
+-    U8 tmp[sizeof(double)];
++#ifdef SRL_ARM_ARCH
+     ASSERT_BUF_SPACE(dec, sizeof(double), " while reading DOUBLE");
+     Copy(dec->pos,val.c,sizeof(double),U8);
+-    val.d= *((double *)tmp);
+ #else
+     ASSERT_BUF_SPACE(dec, sizeof(double), " while reading DOUBLE");
+     val.d= *((double *)dec->pos);
+@@ -891,11 +895,9 @@ SRL_STATIC_INLINE void
+ srl_read_long_double(pTHX_ srl_decoder_t *dec, SV* into)
+ {
+     union myfloat val;
+-#ifdef __ARM_ARCH
+-    U8 tmp[sizeof(long double)];
++#ifdef SRL_ARM_ARCH
+     ASSERT_BUF_SPACE(dec, sizeof(long double), " while reading LONG_DOUBLE");
+-    Copy(dec->pos,v.c,sizeof(long double),U8);
+-    val.ld= *((long double *)tmp);
++    Copy(dec->pos,val.c,sizeof(long double),U8);
+ #else
+     ASSERT_BUF_SPACE(dec, sizeof(long double), " while reading LONG_DOUBLE");
+     val.ld= *((long double *)dec->pos);
+-- 
+1.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 9ae0302..2496fe5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 use_a_union_on_ARM_to_ensure_alignment_for_floating_point.patch
-fix-arm-compilation-errors.patch
+fix_arm_arch_stuff.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libsereal-decoder-perl.git