[gentoo-commits] repo/gentoo:master commit in: media-tv/xmltv/files/
commit: da5ccfde6ed30c26cee932375577a15abd4d8186
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed Jun 13 18:12:02 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Jun 13 18:51:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5ccfde
media-tv/xmltv: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/8831
media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch | 68 ---
1 file changed, 68 deletions(-)
diff --git a/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch
b/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch
deleted file mode 100644
index 6f92c07bf2a..000
--- a/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 97893e7a8121d5cb384e079f6d63702993785896 Mon Sep 17 00:00:00 2001
-From: Kent Fredric
-Date: Thu, 14 Sep 2017 08:32:21 +1200
-Subject: Fix configure+compile failing under Perl 5.26 without '.' in @INC
-
-Bug: https://bugs.gentoo.org/630474
- Makefile.PL | 2 +-
- filter/tv_grep.PL | 2 +-
- grab/it/tv_grab_it.PL | 2 +-
- lib/XMLTV.pm.PL | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index e068e20..0a0179c 100644
a/Makefile.PL
-+++ b/Makefile.PL
-@@ -251,7 +251,7 @@ elsif ($opt_default) {
- *ask = sub { print "$_[0] $_[2]\n"; $_[2] };
- }
- else {
--require 'lib/Ask/Term.pm';
-+require './lib/Ask/Term.pm';
- *ask = \&XMLTV::Ask::Term::ask_boolean;
- }
-
-diff --git a/filter/tv_grep.PL b/filter/tv_grep.PL
-index afc86b8..3f343b6 100644
a/filter/tv_grep.PL
-+++ b/filter/tv_grep.PL
-@@ -12,7 +12,7 @@
-
- use IO::File;
- use XMLTV;
--require 'filter/Grep.pm';
-+require './filter/Grep.pm';
-
- my $out = shift @ARGV; die "no output file given" if not defined $out;
- my $in = 'filter/tv_grep.in';
-diff --git a/grab/it/tv_grab_it.PL b/grab/it/tv_grab_it.PL
-index d337941..aee5554 100644
a/grab/it/tv_grab_it.PL
-+++ b/grab/it/tv_grab_it.PL
-@@ -354,7 +354,7 @@ close IN_FH or die "cannot close $in: $!";
-
- # stuff for setting share dir
- die "usage: $_ output_file share_dir" if @ARGV != 2;
--require 'lib/set_share_dir.pl';
-+require './lib/set_share_dir.pl';
- #warn "faccio $ARGV[0] $ARGV[1]\n";
- #set_share_dir('grab/it/tv_grab_it.in2', $ARGV[0], $ARGV[1]);
- copy( 'grab/it/tv_grab_it.in2', $ARGV[0] );
-diff --git a/lib/XMLTV.pm.PL b/lib/XMLTV.pm.PL
-index 270ed56..460bb4e 100644
a/lib/XMLTV.pm.PL
-+++ b/lib/XMLTV.pm.PL
-@@ -8,7 +8,7 @@ use strict;
- sub print_list( $$ );
-
- my $out = shift @ARGV; die "no output file given" if not defined $out;
--my $in = 'lib/XMLTV.pm.in';
-+my $in = './lib/XMLTV.pm.in';
- require $in;
- open(IN_FH, $in) or die "cannot read $in: $!";
- die if not @XMLTV::Channel_Handlers; die if not @XMLTV::Programme_Handlers;
---
-2.14.1
-
[gentoo-commits] repo/gentoo:master commit in: media-tv/xmltv/files/, media-tv/xmltv/
commit: 347ff1a15274fe00f1d05b2e072771e47c8a9f6a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Sep 23 10:45:45 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Sep 23 10:46:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347ff1a1
media-tv/xmltv: Half the work to make this compatible to Perl 5.26
Now the configure phase works. Unfortunately the written Makefile still
calls Perl, requiring modules in .
Bug: https://bugs.gentoo.org/630474
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch | 13 +
media-tv/xmltv/xmltv-0.5.68.ebuild| 4 +++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch
b/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch
new file mode 100644
index 000..4a23d783c25
--- /dev/null
+++ b/media-tv/xmltv/files/xmltv-0.5.68-perl526-1.patch
@@ -0,0 +1,13 @@
+diff -ruN xmltv-0.5.68.orig/Makefile.PL xmltv-0.5.68/Makefile.PL
+--- xmltv-0.5.68.orig/Makefile.PL 2016-06-02 07:05:01.0 +0200
xmltv-0.5.68/Makefile.PL 2017-09-23 12:20:18.128841958 +0200
+@@ -6,6 +6,9 @@
+ use File::Basename ();
+ use File::Find;
+
++# Needed later for Perl 5.26
++use lib q[.];
++
+ # Don't use ':config pass_through' because that requires Getopt::Long
+ # 2.24 or later, and we don't have a clean way to require that.
+ #
diff --git a/media-tv/xmltv/xmltv-0.5.68.ebuild
b/media-tv/xmltv/xmltv-0.5.68.ebuild
index f69e0b7e73e..73ffc2be3e9 100644
--- a/media-tv/xmltv/xmltv-0.5.68.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -87,6 +87,8 @@ src_prepare() {
-e "/^@docs/s:doc/COPYING ::" \
Makefile.PL || die
+ epatch "${FILESDIR}/${P}-perl526-1.patch"
+
epatch_user
}
[gentoo-commits] repo/gentoo:master commit in: media-tv/xmltv/files/
commit: 648941d3489d68bd0671966816770596981aedfa
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Mon Dec 26 15:03:16 2016 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Tue Dec 27 19:30:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648941d3
media-tv/xmltv: remove unused patch
media-tv/xmltv/files/xmltv-na_dd-xmltwig.patch | 10 --
1 file changed, 10 deletions(-)
diff --git a/media-tv/xmltv/files/xmltv-na_dd-xmltwig.patch
b/media-tv/xmltv/files/xmltv-na_dd-xmltwig.patch
deleted file mode 100644
index 285f03e..
--- a/media-tv/xmltv/files/xmltv-na_dd-xmltwig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
grab/na_dd/tv_grab_na_dd.in.orig 2006-11-29 18:06:47.0 +0100
-+++ grab/na_dd/tv_grab_na_dd.in2007-03-12 16:17:56.0 +0100
-@@ -737,7 +737,6 @@
- #
- $twig=XML::Twig->new(
- twig_roots=> { HTML => 1, message => 1, xtvd =>1},
-- ignore_elts => { schedules => 1 },
-twig_handlers =>
- {
-HTML => sub {
