On 2019/01/27 19:44, Okan Demirmen wrote:
> 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...
Oops yes you're right, I missed that - diff on top of Charlene's commit:
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/p5-Plagger/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 27 Jan 2019 23:11:35 -0000 1.10
+++ Makefile 28 Jan 2019 00:48:18 -0000
@@ -5,7 +5,7 @@ COMMENT= pluggable RSS/Atom aggregator
MODULES= cpan
PKG_ARCH= *
DISTNAME= Plagger-0.7.17
-REVISION= 2
+REVISION= 3
CATEGORIES= www textproc
CPAN_AUTHOR= MIYAGAWA
Index: patches/patch-lib_Plagger_FeedParser_pm
===================================================================
RCS file: /cvs/ports/www/p5-Plagger/patches/patch-lib_Plagger_FeedParser_pm,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_Plagger_FeedParser_pm
--- patches/patch-lib_Plagger_FeedParser_pm 27 Jan 2019 23:11:35 -0000
1.1
+++ patches/patch-lib_Plagger_FeedParser_pm 28 Jan 2019 00:48:18 -0000
@@ -3,12 +3,14 @@ Fix Plagger runtime with p5-XML-Feed>=0.
Index: lib/Plagger/FeedParser.pm
--- lib/Plagger/FeedParser.pm.orig
+++ lib/Plagger/FeedParser.pm
-@@ -4,7 +4,7 @@ use strict;
+@@ -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::RSS::PREFERRED_PARSER = "XML::RSS::LibXML";
++$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:
/cvs/ports/www/p5-Plagger/patches/patch-lib_Plagger_Plugin_Publish_Feed_pm,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_Plagger_Plugin_Publish_Feed_pm
--- patches/patch-lib_Plagger_Plugin_Publish_Feed_pm 27 Jan 2019 23:11:35
-0000 1.1
+++ patches/patch-lib_Plagger_Plugin_Publish_Feed_pm 28 Jan 2019 00:48:18
-0000
@@ -3,7 +3,7 @@ Fix Plagger runtime with p5-XML-Feed>=0.
Index: lib/Plagger/Plugin/Publish/Feed.pm
--- lib/Plagger/Plugin/Publish/Feed.pm.orig
+++ lib/Plagger/Plugin/Publish/Feed.pm
-@@ -5,7 +5,7 @@ use base qw( Plagger::Plugin );
+@@ -5,11 +5,11 @@ use base qw( Plagger::Plugin );
use XML::Feed;
use XML::Feed::Entry;
@@ -12,3 +12,8 @@ Index: lib/Plagger/Plugin/Publish/Feed.p
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) = @_;
