From 118c10fd847947ffcdfc92e0755e7af7606548bb Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 2 Jul 2019 00:14:20 +0300 Subject: [PATCH] perl-XML-LibXML: Update tp 2.0201 --- perl-XML-LibXML/PKGBUILD | 20 +++++++++++--------- perl-XML-LibXML/XML-LibXML-2.0002.patch | 12 ------------ perl-XML-LibXML/XML-LibXML-2.0200.patch | 15 +++++++++++++++ perl-XML-LibXML/perl-xml-libxml.install | 23 +++++++++++++++++++++++ 4 files changed, 49 insertions(+), 21 deletions(-) delete mode 100644 perl-XML-LibXML/XML-LibXML-2.0002.patch create mode 100644 perl-XML-LibXML/XML-LibXML-2.0200.patch create mode 100644 perl-XML-LibXML/perl-xml-libxml.install diff --git a/perl-XML-LibXML/PKGBUILD b/perl-XML-LibXML/PKGBUILD index dd2cedd1..8151b3f8 100644 --- a/perl-XML-LibXML/PKGBUILD +++ b/perl-XML-LibXML/PKGBUILD @@ -2,26 +2,28 @@ _realname=XML-LibXML pkgname=perl-${_realname} -pkgver=2.0134 -pkgrel=3 -pkgdesc="Expat-based XML parser module for perl" +pkgver=2.0201 +pkgrel=1 +pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') -url="https://bitbucket.org/shlomif/perl-xml-libxml/" +url="https://search.cpan.org/dist/XML-LibXML" groups=('perl-modules') -depends=('perl' 'libxml2' 'perl-XML-SAX') +depends=('perl' 'perl-Alien-Libxml2' 'perl-XML-SAX' 'perl-XML-NamespaceSupport') +#checkdepends=('perl-Test-Pod' 'perl-Test-LeakTrace' 'perl-CPAN-Changes' 'perl-URI') makedepends=('libxml2-devel') #replaces=('perlxml') #provides=("perlxml=${pkgver}") +install=perl-xml-libxml.install options=('!emptydirs') source=("https://www.cpan.org/authors/id/S/SH/SHLOMIF/${_realname}-${pkgver}.tar.gz" - 'XML-LibXML-2.0002.patch') -sha256sums=('f0bca4d0c2da35d879fee4cd13f352014186cedab27ab5e191f39b5d7d4f46cf' - '415256ee1723b423c95e9f644d83106b9d44ca4b5918597800a027f264541f05') + 'XML-LibXML-2.0200.patch') +sha256sums=('e008700732502b3f1f0890696ec6e2dc70abf526cd710efd9ab7675cae199bc2' + 'ea1e1f58f33681dc0206c4fa868cc191efeb91facaa88631bc79c73e910cf745') prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -i ${srcdir}/XML-LibXML-2.0002.patch + patch -p1 -i ${srcdir}/XML-LibXML-2.0200.patch } build() { diff --git a/perl-XML-LibXML/XML-LibXML-2.0002.patch b/perl-XML-LibXML/XML-LibXML-2.0002.patch deleted file mode 100644 index 62fede80..00000000 --- a/perl-XML-LibXML/XML-LibXML-2.0002.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur XML-LibXML-2.0018/inc/Devel/CheckLib.pm XML-LibXML-2.0018/inc/Devel/CheckLib.pm ---- XML-LibXML-2.0018/inc/Devel/CheckLib.pm 2012-10-13 11:14:26.000000000 +0000 -+++ XML-LibXML-2.0018/inc/Devel/CheckLib.pm 2013-06-16 16:03:16.958562500 +0000 -@@ -417,7 +417,7 @@ - - =over - --=item gcc (on Linux, *BSD, Mac OS X, Solaris, Cygwin) -+=item gcc (on Linux, *BSD, Mac OS X, Solaris, Cygwin, Msys) - - =item Sun's compiler tools on Solaris - diff --git a/perl-XML-LibXML/XML-LibXML-2.0200.patch b/perl-XML-LibXML/XML-LibXML-2.0200.patch new file mode 100644 index 00000000..b2b25ebf --- /dev/null +++ b/perl-XML-LibXML/XML-LibXML-2.0200.patch @@ -0,0 +1,15 @@ +diff -Naur XML-LibXML-2.0200-orig/t/11memory.t XML-LibXML-2.0200/t/11memory.t +--- XML-LibXML-2.0200-orig/t/11memory.t 2016-07-14 07:17:08.000000000 +0300 ++++ XML-LibXML-2.0200/t/11memory.t 2019-04-27 20:54:13.399173300 +0300 +@@ -10,9 +10,9 @@ + + use constant TIMES_THROUGH => $ENV{MEMORY_TIMES} || 100_000; + +-if (! (($^O eq 'linux') || ($^O eq 'cygwin')) ) ++if (! (($^O eq 'linux') || ($^O eq 'cygwin') || ($^O eq 'msys')) ) + { +- plan skip_all => 'Only runs on Linux and Cygwin.'; ++ plan skip_all => 'Only runs on Linux and Cygwin or MSYS.'; + } + elsif (! $ENV{MEMORY_TEST} ) + { diff --git a/perl-XML-LibXML/perl-xml-libxml.install b/perl-XML-LibXML/perl-xml-libxml.install new file mode 100644 index 00000000..3a8eb1ed --- /dev/null +++ b/perl-XML-LibXML/perl-xml-libxml.install @@ -0,0 +1,23 @@ +post_install() { + echo ":: Installing SAX XML Parsers" + perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()" + perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()" +} + +post_upgrade() { + if [[ ! -f /usr/share/perl5/vendor_perl/XML/SAX/ParserDetails.ini ]]; then + post_install + else + libxmlcount=`grep -c XML::LibXML::SAX /usr/share/perl5/vendor_perl/XML/SAX/ParserDetails.ini` + if [[ $libxmlcount == 0 ]]; then + post_install + fi + fi +} + +pre_remove() { + if [[ -f /usr/share/perl5/vendor_perl/XML/SAX/ParserDetails.ini ]]; then + perl -MXML::SAX -e "XML::SAX->remove_parser(q(XML::LibXML::SAX::Parser))->save_parsers()" + perl -MXML::SAX -e "XML::SAX->remove_parser(q(XML::LibXML::SAX))->save_parsers()" + fi +}