[libdevel-size-perl] 03/08: Drop patches perl5.20-magic_read_shrink.patch, perl5.20-sv_magical.patch.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libdevel-size-perl.

commit 3b40d4c2926bc4fc3c64b899a6473671b71f14c7
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed May 27 00:05:38 2015 +0200

    Drop patches perl5.20-magic_read_shrink.patch, perl5.20-sv_magical.patch.
    
    Both merged upstream.
---
 debian/patches/perl5.20-magic_read_shrink.patch | 28 -------------------------
 debian/patches/perl5.20-sv_magical.patch        | 18 ----------------
 debian/patches/series                           |  2 --
 3 files changed, 48 deletions(-)

diff --git a/debian/patches/perl5.20-magic_read_shrink.patch b/debian/patches/perl5.20-magic_read_shrink.patch
deleted file mode 100644
index 87d4df6..0000000
--- a/debian/patches/perl5.20-magic_read_shrink.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: One of Devel-Size's tests, for a tied scalar visibly growing
- when the underlying tie object grows, is failing on Perl 5.19.3 because an
- earlier read of the scalar clears its PV buffer, causing the scalar to
- shrink. Attached patch makes the test allow for such shrinkage.
-Origin: https://rt.cpan.org/Public/Bug/Display.html?id=88182
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=88182
-Bug-Debian: http://bugs.debian.org/750235
-Author: zefram [...] fysh.org
-Last-Update: 2014-07-18
-
---- a/t/magic.t	2012-02-10 19:54:28.000000000 +0000
-+++ b/t/magic.t	2013-08-27 15:15:25.000000000 +0000
-@@ -46,13 +46,14 @@
-     my $after_size = total_size($string);
-     cmp_ok($after_size, '>', $before_size, 'size increases due to magic');
-     is($string, undef, 'No value yet');
-+    my $small_size = total_size($string);
-     # This is defineately cheating, in that we're poking inside the
-     # implementation of Tie::StdScalar, but if we just write to $string, the way
-     # magic works, the (nice long) value is first written to the regular scalar,
-     # then picked up by the magic. So it grows, which defeats the purpose of the
-     # test.
-     ${tied $string} = 'X' x 1024;
--    cmp_ok(total_size($string), '>', $after_size + 1024,
-+    cmp_ok(total_size($string), '>', $small_size + 1024,
- 	   'the magic object is counted');
- }
- 
diff --git a/debian/patches/perl5.20-sv_magical.patch b/debian/patches/perl5.20-sv_magical.patch
deleted file mode 100644
index 4ab2203..0000000
--- a/debian/patches/perl5.20-sv_magical.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: *** FIXME ***
-Origin: https://rt.cpan.org/Public/Bug/Display.html?id=88180
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=88180
-Bug-Debian: http://bugs.debian.org/750235
-Author: zefram [...] fysh.org
-Last-Update: 2014-07-18
-
---- a/Size.xs	2013-05-10 12:35:23.000000000 +0000
-+++ b/Size.xs	2013-08-27 14:52:53.000000000 +0000
-@@ -707,7 +707,7 @@
-   }
-   st->total_size += sizeof(SV) + body_sizes[type];
- 
--  if (type >= SVt_PVMG) {
-+  if (SvMAGICAL(thing)) {
-       magic_size(aTHX_ thing, st);
-   }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 17b12c8..f2db9ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-perl5.20-magic_read_shrink.patch
-perl5.20-sv_magical.patch
 perl5.20-ook.patch

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