help wanted, www/p5-XML-Feed update

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

help wanted, www/p5-XML-Feed update

Stuart Henderson
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.


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/p5-XML-Feed/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 20 Mar 2016 19:57:23 -0000 1.8
+++ Makefile 26 Jan 2019 21:57:47 -0000
@@ -5,8 +5,7 @@ COMMENT= interface to RSS and Atom feed
 MODULES= cpan
 PKG_ARCH= *
 
-DISTNAME= XML-Feed-0.12
-REVISION= 0
+DISTNAME= XML-Feed-0.55
 CATEGORIES= www textproc
 CONFIGURE_STYLE=modbuild
 
@@ -21,6 +20,7 @@ RUN_DEPENDS= devel/p5-Class-ErrorHandler
  devel/p5-DateTime \
  devel/p5-DateTime-Format-Mail \
  devel/p5-DateTime-Format-W3CDTF \
+ devel/p5-Module-Pluggable \
  www/p5-URI-Fetch \
  www/p5-Feed-Find \
  www/p5-XML-Atom
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/p5-XML-Feed/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:15:47 -0000 1.2
+++ distinfo 26 Jan 2019 21:57:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (XML-Feed-0.12.tar.gz) = ti1MXXUA8m+6qhrLnseoYIq2X1jSpIFn+Z8ncRBdKVI=
-SIZE (XML-Feed-0.12.tar.gz) = 39125
+SHA256 (XML-Feed-0.55.tar.gz) = cWjKb5Bijc0IfflNWuufL7ejULiGjgC/7T0X/3Ehoyo=
+SIZE (XML-Feed-0.55.tar.gz) = 55702
Index: patches/patch-Makefile_PL
===================================================================
RCS file: patches/patch-Makefile_PL
diff -N patches/patch-Makefile_PL
--- patches/patch-Makefile_PL 18 Apr 2007 00:16:58 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-Makefile_PL,v 1.1.1.1 2007/04/18 00:16:58 espie Exp $
---- Makefile.PL.orig Wed Apr 18 02:14:47 2007
-+++ Makefile.PL Wed Apr 18 02:14:56 2007
-@@ -12,6 +12,7 @@ sign(1);
-
- include('ExtUtils::AutoInstall');
-
-+=pod
- requires('Class::ErrorHandler');
- requires('Feed::Find');
- requires('URI::Fetch');
-@@ -21,6 +22,7 @@ requires('DateTime');
- requires('DateTime::Format::Mail');
- requires('DateTime::Format::W3CDTF');
- requires('List::Util');
-+=cut
- build_requires('LWP');
- build_requires('HTML::TokeParser');
- build_requires('Test::More');
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/p5-XML-Feed/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Apr 2007 00:16:58 -0000 1.1.1.1
+++ pkg/PLIST 26 Jan 2019 21:57:47 -0000
@@ -1,10 +1,19 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2007/04/18 00:16:58 espie Exp $
 ${P5SITE}/XML/Feed/
 ${P5SITE}/XML/Feed.pm
-${P5SITE}/XML/Feed/Atom.pm
 ${P5SITE}/XML/Feed/Content.pm
+${P5SITE}/XML/Feed/Enclosure.pm
+${P5SITE}/XML/Feed/Entry/
 ${P5SITE}/XML/Feed/Entry.pm
-${P5SITE}/XML/Feed/RSS.pm
+${P5SITE}/XML/Feed/Entry/Format/
+${P5SITE}/XML/Feed/Entry/Format/Atom.pm
+${P5SITE}/XML/Feed/Entry/Format/RSS.pm
+${P5SITE}/XML/Feed/Format/
+${P5SITE}/XML/Feed/Format/Atom.pm
+${P5SITE}/XML/Feed/Format/RSS.pm
+${P5SITE}/XML/Feed/Util.pm
 @man man/man3p/XML::Feed.3p
 @man man/man3p/XML::Feed::Content.3p
+@man man/man3p/XML::Feed::Enclosure.3p
 @man man/man3p/XML::Feed::Entry.3p
+@man man/man3p/XML::Feed::Util.3p

Reply | Threaded
Open this post in threaded view
|

Re: help wanted, www/p5-XML-Feed update

Charlene Wendling
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 :)

The test passes here.

Charlène.


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/p5-Plagger/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile 20 Mar 2016 19:57:21 -0000 1.9
+++ Makefile 26 Jan 2019 23:07:58 -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 26 Jan 2019 23:07:58 -0000
@@ -0,0 +1,14 @@
+$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,7 +4,7 @@ use strict;
+ use Feed::Find;
+ use XML::Atom;
+ use XML::Feed;
+-use XML::Feed::RSS;
++use XML::Feed::Format::RSS;
+ $XML::Feed::RSS::PREFERRED_PARSER = "XML::RSS::LibXML";
+ $XML::Atom::ForceUnicode = 1;
+
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 26 Jan 2019 23:07:58 -0000
@@ -0,0 +1,14 @@
+$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,7 +5,7 @@ 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;
+

Reply | Threaded
Open this post in threaded view
|

Re: help wanted, www/p5-XML-Feed update

