1 |
commit: e0a40e25277eacfaa1ba7e63ee886a6aee8a4230 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Mon Nov 1 16:23:33 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 1 17:55:43 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a40e25 |
7 |
|
8 |
dev-perl/Google-Ads-AdWords-Client: remove unused patch(es) |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/22783 |
11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../files/4.14.0-no-dot-in-inc.patch | 83 ---------------------- |
16 |
.../files/4.14.0-unescaped-lbracket.patch | 46 ------------ |
17 |
2 files changed, 129 deletions(-) |
18 |
|
19 |
diff --git a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch |
20 |
deleted file mode 100644 |
21 |
index 218cb69b148..00000000000 |
22 |
--- a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch |
23 |
+++ /dev/null |
24 |
@@ -1,83 +0,0 @@ |
25 |
-From a67324b5622088422b0b0c1a403c594312452d16 Mon Sep 17 00:00:00 2001 |
26 |
-From: Kent Fredric <kentfredric@×××××.com> |
27 |
-Date: Sun, 4 Jun 2017 07:35:25 +1200 |
28 |
-Subject: [PATCH 1/3] t/001_require.t: Force a relative path load for require |
29 |
- test |
30 |
- |
31 |
-require_ok("Foo") is implemented in terms of require "Foo" |
32 |
- |
33 |
-This means: |
34 |
- |
35 |
-require "Foo.pm" |
36 |
- |
37 |
-Only loads "Foo.pm" from "." if: |
38 |
- |
39 |
-- '.' is in @INC ( Not true by default in Perl >5.25.11 ) |
40 |
-- Foo.pm is not installed in Perl5lib ( dangerous assumption ) |
41 |
- |
42 |
-This forces require to side-step @INC traversal by using an explicit |
43 |
-prefix of "./", which is special-cased in require. |
44 |
- |
45 |
-This fixes RT#120674 |
46 |
- |
47 |
-Bug: https://rt.cpan.org/Ticket/Display.html?id=120674 |
48 |
---- |
49 |
- t/001_require.t | 4 ++-- |
50 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
51 |
- |
52 |
-diff --git a/t/001_require.t b/t/001_require.t |
53 |
-index fe0d205..d70b2d2 100755 |
54 |
---- a/t/001_require.t |
55 |
-+++ b/t/001_require.t |
56 |
-@@ -24,7 +24,7 @@ use File::Spec; |
57 |
- use Test::More qw(no_plan); |
58 |
- |
59 |
- # Set up @INC at runtime with an absolute path. |
60 |
--my $lib_path = File::Spec->catdir(dirname($0), "..", "lib"); |
61 |
-+my $lib_path = File::Spec->rel2abs(File::Spec->catdir(dirname($0), "..", "lib")); |
62 |
- push(@INC, $lib_path); |
63 |
- |
64 |
- require_ok 'Google::Ads::AdWords::Client'; |
65 |
-@@ -38,6 +38,6 @@ sub test_require { |
66 |
- local $SIG{__WARN__} = sub { |
67 |
- warn @_ unless $_[0] =~ /redefine/; |
68 |
- }; |
69 |
-- require_ok($file_name); |
70 |
-+ require_ok("./$file_name"); |
71 |
- } |
72 |
- } |
73 |
--- |
74 |
-2.12.2 |
75 |
- |
76 |
-From 76f5a421585b8c85b7e39b91adb0b257d1d83665 Mon Sep 17 00:00:00 2001 |
77 |
-From: Kent Fredric <kentfredric@×××××.com> |
78 |
-Date: Sun, 4 Jun 2017 07:40:01 +1200 |
79 |
-Subject: [PATCH 2/3] t/020_GenerateOfflineCredentials.t: Force relative path |
80 |
- for script |
81 |
- |
82 |
-require "some/path.pl" previously fell into worknig due to '.' being |
83 |
-in @INC, as this still invokes @INC traversal |
84 |
- |
85 |
-This change simply forces a "./" so that Perl uses direct access via |
86 |
-a special-cased path instead of relying on @INC traversal, which becomes |
87 |
-unsafe to depend on since Perl 5.25.11 |
88 |
---- |
89 |
- t/020_GenerateOfflineCredentials.t | 2 +- |
90 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
91 |
- |
92 |
-diff --git a/t/020_GenerateOfflineCredentials.t b/t/020_GenerateOfflineCredentials.t |
93 |
-index 0dcde9d..dfa8b50 100755 |
94 |
---- a/t/020_GenerateOfflineCredentials.t |
95 |
-+++ b/t/020_GenerateOfflineCredentials.t |
96 |
-@@ -51,7 +51,7 @@ my $stdout; |
97 |
- open(STDOUT, ">", \$stdout); |
98 |
- |
99 |
- # Calling the offline credentials code |
100 |
--require qw(examples/oauth/generate_offline_credentials.pl); |
101 |
-+require qw(./examples/oauth/generate_offline_credentials.pl); |
102 |
- ok(generate_offline_credentials($client)); |
103 |
- |
104 |
- # Checking the auth mock was correctly called |
105 |
--- |
106 |
-2.12.2 |
107 |
- |
108 |
|
109 |
diff --git a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch |
110 |
deleted file mode 100644 |
111 |
index 4e7a4546f9c..00000000000 |
112 |
--- a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch |
113 |
+++ /dev/null |
114 |
@@ -1,46 +0,0 @@ |
115 |
-From a7e92591ac0415fbb7119e4ad7572f910e4fdb8f Mon Sep 17 00:00:00 2001 |
116 |
-From: Kent Fredric <kentfredric@×××××.com> |
117 |
-Date: Sun, 4 Jun 2017 07:43:59 +1200 |
118 |
-Subject: [PATCH 3/3] Fix unescaped "{" error in tests t/022* and t/024* |
119 |
- |
120 |
-Perl 5.26 makes use of literal unescaped { in a regex illegal, |
121 |
-and this leads to test failures. |
122 |
- |
123 |
-This change simply quotes the offending characters to make tests pass. |
124 |
- |
125 |
-This closes RT#118509 |
126 |
- |
127 |
-Bug: https://rt.cpan.org/Ticket/Display.html?id=118509 |
128 |
---- |
129 |
- t/022_ReportUtils.t | 2 +- |
130 |
- t/024_BatchJobHandler.t | 2 +- |
131 |
- 2 files changed, 2 insertions(+), 2 deletions(-) |
132 |
- |
133 |
-diff --git a/t/022_ReportUtils.t b/t/022_ReportUtils.t |
134 |
-index 4f5f326..d0e2000 100755 |
135 |
---- a/t/022_ReportUtils.t |
136 |
-+++ b/t/022_ReportUtils.t |
137 |
-@@ -57,7 +57,7 @@ my $report_as_string = $report_handler->get_as_string(); |
138 |
- ok(!$report_as_string, "report as string"); |
139 |
- ok($report_as_string->isa("Google::Ads::Common::ReportDownloadError"), |
140 |
- "check report handler->report_as_string return type"); |
141 |
--ok($report_as_string =~ /ReportDownloadError\s{[^}]+}/, |
142 |
-+ok($report_as_string =~ /ReportDownloadError\s\{[^}]+}/, |
143 |
- "check ReportDownloadError STRINGIFY"); |
144 |
- |
145 |
- my ($fh, $filename) = tempfile(); |
146 |
-diff --git a/t/024_BatchJobHandler.t b/t/024_BatchJobHandler.t |
147 |
-index 15983ae..4b86703 100755 |
148 |
---- a/t/024_BatchJobHandler.t |
149 |
-+++ b/t/024_BatchJobHandler.t |
150 |
-@@ -133,6 +133,6 @@ my $batch_job_handler_error = |
151 |
- description => "test" |
152 |
- }); |
153 |
- ok(!$batch_job_handler_error, "BOOLIFY on error false"); |
154 |
--ok($batch_job_handler_error =~ /BatchJobHandlerError\s{[^}]+}/, |
155 |
-+ok($batch_job_handler_error =~ /BatchJobHandlerError\s\{[^}]+}/, |
156 |
- "check BatchJobHandlerError STRINGIFY"); |
157 |
- |
158 |
--- |
159 |
-2.12.2 |
160 |
- |