aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/gd-fix-tests-on-i686.patch
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-07-28 16:43:53 -0400
committerLeo Famulari <leo@famulari.name>2016-07-28 16:45:02 -0400
commita1dfa0223329734d2cb4f9aa034183fb2573bb9c (patch)
tree3aceb22407c47e4460705758243c69807f815518 /gnu/packages/patches/gd-fix-tests-on-i686.patch
parent4e3bfaf406eddc791265281025793182a20ac43f (diff)
downloadguix-a1dfa0223329734d2cb4f9aa034183fb2573bb9c.tar
guix-a1dfa0223329734d2cb4f9aa034183fb2573bb9c.tar.gz
Revert "gnu: gd: Update to 2.2.3 [fixes CVE-2016-6207]."
This reverts commit ae46cd0e4cfb1f06d099b2cda1f9e702e86c90e9.
Diffstat (limited to 'gnu/packages/patches/gd-fix-tests-on-i686.patch')
-rw-r--r--gnu/packages/patches/gd-fix-tests-on-i686.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/gnu/packages/patches/gd-fix-tests-on-i686.patch b/gnu/packages/patches/gd-fix-tests-on-i686.patch
deleted file mode 100644
index 8db64e6aaf..0000000000
--- a/gnu/packages/patches/gd-fix-tests-on-i686.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Disable some image comparison tests on architectures such as i686
-where intermediate floating-point operations are done with 80-bit long
-doubles, and typically later rounded to 64-bit doubles. This double
-rounding causes small differences in the resulting pixel values
-compared with other architectures, causing the image comparisons to
-fail.
-
-Patch by Mark H Weaver <mhw@netris.org>.
-
---- libgd-2.2.3/tests/gdimagerotate/bug00067.c 2016-06-18 05:42:16.000000000 -0400
-+++ libgd-2.2.3/tests/gdimagerotate/bug00067.c 2016-07-28 13:43:48.470767178 -0400
-@@ -1,5 +1,6 @@
- #include <stdio.h>
- #include <stdlib.h>
-+#include <float.h>
- #include "gd.h"
-
- #include "gdtest.h"
-@@ -43,7 +44,7 @@
-
- sprintf(filename, "bug00067_%03d_exp.png", angle);
- path = gdTestFilePath2("gdimagerotate", filename);
-- if (!gdAssertImageEqualsToFile(path, exp)) {
-+ if (FLT_EVAL_METHOD != 2 && !gdAssertImageEqualsToFile(path, exp)) {
- gdTestErrorMsg("comparing rotated image to %s failed.\n", path);
- error += 1;
- }
---- libgd-2.2.3/tests/gdimagecopyresampled/bug00201.c 2016-07-21 04:06:42.000000000 -0400
-+++ libgd-2.2.3/tests/gdimagecopyresampled/bug00201.c 2016-07-28 13:56:46.021447064 -0400
-@@ -1,3 +1,4 @@
-+#include <float.h>
- #include "gd.h"
- #include "gdtest.h"
-
-@@ -65,7 +66,7 @@
- gdImageDestroy(background);
- gdImageDestroy(scaled_logo);
-
-- gdAssertImageEqualsToFile("gdimagecopyresampled/bug00201_exp.png", img);
-+ FLT_EVAL_METHOD != 2 && gdAssertImageEqualsToFile("gdimagecopyresampled/bug00201_exp.png", img);
- gdImageDestroy(img);
- return gdNumFailures();
- }
---- libgd-2.2.3/tests/gdimagecopyresampled/basic_alpha.c 2016-07-21 04:06:42.000000000 -0400
-+++ libgd-2.2.3/tests/gdimagecopyresampled/basic_alpha.c 2016-07-28 13:57:18.857831608 -0400
-@@ -1,5 +1,6 @@
- /* Testing basic gdImageCopyResampled() functionality with alpha channel */
-
-+#include <float.h>
- #include "gd.h"
- #include "gdtest.h"
-
-@@ -33,7 +34,7 @@
- gdImageCopyResampled(copy, im, 0,0, 0,0, 200,200, 400,300);
- gdImageDestroy(im);
-
-- gdAssertImageEqualsToFile("gdimagecopyresampled/basic_alpha_exp.png", copy);
-+ FLT_EVAL_METHOD != 2 && gdAssertImageEqualsToFile("gdimagecopyresampled/basic_alpha_exp.png", copy);
-
- gdImageDestroy(copy);
- return gdNumFailures();