Okan Demirmen
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 }

Reply | Threaded
Open this post in threaded view
|

Re: help wanted, www/p5-XML-Feed update

Okan Demirmen
In reply to this post by Stuart Henderson
On Sat 2019.01.26 at 22:04 +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.

This is almost identical to the update posted in 2016 (outside of a
slightly higher version number :)). IIRC, portroach was the only thing I
could not test. Outside of that, I'm ok with this.

Thanks!
 

>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/p5-XML-Feed/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 20 Mar 2016 19:57:23 -0000 1.8
> +++ Makefile 26 Jan 2019 21:57:47 -0000
> @@ -5,8 +5,7 @@ COMMENT= interface to RSS and Atom feed
>  MODULES= cpan
>  PKG_ARCH= *
>  
> -DISTNAME= XML-Feed-0.12
> -REVISION= 0
> +DISTNAME= XML-Feed-0.55
>  CATEGORIES= www textproc
>  CONFIGURE_STYLE=modbuild
>  
> @@ -21,6 +20,7 @@ RUN_DEPENDS= devel/p5-Class-ErrorHandler
>   devel/p5-DateTime \
>   devel/p5-DateTime-Format-Mail \
>   devel/p5-DateTime-Format-W3CDTF \
> + devel/p5-Module-Pluggable \
>   www/p5-URI-Fetch \
>   www/p5-Feed-Find \
>   www/p5-XML-Atom
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/p5-XML-Feed/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 18 Jan 2015 03:15:47 -0000 1.2
> +++ distinfo 26 Jan 2019 21:57:47 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (XML-Feed-0.12.tar.gz) = ti1MXXUA8m+6qhrLnseoYIq2X1jSpIFn+Z8ncRBdKVI=
> -SIZE (XML-Feed-0.12.tar.gz) = 39125
> +SHA256 (XML-Feed-0.55.tar.gz) = cWjKb5Bijc0IfflNWuufL7ejULiGjgC/7T0X/3Ehoyo=
> +SIZE (XML-Feed-0.55.tar.gz) = 55702
> Index: patches/patch-Makefile_PL
> ===================================================================
> RCS file: patches/patch-Makefile_PL
> diff -N patches/patch-Makefile_PL
> --- patches/patch-Makefile_PL 18 Apr 2007 00:16:58 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-Makefile_PL,v 1.1.1.1 2007/04/18 00:16:58 espie Exp $
> ---- Makefile.PL.orig Wed Apr 18 02:14:47 2007
> -+++ Makefile.PL Wed Apr 18 02:14:56 2007
> -@@ -12,6 +12,7 @@ sign(1);
> -
> - include('ExtUtils::AutoInstall');
> -
> -+=pod
> - requires('Class::ErrorHandler');
> - requires('Feed::Find');
> - requires('URI::Fetch');
> -@@ -21,6 +22,7 @@ requires('DateTime');
> - requires('DateTime::Format::Mail');
> - requires('DateTime::Format::W3CDTF');
> - requires('List::Util');
> -+=cut
> - build_requires('LWP');
> - build_requires('HTML::TokeParser');
> - build_requires('Test::More');
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/p5-XML-Feed/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 18 Apr 2007 00:16:58 -0000 1.1.1.1
> +++ pkg/PLIST 26 Jan 2019 21:57:47 -0000
> @@ -1,10 +1,19 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2007/04/18 00:16:58 espie Exp $
>  ${P5SITE}/XML/Feed/
>  ${P5SITE}/XML/Feed.pm
> -${P5SITE}/XML/Feed/Atom.pm
>  ${P5SITE}/XML/Feed/Content.pm
> +${P5SITE}/XML/Feed/Enclosure.pm
> +${P5SITE}/XML/Feed/Entry/
>  ${P5SITE}/XML/Feed/Entry.pm
> -${P5SITE}/XML/Feed/RSS.pm
> +${P5SITE}/XML/Feed/Entry/Format/
> +${P5SITE}/XML/Feed/Entry/Format/Atom.pm
> +${P5SITE}/XML/Feed/Entry/Format/RSS.pm
> +${P5SITE}/XML/Feed/Format/
> +${P5SITE}/XML/Feed/Format/Atom.pm
> +${P5SITE}/XML/Feed/Format/RSS.pm
> +${P5SITE}/XML/Feed/Util.pm
>  @man man/man3p/XML::Feed.3p
>  @man man/man3p/XML::Feed::Content.3p
> +@man man/man3p/XML::Feed::Enclosure.3p
>  @man man/man3p/XML::Feed::Entry.3p
> +@man man/man3p/XML::Feed::Util.3p
>

Reply | Threaded
Open this post in threaded view
|

Re: help wanted, www/p5-XML-Feed update

Stuart Henderson
In reply to this post by Okan Demirmen
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) = @_;

Reply | Threaded
Open this post in threaded view
|

Re: help wanted, www/p5-XML-Feed update

Okan Demirmen
On Mon 2019.01.28 at 00:49 +0000, Stuart Henderson wrote:

> 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:

OK - thanks :)
 

> 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) = @_;
>