From 47a2cfdb15f7a64bbae42a63737f568a16c83010830ffca2f81d1343bc871e1d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 30 Jul 2013 05:42:55 +0000 Subject: [PATCH] - remove upstreamed perl-XML-LibXML-bigendian.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-XML-LibXML?expand=0&rev=39 --- perl-XML-LibXML-bigendian.patch | 33 --------------------------------- perl-XML-LibXML.changes | 1 + perl-XML-LibXML.spec | 4 +--- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 perl-XML-LibXML-bigendian.patch diff --git a/perl-XML-LibXML-bigendian.patch b/perl-XML-LibXML-bigendian.patch deleted file mode 100644 index 5235544..0000000 --- a/perl-XML-LibXML-bigendian.patch +++ /dev/null @@ -1,33 +0,0 @@ -STRLEN has 64 bits here and int has 32, so the (int*) cast in -XML::LibXML::Document::toStringHTML() makes htmlDocDumpMemory() store -the 32-bit length of the result into a 64-bit variable. Depending on -the endianness, it either works OK (LE) or corrupts the variable (BE) - -Just use an 'int' instead, and cast it to an STRLEN later in the -newSVpvn() call. ---- - LibXML.xs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/LibXML.xs b/LibXML.xs -index 8ac23bf..581cc48 100644 ---- a/LibXML.xs -+++ b/LibXML.xs -@@ -2930,13 +2930,13 @@ toStringHTML(self) - XML::LibXML::Document::serialize_html = 1 - PREINIT: - xmlChar *result=NULL; -- STRLEN len = 0; -+ int len = 0; - PREINIT_SAVED_ERROR - CODE: - PERL_UNUSED_VAR(ix); - xs_warn( "use no formated toString!" ); - INIT_ERROR_HANDLER; -- htmlDocDumpMemory(self, &result, (int*)&len); -+ htmlDocDumpMemory(self, &result, &len); - CLEANUP_ERROR_HANDLER; - REPORT_ERROR(0); - --- -1.7.10 diff --git a/perl-XML-LibXML.changes b/perl-XML-LibXML.changes index 7015b1f..e122845 100644 --- a/perl-XML-LibXML.changes +++ b/perl-XML-LibXML.changes @@ -35,6 +35,7 @@ Sat Jul 27 11:59:01 UTC 2013 - coolo@suse.com - discovered by Shlomi Fish. - Fixed by Shlomi Fish. - see t/40reader_mem_error.t +- remove upstreamed perl-XML-LibXML-bigendian.patch ------------------------------------------------------------------- Fri May 25 08:40:07 UTC 2012 - dvaleev@suse.com diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index ba9d7b5..32333ca 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -30,13 +30,12 @@ BuildRequires: perl-macros BuildRequires: perl(ExtUtils::MakeMaker) >= 6.56 BuildRequires: perl(XML::NamespaceSupport) >= 1.07 BuildRequires: perl(XML::SAX) >= 0.11 -BuildRequires: pkgconfig(libxml-2.0) >= 2.6.16 +BuildRequires: pkgconfig(libxml-2.0) >= 2.9.0 Requires: perl(XML::NamespaceSupport) >= 1.07 Requires: perl(XML::SAX) >= 0.11 Provides: perl-XML-LibXML-Common = %{version} Obsoletes: perl-XML-LibXML-Common < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch: perl-XML-LibXML-bigendian.patch %{perl_requires} %description @@ -47,7 +46,6 @@ the high performance DOM implementation. %prep %setup -q -n %{cpan_name}-%{version} -%patch -p1 %build # [2,7,1,0], # broken release, broken utf-16