jvanek pushed to java-1.8.0-openjdk (master). " added Patch506 gif4.1.patch to allow build agaisnt giflib > 4.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 25 13:04:43 UTC 2015


From 615ee0d451b1ac69daaadac0fd1bfbd29ef1418a Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek at redhat.com>
Date: Mon, 25 May 2015 15:04:32 +0200
Subject:  added Patch506 gif4.1.patch to allow build agaisnt giflib > 4.1


diff --git a/gif4.1.patch b/gif4.1.patch
new file mode 100644
index 0000000..e8a26c9
--- /dev/null
+++ b/gif4.1.patch
@@ -0,0 +1,20 @@
+--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
+@@ -296,7 +296,7 @@
+     free(pBitmapBits);
+     free(pOldBitmapBits);
+ 
+-    DGifCloseFile(gif, NULL);
++    DGifCloseFile(gif);
+ 
+     return 1;
+ }
+@@ -304,7 +304,7 @@
+ int
+ SplashDecodeGifStream(Splash * splash, SplashStream * stream)
+ {
+-    GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, NULL);
++    GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc);
+ 
+     if (!gif)
+         return 0;
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index ee6c459..0a5db7a 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -731,6 +731,7 @@ Patch403: rhbz1206656_fix_current_stack_pointer.patch
 Patch503: d318d83c4e74.patch
 # Patch for upstream JDK-8078666 (RHBZ#1208369)
 Patch505: 1208369_memory_leak_gcc5.patch
+Patch506: gif4.1.patch
 
 
 Patch9999: enableArm64.patch
@@ -1022,6 +1023,7 @@ tar xzf %{SOURCE8}
 
 %patch503
 %patch505
+%patch506
 
 %if %{include_debug_build}
 cp -r tapset tapset%{debug_suffix}
@@ -1712,6 +1714,7 @@ end
    patch401 fix_ZERO_ARCHDEF_ppc.patch
    patch400 ppc_stack_overflow_fix.patch
    patch204 zero-interpreter-fix.patch
+- added Patch506 gif4.1.patch to allow build agaisnt giflib > 4.1
 
 * Wed May 13 2015 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.45-38.b14
 - updated to 8u45-b14 with hope to fix rhbz#1123870
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/commit/?h=master&id=615ee0d451b1ac69daaadac0fd1bfbd29ef1418a


More information about the scm-commits mailing list