On Sun 2019.01.27 at 00:12 +0100, Charlene Wendling wrote:
> On Sat, 26 Jan 2019 22:04:02 +0000
> Stuart Henderson wrote:
>
> > I'm working on getting p5-* ports in shape for the forthcoming Perl
> > update, trying to update where possible and avoiding resorting to
> > crappy patches unless there's nothing suitable upstream.
> >
> > We are a bit behind with XML::Feed but updating this breaks Plagger
> > tests, does anyone have time to look into what's needed for that
> > please?
> >
> > XML::Feed diff below.
> >
>
> Hi,
>
> It just needed to find elsewhere for the RSS module hopefully :)
Hi,
Thanks. I posted a diff back in 2016 for both p5-XML-Feed and
p5-Plagger. I believe the Plagger fixes also need to include adjusting
the parameter feed for XML::Feed's PREFERRED_PARSER. I solved this back
then by doing a sed in the port Makefile, but patches are fine with me,
but need slight adjusting. In any case, below is the diff for Plagger
with the paramater adjustment. Seems upstream has missed changes since
going silent...
Thanks
Index: Makefile
===================================================================
RCS file: /home/open/cvs/ports/www/p5-Plagger/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 20 Mar 2016 19:57:21 -0000 1.9
+++ Makefile 28 Jan 2019 00:06:35 -0000
@@ -5,7 +5,7 @@ COMMENT= pluggable RSS/Atom aggregator
MODULES= cpan
PKG_ARCH= *
DISTNAME= Plagger-0.7.17
-REVISION= 1
+REVISION= 2
CATEGORIES= www textproc
CPAN_AUTHOR= MIYAGAWA
Index: patches/patch-lib_Plagger_FeedParser_pm
===================================================================
RCS file: patches/patch-lib_Plagger_FeedParser_pm
diff -N patches/patch-lib_Plagger_FeedParser_pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Plagger_FeedParser_pm 28 Jan 2019 00:16:27 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix Plagger runtime with p5-XML-Feed>=0.55
+
+Index: lib/Plagger/FeedParser.pm
+--- lib/Plagger/FeedParser.pm.orig
++++ lib/Plagger/FeedParser.pm
+@@ -4,8 +4,8 @@ use strict;
+ use Feed::Find;
+ use XML::Atom;
+ use XML::Feed;
+-use XML::Feed::RSS;
+-$XML::Feed::RSS::PREFERRED_PARSER = "XML::RSS::LibXML";
++use XML::Feed::Format::RSS;
++$XML::Feed::Format::RSS::PREFERRED_PARSER = "XML::RSS::LibXML";
+ $XML::Atom::ForceUnicode = 1;
+
+ use Plagger::Util;
Index: patches/patch-lib_Plagger_Plugin_Publish_Feed_pm
===================================================================
RCS file: patches/patch-lib_Plagger_Plugin_Publish_Feed_pm
diff -N patches/patch-lib_Plagger_Plugin_Publish_Feed_pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Plagger_Plugin_Publish_Feed_pm 28 Jan 2019 00:16:48
-0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Fix Plagger runtime with p5-XML-Feed>=0.55
+
+Index: lib/Plagger/Plugin/Publish/Feed.pm
+--- lib/Plagger/Plugin/Publish/Feed.pm.orig
++++ lib/Plagger/Plugin/Publish/Feed.pm
+@@ -5,11 +5,11 @@ use base qw( Plagger::Plugin );
+
+ use XML::Feed;
+ use XML::Feed::Entry;
+-use XML::Feed::RSS; # load explicitly to force LibXML
++use XML::Feed::Format::RSS; # load explicitly to force LibXML
+ use XML::RSS::LibXML;
+ use File::Spec;
+
+-$XML::Feed::RSS::PREFERRED_PARSER = "XML::RSS::LibXML";
++$XML::Feed::Format::RSS::PREFERRED_PARSER = "XML::RSS::LibXML";
+
+ sub register {
+ my($self, $context) = @_;
Index: patches/patch-lib_Plagger_pm
===================================================================
RCS file: patches/patch-lib_Plagger_pm
diff -N patches/patch-lib_Plagger_pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Plagger_pm 28 Jan 2019 00:16:16 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix Plagger runtime with p5-XML-Feed>=0.55
+
+Index: lib/Plagger.pm
+--- lib/Plagger.pm.orig
++++ lib/Plagger.pm
+@@ -25,7 +25,7 @@ use Plagger::Feed;
+ use Plagger::Subscription;
+ use Plagger::Template;
+ use Plagger::Update;
+-use Plagger::UserAgent; # use to define $XML::Feed::RSS::PREFERRED_PARSER
++use Plagger::UserAgent; # use to define
$XML::Feed::Format::RSS::PREFERRED_PARSER
+
+ my $context;
+ sub context { $context }
