Hello community, here is the log from the commit of package perl-RDF-Trine for openSUSE:Factory checked in at 2017-05-03 15:57:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-RDF-Trine (Old) and /work/SRC/openSUSE:Factory/.perl-RDF-Trine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-RDF-Trine" Wed May 3 15:57:29 2017 rev:5 rq:492410 version:1.016 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-RDF-Trine/perl-RDF-Trine.changes 2017-01-11 12:05:24.331438259 +0100 +++ /work/SRC/openSUSE:Factory/.perl-RDF-Trine.new/perl-RDF-Trine.changes 2017-05-03 15:57:30.933469434 +0200 @@ -1,0 +2,20 @@ +Tue Apr 25 06:32:06 UTC 2017 - [email protected] + +- updated to 1.016 + see /usr/share/doc/packages/perl-RDF-Trine/Changes.ttl + + <http://kasei.us/code/files/RDF-Trine-1.016.tar.gz> + dcterms:isVersionOf <http://kasei.us/code/rdf-trine/#project> ; + dcterms:replaces <http://kasei.us/code/files/RDF-Trine-1.015.tar.gz> ; + + doap:Version [ + doap:revision "1.016" ; + doap:created "2017-04-24" ; + ]; + asc:changes [ + asc:update "Updated Makefile.PL for perl 5.26." ; + asc:update "Fixes to RDF::Trine::Store::Redland (#145 from @doriantaylor)." ; + asc:update "Remove use of TryCatch in scripts and developer tests." ; + ] . + +------------------------------------------------------------------- Old: ---- RDF-Trine-1.015.tar.gz New: ---- RDF-Trine-1.016.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-RDF-Trine.spec ++++++ --- /var/tmp/diff_new_pack.DnhZTY/_old 2017-05-03 15:57:31.757353124 +0200 +++ /var/tmp/diff_new_pack.DnhZTY/_new 2017-05-03 15:57:31.757353124 +0200 @@ -17,14 +17,14 @@ Name: perl-RDF-Trine -Version: 1.015 +Version: 1.016 Release: 0 %define cpan_name RDF-Trine Summary: An RDF Framework for Perl License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/RDF-Trine/ -Source0: http://www.cpan.org/authors/id/G/GW/GWILLIAMS/%{cpan_name}-%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/G/GW/GWILLIAMS/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ RDF-Trine-1.015.tar.gz -> RDF-Trine-1.016.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/Changes.ttl new/RDF-Trine-1.016/Changes.ttl --- old/RDF-Trine-1.015/Changes.ttl 2017-01-04 18:14:44.000000000 +0100 +++ new/RDF-Trine-1.016/Changes.ttl 2017-04-24 22:01:58.000000000 +0200 @@ -10,6 +10,21 @@ dcterms:references <http://kasei.us/code/rdf-trine/#project> . +<http://kasei.us/code/files/RDF-Trine-1.016.tar.gz> + dcterms:isVersionOf <http://kasei.us/code/rdf-trine/#project> ; + dcterms:replaces <http://kasei.us/code/files/RDF-Trine-1.015.tar.gz> ; + + doap:Version [ + doap:revision "1.016" ; + doap:created "2017-04-24" ; + ]; + asc:changes [ + asc:update "Updated Makefile.PL for perl 5.26." ; + asc:update "Fixes to RDF::Trine::Store::Redland (#145 from @doriantaylor)." ; + asc:update "Remove use of TryCatch in scripts and developer tests." ; + ] . + + <http://kasei.us/code/files/RDF-Trine-1.015.tar.gz> dcterms:isVersionOf <http://kasei.us/code/rdf-trine/#project> ; dcterms:replaces <http://kasei.us/code/files/RDF-Trine-1.014.tar.gz> ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/META.yml new/RDF-Trine-1.016/META.yml --- old/RDF-Trine-1.015/META.yml 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/META.yml 2017-04-24 22:05:08.000000000 +0200 @@ -13,7 +13,7 @@ ExtUtils::MakeMaker: 6.59 distribution_type: module dynamic_config: 1 -generated_by: 'Module::Install version 1.16' +generated_by: 'Module::Install version 1.17' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -65,4 +65,4 @@ homepage: http://search.cpan.org/dist/RDF-Trine/ license: http://dev.perl.org/licenses/ repository: http://github.com/kasei/perlrdf/ -version: '1.015' +version: '1.016' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/Makefile.PL new/RDF-Trine-1.016/Makefile.PL --- old/RDF-Trine-1.015/Makefile.PL 2016-11-15 20:13:57.000000000 +0100 +++ new/RDF-Trine-1.016/Makefile.PL 2017-04-06 23:07:28.000000000 +0200 @@ -1,6 +1,7 @@ use strict; use warnings; +use lib '.'; use inc::Module::Install; name 'RDF-Trine'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/README new/RDF-Trine-1.016/README --- old/RDF-Trine-1.015/README 2017-01-04 18:16:11.000000000 +0100 +++ new/RDF-Trine-1.016/README 2017-04-24 22:02:15.000000000 +0200 @@ -69,6 +69,14 @@ VERSION HISTORY + Version 1.016 (2017-04-24) + + * BUG FIXES + Fixes to RDF::Trine::Store::Redland (#145 from @doriantaylor). + * OTHER + Updated Makefile.PL for perl 5.26. + Remove use of TryCatch in scripts and developer tests. + Version 1.015 (2017-01-04) * BUG FIXES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/SIGNATURE new/RDF-Trine-1.016/SIGNATURE --- old/RDF-Trine-1.015/SIGNATURE 2017-01-04 18:17:26.000000000 +0100 +++ new/RDF-Trine-1.016/SIGNATURE 2017-04-24 22:05:22.000000000 +0200 @@ -1,5 +1,5 @@ This file contains message digests of all files listed in MANIFEST, -signed via the Module::Signature module, version 0.79. +signed via the Module::Signature module, version 0.81. To verify the content in this distribution, first make sure you have Module::Signature installed, then type: @@ -14,11 +14,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 bc137994ffa29da521e5149b8a0189dc1fb1ceb5 Changes.ttl +SHA1 70d4e91d8b8d1a4ad43801c4c6fab3905ff957a7 Changes.ttl SHA1 e49c2aa965cee869a9a5c3cca74f59690b93ab90 MANIFEST -SHA1 c5b2a4daae426fd85e2fb56e76a1569f635592eb META.yml -SHA1 afdc59522ba0a2f430c3a0771b2e504428bb83bf Makefile.PL -SHA1 d78c442c831e3025e4f98cb8ca7915da28601489 README +SHA1 0d5b7c5017b2686e39ea9fdf15fdc020f97373ae META.yml +SHA1 7bd123a9743dbeb4760ddfc0ed84a776a5579945 Makefile.PL +SHA1 5d628d7db286ae1a956e0138b9aa53ec35e8fb64 README SHA1 de1a886d4a10836f9a9f7bfb07c01df6bc14ce1f bin/cliapi SHA1 ea9b0f4770b1c0978da2af70141a94a996ab4bd4 bin/graph.pl SHA1 cb86e2ef48a761f6f236567dba46b0ac9a722844 bin/rdf_init_store.pl @@ -30,23 +30,23 @@ SHA1 53cf0a19a79aab6f51c3a84ea01319214b6a388f bin/rdf_transcode.pl SHA1 f9e8c258e6057d07b6148da2a64d124c30bcbc66 bin/srx2csv SHA1 680dbd2e707d0c76e89b8046155bccc3568d838e bin/srx2table -SHA1 859912bd4984583696a06758860b222c31061b3a bin/turtle-2013-harness.pl +SHA1 d89494a11b4cfbac1d8fade3a8cc138d12cbf6aa bin/turtle-2013-harness.pl SHA1 cb30461a6332c1336f7e479e4fc1a78d518fc1a3 bin/turtle_benchmark.pl SHA1 134f68525df59a8b04f2309bc4879279f866bba9 bin/turtle_parse.pl -SHA1 cc1260a5747e4e4dbceb55dd2d96374003c1fd29 bin/turtle_tokenize.pl +SHA1 3cc432defe939a4fd0cb265c688489a9d1c1851a bin/turtle_tokenize.pl SHA1 133e36c7d05af7737a3bb86ae6ede5cf7c1945c9 examples/foaf_labels.pl SHA1 e25f036a2f1cb94b03dd008032109b0bbfbd53f8 extra/mysql.sql -SHA1 bce3c51bb369419603298064b78e14077b93af66 inc/Module/Install.pm +SHA1 05a17c51aceb6435a1eac17137f19911a09e5050 inc/Module/Install.pm SHA1 d001b4b9a48395a8c4134b234a0e1789138427c5 inc/Module/Install/AuthorTests.pm -SHA1 fe220f215f645500ce8f14ff5e19d9a28692af56 inc/Module/Install/Base.pm -SHA1 b56ed8e42c600e08007d152cf0b1438a7c3b7f6e inc/Module/Install/Can.pm -SHA1 99c531a17a67ce5250df2ae151cc48c80d914cde inc/Module/Install/Fetch.pm -SHA1 76efdca3603159e0ae0e18f19fe72a0211a69529 inc/Module/Install/Makefile.pm -SHA1 2e33e87882d60db3913da6284dd5295e5315e18a inc/Module/Install/Metadata.pm -SHA1 01978a56e76a58399af3bd4d022aa990b9669bee inc/Module/Install/Scripts.pm -SHA1 c830b819e61bda5eca077c6291293bba61b3b9f2 inc/Module/Install/Win32.pm -SHA1 cb52b9d6f88d512d448a6f35ed0af0d1201a134b inc/Module/Install/WriteAll.pm -SHA1 ab4c336fc73861386582ad12d796bea2b4dc5a7d lib/RDF/Trine.pm +SHA1 dc73c2baf4357ad1cc884146147f557a50a29300 inc/Module/Install/Base.pm +SHA1 c7f311a5bc5a7f96e9105d5f16a0e13fc596899d inc/Module/Install/Can.pm +SHA1 8c8f9ff5b0a536af59814e16a901ce39fbc23299 inc/Module/Install/Fetch.pm +SHA1 4f77eb02e104324b08a047585c498146b045613b inc/Module/Install/Makefile.pm +SHA1 2f5be6af6098acf6d786a4a7299a34d0c6c04ef9 inc/Module/Install/Metadata.pm +SHA1 fa532ce949d1c607589aded93d5ea1d49a27e5d8 inc/Module/Install/Scripts.pm +SHA1 aa6723cc4a8d4475026f6ceb28e1f16459e8a11b inc/Module/Install/Win32.pm +SHA1 6661285caedfe012cb5a1ca915a422ffc292ae2b inc/Module/Install/WriteAll.pm +SHA1 a9e92280b91b193d5d73a0d17d485c6af911ec8c lib/RDF/Trine.pm SHA1 c882d99e68431f7d44921063af7aa488057f8dfe lib/RDF/Trine/Error.pm SHA1 decb5ccd306d280be4a3e23c917080fbf405f93f lib/RDF/Trine/Exporter/CSV.pm SHA1 5560c01ba92a6709829538dd8bb33045e902428b lib/RDF/Trine/Exporter/RDFPatch.pm @@ -108,7 +108,7 @@ SHA1 26b5b84b56d0eb8b7e9bfdf3d6adae8fc54be8f4 lib/RDF/Trine/Store/LanguagePreference.pm SHA1 75da07815edf615bbd449e9aa428de6806112577 lib/RDF/Trine/Store/Memory.pm SHA1 cc621181a8a5d107a2a871d219f19afba7e33187 lib/RDF/Trine/Store/Redis.pm -SHA1 f579de165ef261d99dbea79b6e5be9b235f3d93d lib/RDF/Trine/Store/Redland.pm +SHA1 1d691a231bb18f40ace4d3a184cf3abe49df8bd9 lib/RDF/Trine/Store/Redland.pm SHA1 8194296d6fe8a77e0133f13e0a205942c459ca58 lib/RDF/Trine/Store/SPARQL.pm SHA1 ee632dfe37983d9585a0aa1b91e5211cd6a83f7b lib/RDF/Trine/VariableBindings.pm SHA1 63d7cfd824b6ca3a1fc1e879d3be0e44de3f755a lib/Test/RDF/Trine/Store.pm @@ -1393,7 +1393,7 @@ SHA1 fdfe2bb7cae4e2849166d19738c49b85aa381d2c xt/data/turtle/test-15.ttl SHA1 88f8210eba5db02ee5c6f761f0ef9f2b221676a1 xt/data/turtle/test-16.out SHA1 e1334fcb18efc0b4b966cf8e3092b67327fccfb5 xt/data/turtle/test-16.ttl -SHA1 0a73829477a0289c5786b683879fa28def2c4da0 xt/parser-trig-2013.t +SHA1 d0ee90db43d5a8158ce1a6a441d54b9baf447e48 xt/parser-trig-2013.t SHA1 59ba87fa0f27359a1e157b84fa529f9cc0419952 xt/perl-critic.t SHA1 8fce98e8ce4b5ef5ea5e50e366e4014a8b659e27 xt/pod-coverage.t SHA1 6387af7a5fde0747be5bc9ad2ec15ca9759bd95a xt/pod.t @@ -1401,10 +1401,9 @@ SHA1 2646eda043e501aa78e16abbe3124d64fd44fefa xt/store-redland.t SHA1 0d59038cf8ba6efd00638de2bcf3c56bbd3e7da1 xt/store-sparql.t -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 Comment: GPGTools - http://gpgtools.org -iEYEARECAAYFAlhtLiYACgkQhPK6VMqoyC1NyQCfY7ivwC682Vfy+NiE8fN9iSxI -sZAAoIMd7q0fdko038yLgUl9ZkrtY1Pw -=4ImS +iEYEARECAAYFAlj+WoAACgkQhPK6VMqoyC1qOQCeKjx+ZEvVq73B8eefR6Z+OtqH ++eIAoI8S2aRX8tAIzsEywlFzKGGg9Vzm +=LoWv -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/bin/turtle-2013-harness.pl new/RDF-Trine-1.016/bin/turtle-2013-harness.pl --- old/RDF-Trine-1.015/bin/turtle-2013-harness.pl 2014-08-12 08:10:47.000000000 +0200 +++ new/RDF-Trine-1.016/bin/turtle-2013-harness.pl 2017-04-07 22:19:06.000000000 +0200 @@ -9,7 +9,6 @@ use RDF::Trine::Namespace qw(rdf); use RDF::EARL; use URI::file; -use TryCatch; sub throws_ok (&;$) { ## no critic my ( $coderef, $description ) = @_; @@ -117,11 +116,16 @@ my $model = RDF::Trine::Model->temporary_model; my $tbase = URI->new_abs( $test, $base->uri_value )->as_string; my $parsed = 1; - try { + eval { $parser->parse_file_into_model( $tbase, $fh, $model ); - } catch (RDF::Trine::Error $e) { - $parsed = 0; - # warn "Failed to parse $file: " . $err->text; + }; + + if ($@) { + my $e = $@; + if (blessed($e) and $e->isa('RDF::Trine::Error')) { + $parsed = 0; +# warn "Failed to parse $file: " . $err->text; + } } if ($parsed) { my $ok = compare($model, URI->new($res_file->uri), $base, $test); @@ -211,9 +215,12 @@ my $tbase = URI->new_abs( $name, $base->uri_value )->as_string; my $file = $url->file; open( my $fh, '<:encoding(UTF-8)', $file ); - try { + eval { $parser->parse_file_into_model( $tbase, $fh, $emodel ); - } catch ($err) { + }; + + if ($@) { + my $err = $@; # warn "Failed to parse $file: " . $err->text . "(test $name)"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/bin/turtle_tokenize.pl new/RDF-Trine-1.016/bin/turtle_tokenize.pl --- old/RDF-Trine-1.015/bin/turtle_tokenize.pl 2016-05-23 07:12:17.000000000 +0200 +++ new/RDF-Trine-1.016/bin/turtle_tokenize.pl 2017-02-27 00:48:21.000000000 +0100 @@ -19,10 +19,10 @@ use RDF::Trine::Parser::Turtle::Lexer; use RDF::Trine::Parser::Turtle::Constants; +use Scalar::Util qw(blessed); use Time::HiRes qw(gettimeofday tv_interval); use Data::Dumper; use File::Spec; -use TryCatch; $| = 1; my $verbose = 0; @@ -33,7 +33,7 @@ my $t0 = [gettimeofday]; my $l = RDF::Trine::Parser::Turtle::Lexer->new( file => $fh ); -try { +eval { while (my $t = $l->get_token) { $count++; printf("%3d:%-3d %3d:%-3d %s", $t->start_line, $t->start_column, $t->line, $t->column, decrypt_constant($t->type)); @@ -43,11 +43,15 @@ print "\n"; throw Error if ($limit and $count >= $limit); } -} catch (RDF::Trine::Error::ParserError::Tokenized $e) { - $e->explain( $fh ); - exit; -} catch ($e) { - warn $e +}; + +if ($@) { + my $e = $@; + if (blessed($e) and $e->isa('RDF::Trine::Error::ParserError::Tokenized')) { + $e->explain($fh); + } else { + warn $@; + } } my $elapsed = tv_interval( $t0, [gettimeofday]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install/Base.pm new/RDF-Trine-1.016/inc/Module/Install/Base.pm --- old/RDF-Trine-1.015/inc/Module/Install/Base.pm 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install/Base.pm 2017-04-24 22:05:06.000000000 +0200 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.17'; } # Suspend handler for "redefined" warnings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install/Can.pm new/RDF-Trine-1.016/inc/Module/Install/Can.pm --- old/RDF-Trine-1.015/inc/Module/Install/Can.pm 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install/Can.pm 2017-04-24 22:05:06.000000000 +0200 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.17'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -121,6 +121,15 @@ # Can we locate a (the) C compiler sub can_cc { my $self = shift; + + if ($^O eq 'VMS') { + require ExtUtils::CBuilder; + my $builder = ExtUtils::CBuilder->new( + quiet => 1, + ); + return $builder->have_compiler; + } + my @chunks = split(/ /, $Config::Config{cc}) or return; # $Config{cc} may contain args; try to find out the program part @@ -151,4 +160,4 @@ __END__ -#line 236 +#line 245 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install/Fetch.pm new/RDF-Trine-1.016/inc/Module/Install/Fetch.pm --- old/RDF-Trine-1.015/inc/Module/Install/Fetch.pm 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install/Fetch.pm 2017-04-24 22:05:06.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.17'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install/Makefile.pm new/RDF-Trine-1.016/inc/Module/Install/Makefile.pm --- old/RDF-Trine-1.015/inc/Module/Install/Makefile.pm 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install/Makefile.pm 2017-04-24 22:05:06.000000000 +0200 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.17'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install/Metadata.pm new/RDF-Trine-1.016/inc/Module/Install/Metadata.pm --- old/RDF-Trine-1.015/inc/Module/Install/Metadata.pm 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install/Metadata.pm 2017-04-24 22:05:06.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.17'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install/Scripts.pm new/RDF-Trine-1.016/inc/Module/Install/Scripts.pm --- old/RDF-Trine-1.015/inc/Module/Install/Scripts.pm 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install/Scripts.pm 2017-04-24 22:05:06.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.17'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install/Win32.pm new/RDF-Trine-1.016/inc/Module/Install/Win32.pm --- old/RDF-Trine-1.015/inc/Module/Install/Win32.pm 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install/Win32.pm 2017-04-24 22:05:06.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.17'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install/WriteAll.pm new/RDF-Trine-1.016/inc/Module/Install/WriteAll.pm --- old/RDF-Trine-1.015/inc/Module/Install/WriteAll.pm 2017-01-04 18:17:18.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install/WriteAll.pm 2017-04-24 22:05:06.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.17'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/inc/Module/Install.pm new/RDF-Trine-1.016/inc/Module/Install.pm --- old/RDF-Trine-1.015/inc/Module/Install.pm 2017-01-04 18:17:17.000000000 +0100 +++ new/RDF-Trine-1.016/inc/Module/Install.pm 2017-04-24 22:05:05.000000000 +0200 @@ -31,7 +31,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '1.16'; + $VERSION = '1.17'; # Storage for the pseudo-singleton $MAIN = undef; @@ -244,6 +244,8 @@ } return $args{_self} if $args{_self}; + $base_path = VMS::Filespec::unixify($base_path) if $^O eq 'VMS'; + $args{dispatch} ||= 'Admin'; $args{prefix} ||= 'inc'; $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); @@ -322,7 +324,7 @@ my ($self, $path) = @_; my @found; - File::Find::find( sub { + File::Find::find( {no_chdir => 1, wanted => sub { my $file = $File::Find::name; return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; my $subpath = $1; @@ -336,7 +338,7 @@ # correctly. Otherwise, root through the file to locate the case-preserved # version of the package name. if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { - my $content = Module::Install::_read($subpath . '.pm'); + my $content = Module::Install::_read($File::Find::name); my $in_pod = 0; foreach ( split /\n/, $content ) { $in_pod = 1 if /^=\w/; @@ -351,7 +353,7 @@ } push @found, [ $file, $pkg ]; - }, $path ) if -d $path; + }}, $path ) if -d $path; @found; } @@ -373,8 +375,6 @@ return $call; } -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; sub _read { local *FH; open( FH, '<', $_[0] ) or die "open($_[0]): $!"; @@ -383,16 +383,6 @@ close FH or die "close($_[0]): $!"; return $string; } -END_NEW -sub _read { - local *FH; - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; - binmode FH; - my $string = do { local $/; <FH> }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_OLD sub _readperl { my $string = Module::Install::_read($_[0]); @@ -413,8 +403,6 @@ return $string; } -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; sub _write { local *FH; open( FH, '>', $_[0] ) or die "open($_[0]): $!"; @@ -424,17 +412,6 @@ } close FH or die "close($_[0]): $!"; } -END_NEW -sub _write { - local *FH; - open( FH, "> $_[0]" ) or die "open($_[0]): $!"; - binmode FH; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_OLD # _version is for processing module versions (eg, 1.03_05) not # Perl versions (eg, 5.8.1). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/lib/RDF/Trine/Store/Redland.pm new/RDF-Trine-1.016/lib/RDF/Trine/Store/Redland.pm --- old/RDF-Trine-1.015/lib/RDF/Trine/Store/Redland.pm 2017-01-04 18:13:54.000000000 +0100 +++ new/RDF-Trine-1.016/lib/RDF/Trine/Store/Redland.pm 2017-02-27 00:39:31.000000000 +0100 @@ -211,8 +211,8 @@ my $sub = sub { while (1) { return unless $iter; - return if $iter->end; - my $st = $iter->current; + #return if $iter->end; + my $st = $iter->current or return; if ($seen{ $st->as_string }++) { $iter->next; next; @@ -241,8 +241,8 @@ my $nil = RDF::Trine::Node::Nil->new(); my $sub = sub { return unless $iter; - return if $iter->end; - my $st = $iter->current; + #return if $iter->end; + my $st = $iter->current or return; my $c = $iter->context; my @nodes = map { _cast_to_local($st->$_()) } qw(subject predicate object); if ($ctx) { @@ -497,7 +497,9 @@ my $dt = ($dturi) ? $dturi->as_string : undef; - return RDF::Trine::Node::Literal->new( decode('utf8', $node->literal_value), $lang, $dt ); + my $lv = $node->literal_value; + utf8::decode($lv) unless utf8::is_utf8($lv); + return RDF::Trine::Node::Literal->new($lv, $lang, $dt ); } else { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/lib/RDF/Trine.pm new/RDF-Trine-1.016/lib/RDF/Trine.pm --- old/RDF-Trine-1.015/lib/RDF/Trine.pm 2017-01-04 18:13:54.000000000 +0100 +++ new/RDF-Trine-1.016/lib/RDF/Trine.pm 2017-04-24 22:02:36.000000000 +0200 @@ -7,7 +7,7 @@ =head1 VERSION -This document describes RDF::Trine version 1.015 +This document describes RDF::Trine version 1.016 =head1 SYNOPSIS @@ -89,7 +89,7 @@ our ($debug, @ISA, $VERSION, @EXPORT_OK); BEGIN { $debug = 0; - $VERSION = '1.015'; + $VERSION = '1.016'; require Exporter; @ISA = qw(Exporter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/RDF-Trine-1.015/xt/parser-trig-2013.t new/RDF-Trine-1.016/xt/parser-trig-2013.t --- old/RDF-Trine-1.015/xt/parser-trig-2013.t 2014-08-05 03:39:06.000000000 +0200 +++ new/RDF-Trine-1.016/xt/parser-trig-2013.t 2017-01-04 22:09:08.000000000 +0100 @@ -5,11 +5,11 @@ use FindBin qw($Bin); use File::Glob qw(bsd_glob); use File::Spec; +use Scalar::Util qw(blessed); use Data::Dumper; use RDF::Trine qw(iri literal); use RDF::Trine::Namespace qw(rdf); use URI::file; -use TryCatch; my $mf = RDF::Trine::Namespace->new('http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#'); my $rdft = RDF::Trine::Namespace->new('http://www.w3.org/ns/rdftest#'); @@ -58,14 +58,18 @@ my $url = 'file://' . $file; my $parser = RDF::Trine::Parser::TriG->new(); - try { + eval { $parser->parse( $url, $data ); $parsed = 1; - } catch (RDF::Trine::Error::ParserError::Explainable $e) { - $e->explain( $fh ); - $error = $e; - } catch ($e) { - $error = $e; + }; + + if (my $e = $@) { + if (blessed($e) and $e->isa('RDF::Trine::Error::ParserError::Explainable')) { + $e->explain( $fh ); + $error = $e; + } else { + $error = $e; + } } ok($parsed, $test); @@ -100,17 +104,21 @@ my $model = RDF::Trine::Model->temporary_model; my $tbase = URI->new_abs( $test, $base->uri_value )->as_string; my $parsed = 1; - try { + eval { $parser->parse_file_into_model( $tbase, $fh, $model ); - } catch (RDF::Trine::Error::ParserError::Explainable $e) { - $parsed = 0; - $e->explain( $fh ); - } catch (RDF::Trine::Error $e) { - $parsed = 0; - warn "Failed to parse $file: " . $e->text; - } catch ($err) { - warn $err; - $parsed = 0; + }; + + if (my $e = $@) { + if (blessed($e) and $e->isa('RDF::Trine::Error::ParserError::Explainable')) { + $parsed = 0; + $e->explain( $fh ); + } elsif ($e->isa('RDF::Trine::Error')) { + $parsed = 0; + warn "Failed to parse $file: " . $e->text; + } else { + warn $e; + $parsed = 0; + } } if ($parsed) { compare($model, URI->new($res_file->uri), $base, $test); @@ -157,7 +165,7 @@ my $tbase = URI->new_abs( $name, $base->uri_value )->as_string; my $file = $url->file; open( my $fh, '<:encoding(UTF-8)', $file ); - try { + eval { $parser->parse_file_into_model( $tbase, $fh, $emodel ); };
