| 1 |
commit: 5f648e20972eff6a184f51e0d33c1c2c2e5b4049 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 22 19:57:04 2021 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 22 19:57:48 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f648e20 |
| 7 |
|
| 8 |
dev-php/pecl-geoip: Update PHP targets |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/fix-failing-tests-php8-1-1.1.1.patch | 71 ++++++++++++++++++++++ |
| 13 |
dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild | 7 ++- |
| 14 |
2 files changed, 75 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch b/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000000..a2f8353b438c |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch |
| 21 |
@@ -0,0 +1,71 @@ |
| 22 |
+diff --git a/tests/014.phpt b/tests/014.phpt |
| 23 |
+index 40f3ef8..93bc1f7 100644 |
| 24 |
+--- a/tests/014.phpt |
| 25 |
++++ b/tests/014.phpt |
| 26 |
+@@ -8,10 +8,9 @@ Checking timezone info with (some) empty fields |
| 27 |
+ <?php |
| 28 |
+ |
| 29 |
+ var_dump(geoip_time_zone_by_country_and_region('US','MA')); |
| 30 |
+-var_dump(geoip_time_zone_by_country_and_region('US',NULL)); |
| 31 |
++var_dump(geoip_time_zone_by_country_and_region('US','')); |
| 32 |
+ var_dump(geoip_time_zone_by_country_and_region('DE')); |
| 33 |
+-var_dump(geoip_time_zone_by_country_and_region(NULL,'')); |
| 34 |
+-var_dump(geoip_time_zone_by_country_and_region(NULL,NULL)); |
| 35 |
++var_dump(geoip_time_zone_by_country_and_region('','')); |
| 36 |
+ |
| 37 |
+ ?> |
| 38 |
+ --EXPECTF-- |
| 39 |
+@@ -21,6 +20,3 @@ string(%d) "Europe/%s" |
| 40 |
+ |
| 41 |
+ Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d |
| 42 |
+ bool(false) |
| 43 |
+- |
| 44 |
+-Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d |
| 45 |
+-bool(false) |
| 46 |
+diff --git a/tests/016.phpt b/tests/016.phpt |
| 47 |
+index 83c5250..9b2f056 100644 |
| 48 |
+--- a/tests/016.phpt |
| 49 |
++++ b/tests/016.phpt |
| 50 |
+@@ -8,10 +8,8 @@ Checking geoip_region_name_by_code with (some) empty fields |
| 51 |
+ <?php |
| 52 |
+ |
| 53 |
+ var_dump(geoip_region_name_by_code('CA','')); |
| 54 |
+-var_dump(geoip_region_name_by_code('CA',NULL)); |
| 55 |
+ var_dump(geoip_region_name_by_code('CA',1)); |
| 56 |
+ var_dump(geoip_region_name_by_code('','QC')); |
| 57 |
+-var_dump(geoip_region_name_by_code(NULL,'QC')); |
| 58 |
+ var_dump(geoip_region_name_by_code(1,'QC')); |
| 59 |
+ |
| 60 |
+ ?> |
| 61 |
+@@ -19,12 +17,6 @@ var_dump(geoip_region_name_by_code(1,'QC')); |
| 62 |
+ |
| 63 |
+ Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d |
| 64 |
+ bool(false) |
| 65 |
+- |
| 66 |
+-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d |
| 67 |
+-bool(false) |
| 68 |
+-bool(false) |
| 69 |
+- |
| 70 |
+-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d |
| 71 |
+ bool(false) |
| 72 |
+ |
| 73 |
+ Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d |
| 74 |
+diff --git a/tests/019.phpt b/tests/019.phpt |
| 75 |
+new file mode 100644 |
| 76 |
+index 0000000..9493ea3 |
| 77 |
+--- /dev/null |
| 78 |
++++ b/tests/019.phpt |
| 79 |
+@@ -0,0 +1,13 @@ |
| 80 |
++--TEST-- |
| 81 |
++Checking geoip_country_code_by_name_v6 (if IPv6 DB installed) |
| 82 |
++--SKIPIF-- |
| 83 |
++<?php if (!extension_loaded("geoip") || !defined("GEOIP_COUNTRY_EDITION_V6") || !geoip_db_avail(GEOIP_COUNTRY_EDITION_V6)) print "skip"; ?> |
| 84 |
++--INI-- |
| 85 |
++--FILE-- |
| 86 |
++<?php |
| 87 |
++ |
| 88 |
++var_dump( geoip_country_code_by_name_v6('2001:4860:4860::8888') ); |
| 89 |
++ |
| 90 |
++?> |
| 91 |
++--EXPECT-- |
| 92 |
++string(2) "US" |
| 93 |
|
| 94 |
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild |
| 95 |
index f5bbf1f24038..d7d644983bb4 100644 |
| 96 |
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild |
| 97 |
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild |
| 98 |
@@ -1,11 +1,11 @@ |
| 99 |
-# Copyright 1999-2019 Gentoo Authors |
| 100 |
+# Copyright 1999-2021 Gentoo Authors |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
|
| 103 |
-EAPI=6 |
| 104 |
+EAPI=7 |
| 105 |
|
| 106 |
PHP_EXT_NAME="geoip" |
| 107 |
DOCS="README ChangeLog" |
| 108 |
-USE_PHP="php7-2 php7-3 php7-4 php8-0" |
| 109 |
+USE_PHP="php7-3 php7-4 php8-0 php8-1" |
| 110 |
|
| 111 |
inherit php-ext-pecl-r3 |
| 112 |
|
| 113 |
@@ -22,4 +22,5 @@ RDEPEND="${DEPEND}" |
| 114 |
PATCHES=( |
| 115 |
"${FILESDIR}/fix-failing-tests-1.1.1.patch" |
| 116 |
"${FILESDIR}/php8-support-1.1.1.patch" |
| 117 |
+ "${FILESDIR}/fix-failing-tests-php8-1-1.1.1.patch" |
| 118 |
) |
Archives