[Pkg-php-commits] [php/debian-sid] Fix some gd tests that need the bundled library

[Raphael Geissert]

---
 .../fix_broken_gd_bundled-specific_tests.patch     |   92 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 93 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/fix_broken_gd_bundled-specific_tests.patch

diff --git a/debian/patches/fix_broken_gd_bundled-specific_tests.patch b/debian/patches/fix_broken_gd_bundled-specific_tests.patch
new file mode 100644
index 0000000..fa0ad62
--- /dev/null
+++ b/debian/patches/fix_broken_gd_bundled-specific_tests.patch
@@ -0,0 +1,92 @@
+Description: Backport upstream fix for tests that require the bundled 
+ gd library but are not skipped in case the external library is used.
+Origin: upstream
+
+Index: php/ext/gd/tests/bug42434.phpt
+===================================================================
+--- php.orig/ext/gd/tests/bug42434.phpt
++++ php/ext/gd/tests/bug42434.phpt
+@@ -5,6 +5,7 @@ Bug #42434 (ImageLine w/ antialias = 1px
+ if (!extension_loaded('gd')) {
+ 	die('skip gd extension not available');
+ }
++if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+ ?>
+ --FILE--
+ <?php
+Index: php/ext/gd/tests/imageantialias_error1.phpt
+===================================================================
+--- php.orig/ext/gd/tests/imageantialias_error1.phpt
++++ php/ext/gd/tests/imageantialias_error1.phpt
+@@ -6,6 +6,7 @@ Guilherme Blanco <guilhermeblanco [at] h
+ --SKIPIF--
+ <?php 
+ if (!extension_loaded("gd")) die("skip GD not present");
++if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+ ?>
+ --FILE--
+ <?php
+Index: php/ext/gd/tests/imageantialias_error2.phpt
+===================================================================
+--- php.orig/ext/gd/tests/imageantialias_error2.phpt
++++ php/ext/gd/tests/imageantialias_error2.phpt
+@@ -6,6 +6,7 @@ Guilherme Blanco <guilhermeblanco [at] h
+ --SKIPIF--
+ <?php 
+ if (!extension_loaded("gd")) die("skip GD not present");
++if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+ ?>
+ --FILE--
+ <?php
+Index: php/ext/gd/tests/imagelayereffect_basic.phpt
+===================================================================
+--- php.orig/ext/gd/tests/imagelayereffect_basic.phpt
++++ php/ext/gd/tests/imagelayereffect_basic.phpt
+@@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] co
+ --SKIPIF--
+ <?php 
+ 	if (!extension_loaded("gd")) die("skip GD not present");
+-	if (!GD_BUNDLED) die('function only available in bundled, external GD detected');
++	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
+ ?>
+ --FILE--
+ <?php
+Index: php/ext/gd/tests/imagelayereffect_error1.phpt
+===================================================================
+--- php.orig/ext/gd/tests/imagelayereffect_error1.phpt
++++ php/ext/gd/tests/imagelayereffect_error1.phpt
+@@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] co
+ --SKIPIF--
+ <?php 
+ 	if (!extension_loaded("gd")) die("skip GD not present");
+-	if (!GD_BUNDLED) die('function only available in bundled, external GD detected');
++	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
+ ?>
+ --FILE--
+ <?php
+Index: php/ext/gd/tests/imagelayereffect_error2.phpt
+===================================================================
+--- php.orig/ext/gd/tests/imagelayereffect_error2.phpt
++++ php/ext/gd/tests/imagelayereffect_error2.phpt
+@@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] co
+ --SKIPIF--
+ <?php 
+ 	if (!extension_loaded("gd")) die("skip GD not present");
+-	if (!GD_BUNDLED) die('function only available in bundled, external GD detected');
++	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
+ ?>
+ --FILE--
+ <?php
+Index: php/ext/gd/tests/imagelayereffect_error3.phpt
+===================================================================
+--- php.orig/ext/gd/tests/imagelayereffect_error3.phpt
++++ php/ext/gd/tests/imagelayereffect_error3.phpt
+@@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] co
+ --SKIPIF--
+ <?php 
+ 	if (!extension_loaded("gd")) die("skip GD not present");
+-	if (!GD_BUNDLED) die('function only available in bundled, external GD detected');
++	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
+ ?>
+ --FILE--
+ <?php
diff --git a/debian/patches/series b/debian/patches/series
index 289a670..142cd06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,3 +49,4 @@ use_embedded_timezonedb_fixes.patch
 fix_broken_sha2_test.patch
 php_crypt_revamped.patch
 fix_broken_locale_tests.patch
+fix_broken_gd_bundled-specific_tests.patch
-- 
1.6.3.3