diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index a647481..bf5012e 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 25 18:06:11 UTC 2015 - fstrba@suse.com + +- Modify patch: system-giflib5.patch + * Fix build with giflib 5.1.x + ------------------------------------------------------------------- Thu Jan 22 09:42:50 UTC 2015 - fstrba@suse.com diff --git a/system-giflib5.patch b/system-giflib5.patch index f685d4e..00d7d3b 100644 --- a/system-giflib5.patch +++ b/system-giflib5.patch @@ -1,6 +1,21 @@ --- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-09-26 08:52:13.001303676 +0200 +++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-09-26 08:53:14.143887542 +0200 -@@ -318,9 +318,18 @@ +@@ -310,7 +310,14 @@ + free(pBitmapBits); + free(pOldBitmapBits); + ++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ int error = 0; ++ DGifCloseFile(gif, &error); ++ if (error) ++ return 0; ++#else + DGifCloseFile(gif); ++#endif + + return 1; + } +@@ -318,9 +325,18 @@ int SplashDecodeGifStream(Splash * splash, SplashStream * stream) {