[Pkg-php-commits] [php/debian-sid] Make locales-all build dependency useful by fixing language tests to use UTF-8

[Ondřej Surý]

---
 debian/patches/lang-test-use-utf8.patch |   39 +++++++++++++++++++++++++++++++
 debian/patches/series                   |    1 +
 2 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/lang-test-use-utf8.patch

diff --git a/debian/patches/lang-test-use-utf8.patch b/debian/patches/lang-test-use-utf8.patch
new file mode 100644
index 0000000..64e481c
--- /dev/null
+++ b/debian/patches/lang-test-use-utf8.patch
@@ -0,0 +1,39 @@
+--- a/tests/lang/bug30638.phpt
++++ b/tests/lang/bug30638.phpt
+@@ -2,7 +2,7 @@
+ Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X)
+ --SKIPIF--
+ <?php  # try to activate a german locale
+-if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) {
++if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
+ 	print "skip setlocale() failed";
+ } elseif (strtolower(php_uname('s')) == 'darwin') {
+     print "skip ok to fail on MacOS X";
+@@ -11,7 +11,7 @@ if (setlocale(LC_NUMERIC, "de_DE", "de",
+ --FILE--
+ <?php 
+ # activate the german locale
+-setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge");
++setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1");
+ 
+ $lc = localeconv();
+ printf("decimal_point: %s\n", $lc['decimal_point']);
+--- a/tests/lang/034.phpt
++++ b/tests/lang/034.phpt
+@@ -4,14 +4,14 @@ Bug #12647 (Locale settings affecting fl
+ precision=14
+ --SKIPIF--
+ <?php  # try to activate a german locale
+-if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1") === FALSE) {
++if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
+ 	print "skip";
+ }
+ ?>
+ --FILE--
+ <?php 
+ # activate the german locale
+-setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1");
++setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1");
+ 
+ echo (float)"3.14", "\n";
+ ?>
diff --git a/debian/patches/series b/debian/patches/series
index 4301c57..88bf05d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,3 +53,4 @@ fix_crash_in__php_mssql_get_column_content_without_type.patch
 php-fpm-sysconfdir.patch
 configure-as-needed.patch
 lp564920-fix-big-files.patch
+lang-test-use-utf8.patch
-- 
1.7.1