Revert "gnu: gd: Add fix for gd2_read test."
This reverts commit ce290354ec.
			
			
This commit is contained in:
		
							parent
							
								
									ce290354ec
								
							
						
					
					
						commit
						31c995f8af
					
				
					 3 changed files with 1 additions and 17 deletions
				
			
		| 
						 | 
					@ -514,7 +514,6 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/gcc-cross-environment-variables.patch	\
 | 
					  %D%/packages/patches/gcc-cross-environment-variables.patch	\
 | 
				
			||||||
  %D%/packages/patches/gcc-libvtv-runpath.patch			\
 | 
					  %D%/packages/patches/gcc-libvtv-runpath.patch			\
 | 
				
			||||||
  %D%/packages/patches/gcc-5.0-libvtv-runpath.patch		\
 | 
					  %D%/packages/patches/gcc-5.0-libvtv-runpath.patch		\
 | 
				
			||||||
  %D%/packages/patches/gd-fix-gd2-read-test.patch		\
 | 
					 | 
				
			||||||
  %D%/packages/patches/gd-fix-tests-on-i686.patch		\
 | 
					  %D%/packages/patches/gd-fix-tests-on-i686.patch		\
 | 
				
			||||||
  %D%/packages/patches/gegl-CVE-2012-4433.patch			\
 | 
					  %D%/packages/patches/gegl-CVE-2012-4433.patch			\
 | 
				
			||||||
  %D%/packages/patches/geoclue-config.patch			\
 | 
					  %D%/packages/patches/geoclue-config.patch			\
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -50,8 +50,7 @@
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl"))
 | 
					               "0g3xz8jpz1pl2zzmssglrpa9nxiaa7rmcmvgpbrjz8k9cyynqsvl"))
 | 
				
			||||||
             (patches (search-patches "gd-fix-gd2-read-test.patch"
 | 
					             (patches (search-patches "gd-fix-tests-on-i686.patch"))))
 | 
				
			||||||
                                      "gd-fix-tests-on-i686.patch"))))
 | 
					 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("pkg-config" ,pkg-config)))
 | 
					     `(("pkg-config" ,pkg-config)))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,14 +0,0 @@
 | 
				
			||||||
Fix a 'maybe-uninitialized' warning (turned error)
 | 
					 | 
				
			||||||
which occurs on non-Intel platforms.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
--- libgd-2.2.3/tests/gd2/gd2_read.c	2016-07-21 01:21:16.000000000 -0400
 | 
					 | 
				
			||||||
+++ libgd-2.2.3/tests/gd2/gd2_read.c	2016-07-29 15:52:03.806405312 -0400
 | 
					 | 
				
			||||||
@@ -5,7 +5,7 @@
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 int main(int argc, char *argv[])
 | 
					 | 
				
			||||||
 {
 | 
					 | 
				
			||||||
-	int error, i = 0;
 | 
					 | 
				
			||||||
+	int error = 0, i = 0;
 | 
					 | 
				
			||||||
 	gdImagePtr im, exp;
 | 
					 | 
				
			||||||
 	FILE *fp;
 | 
					 | 
				
			||||||
 	char *path[] = {
 | 
					 | 
				
			||||||
		Reference in a new issue