commit 3e4e1a53077f8fd2939acf64f3b624c0d79405c6
Author: Jitka Plesnikova <jplesnik@xxxxxxxxxx>
Date: Wed Sep 3 17:30:04 2014 +0200
Added patches provided by upstream
Devel-Size-0.79-RT-88180-sv_magical.patch | 11 ++++++++
Devel-Size-0.79-RT-88182-magic_read_shrink.patch | 18 +++++++++++++
Devel-Size-0.79-RT-95496-perl5.20-ook.patch | 30 ++++++++++++++++++++++
perl-Devel-Size.spec | 7 +++++
4 files changed, 66 insertions(+), 0 deletions(-)
---
diff --git a/Devel-Size-0.79-RT-88180-sv_magical.patch b/Devel-Size-0.79-RT-88180-sv_magical.patch
new file mode 100644
index 0000000..78eabd3
--- /dev/null
+++ b/Devel-Size-0.79-RT-88180-sv_magical.patch
@@ -0,0 +1,11 @@
+--- 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/Devel-Size-0.79-RT-88182-magic_read_shrink.patch b/Devel-Size-0.79-RT-88182-magic_read_shrink.patch
new file mode 100644
index 0000000..2e696e9
--- /dev/null
+++ b/Devel-Size-0.79-RT-88182-magic_read_shrink.patch
@@ -0,0 +1,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/Devel-Size-0.79-RT-95496-perl5.20-ook.patch b/Devel-Size-0.79-RT-95496-perl5.20-ook.patch
new file mode 100644
index 0000000..deedfb7
--- /dev/null
+++ b/Devel-Size-0.79-RT-95496-perl5.20-ook.patch
@@ -0,0 +1,30 @@
+Description: mark a test as TODO
+ ntyni: "I've filed [perl #122322] about OOK (Offset OK) not triggering
+ anymore in such cases; it changed with the enabling of COW (Copy on Write)
+ for 5.19.1.
+ .
+ The problem isn't about Devel-Size counting the size of an SV wrong when
+ OOK is used, but rather the fact that OOK doesn't get used anymore.
+ .
+ (See the 'Offsets' section in perlguts for information about OOK.)"
+Origin: vendor
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=95493
+Bug-Debian: http://bugs.debian.org/750235
+Forwarded: no, this is a temporary workaround
+Author: gregor herrmann <gregoa@xxxxxxxxxx>
+Last-Update: 2014-07-18
+
+--- a/t/basic.t
++++ b/t/basic.t
+@@ -119,8 +119,11 @@
+ my $before_length = length $uurk;
+ cmp_ok($before_size, '>', $before_length, 'Size before is sane');
+ $uurk =~ s/Perl //;
++TODO: {
++ local $TODO = '[perl #122322]: OOK (Offset OK) not triggering anymore';
+ is(total_size($uurk), $before_size,
+ "Size doesn't change because OOK is used");
++ }
+ cmp_ok(length $uurk, '<', $before_size, 'but string is shorter');
+ }
+
diff --git a/perl-Devel-Size.spec b/perl-Devel-Size.spec
index 68fa017..4c62019 100644
--- a/perl-Devel-Size.spec
+++ b/perl-Devel-Size.spec
@@ -7,6 +7,9 @@ Group: Development/Libraries
URL: http://search.cpan.org/dist/Devel-Size/
Source0: http://www.cpan.org/modules/by-module/Devel/Devel-Size-%{version}.tar.gz
+Patch0: Devel-Size-0.79-RT-88182-magic_read_shrink.patch
+Patch1: Devel-Size-0.79-RT-88180-sv_magical.patch
+Patch2: Devel-Size-0.79-RT-95496-perl5.20-ook.patch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -31,6 +34,9 @@ variable is a hash or an array, use a reference when calling.
%prep
%setup -q -n Devel-Size-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
@@ -57,6 +63,7 @@ make test
%changelog
* Thu Aug 28 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 0.79-6
- Perl 5.20 rebuild
+- Added patches provided by upstream
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.79-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
