diff options
| author | Remi Collet <remi@remirepo.net> | 2019-04-04 11:35:16 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-04-04 11:35:16 +0200 |
| commit | 56a6b5928273a0c1a40beb51a0d71ca39dcac079 (patch) | |
| tree | f88cebfb4140b9d7849536921d1fdb27a090d9c0 | |
| parent | 517843f3f91f570946ecb30c1ecf81d60562d187 (diff) | |
add upstream patch to fix test suite on 32-bit
| -rw-r--r-- | dbase-rev347133.patch | 44 | ||||
| -rw-r--r-- | php-pecl-dbase.spec | 7 |
2 files changed, 50 insertions, 1 deletions
diff --git a/dbase-rev347133.patch b/dbase-rev347133.patch new file mode 100644 index 0000000..7b53892 --- /dev/null +++ b/dbase-rev347133.patch @@ -0,0 +1,44 @@ +--- pecl/dbase/trunk/tests/dbase_delete_record_error_32bit.phpt 2019/04/04 09:08:20 347132 ++++ pecl/dbase/trunk/tests/dbase_delete_record_error_32bit.phpt 2019/04/04 09:25:54 347133 +@@ -31,7 +31,7 @@ + Warning: dbase_delete_record(): record 1 out of bounds in %s on line %d
+ bool(false)
+
+-Warning: dbase_delete_record() expects parameter 2 to be integer, float given in %s on line %d
++Warning: dbase_delete_record() expects parameter 2 to be in%s, float given in %s on line %d
+ NULL
+ ===DONE===
+ --CLEAN--
+--- pecl/dbase/trunk/tests/dbase_get_record_error_32bit.phpt 2019/04/04 09:08:20 347132 ++++ pecl/dbase/trunk/tests/dbase_get_record_error_32bit.phpt 2019/04/04 09:25:54 347133 +@@ -32,7 +32,7 @@ + Warning: dbase_get_record(): Tried to read bad record 1 in %s on line %d
+ bool(false)
+
+-Warning: dbase_get_record() expects parameter 2 to be integer, float given in %s on line %d
++Warning: dbase_get_record() expects parameter 2 to be in%s, float given in %s on line %d
+ NULL
+ ===DONE===
+ --CLEAN--
+--- pecl/dbase/trunk/tests/dbase_get_record_with_names_error_32bit.phpt 2019/04/04 09:08:20 347132 ++++ pecl/dbase/trunk/tests/dbase_get_record_with_names_error_32bit.phpt 2019/04/04 09:25:54 347133 +@@ -32,7 +32,7 @@ + Warning: dbase_get_record_with_names(): Tried to read bad record 1 in %s on line %d
+ bool(false)
+
+-Warning: dbase_get_record_with_names() expects parameter 2 to be integer, float given in %s on line %d
++Warning: dbase_get_record_with_names() expects parameter 2 to be in%s, float given in %s on line %d
+ NULL
+ ===DONE===
+ --CLEAN--
+--- pecl/dbase/trunk/tests/dbase_replace_record_error_32bit.phpt 2019/04/04 09:08:20 347132 ++++ pecl/dbase/trunk/tests/dbase_replace_record_error_32bit.phpt 2019/04/04 09:25:54 347133 +@@ -30,7 +30,7 @@ + Warning: dbase_replace_record(): record number has to be in range 1..2147483647, but is -1 in %s on line %d
+ bool(false)
+
+-Warning: dbase_replace_record() expects parameter 3 to be integer, float given in %s on line %d
++Warning: dbase_replace_record() expects parameter 3 to be in%s, float given in %s on line %d
+ NULL
+
+ Warning: dbase_replace_record(): expected 7 fields, but got 0 in %s on line %d
diff --git a/php-pecl-dbase.spec b/php-pecl-dbase.spec index e391ab5..39473b7 100644 --- a/php-pecl-dbase.spec +++ b/php-pecl-dbase.spec @@ -30,6 +30,7 @@ URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz Patch0: %{pecl_name}-rev347132.patch +Patch1: %{pecl_name}-rev347133.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 @@ -96,7 +97,10 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p3 -b .up +%patch0 -p3 -b .up1 +%patch1 -p3 -b .up2 + +chmod -wx *.c *.h # Sanity check, really often broken extver=$(sed -n '/#define PHP_DBASE_VERSION/{s/.* "//;s/".*$//;p}' php_dbase.h) @@ -235,6 +239,7 @@ REPORT_EXIT_STATUS=1 \ * Thu Apr 4 2019 Remi Collet <remi@remirepo.net> - 7.0.0-0.7.RC1 - update to 7.0.0RC1 - add upstream patch to fix BC of dbase_create +- add upstream patch to fix test suite on 32-bit * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 7.0.0-0.6.beta1 - rebuild for 7.3.0beta2 new ABI |