From 6d8a3f21c1e3a4fc2b43e338b28863e2acdb5df87277fef7aa0f5b8bd770a6e4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 17 Feb 2015 13:00:42 +0000 Subject: [PATCH] bnc#405450 OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=71 --- java-1_8_0-openjdk.changes | 8 ++++++++ system-libjpeg.patch | 36 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index e6038fe..7647cdd 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 17 12:58:49 UTC 2015 - fstrba@suse.com + +- Modified patch + * system-libjpeg.patch + - correct the case mismatch that prevented JPEG decoder from + working correctly (bnc#905950) + ------------------------------------------------------------------- Mon Feb 16 08:01:42 UTC 2015 - fstrba@suse.com diff --git a/system-libjpeg.patch b/system-libjpeg.patch index 72666f9..ecbb6a1 100644 --- a/system-libjpeg.patch +++ b/system-libjpeg.patch @@ -1,5 +1,5 @@ ---- jdk8/common/autoconf/libraries.m4 2014-09-26 08:39:36.237838684 +0200 -+++ jdk8/common/autoconf/libraries.m4 2014-09-26 08:40:42.582300554 +0200 +--- jdk8/common/autoconf/libraries.m4 2015-02-17 13:27:11.468829365 +0100 ++++ jdk8/common/autoconf/libraries.m4 2015-02-17 13:27:49.143980484 +0100 @@ -608,11 +608,36 @@ # Check for the jpeg library # @@ -41,8 +41,8 @@ AC_SUBST(USE_EXTERNAL_LIBJPEG) ############################################################################### ---- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:39:35.205862611 +0200 -+++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2014-09-26 08:40:42.583300530 +0200 +--- jdk8/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 13:25:22.125292473 +0100 ++++ jdk8/jdk/make/lib/Awt2dLibraries.gmk 2015-02-17 13:28:30.812041352 +0100 @@ -704,18 +704,20 @@ ########################################################################################## @@ -70,7 +70,7 @@ endif endif -@@ -730,37 +732,50 @@ +@@ -730,37 +733,50 @@ # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # ifeq ($(CC_43_OR_NEWER), 1) @@ -84,7 +84,7 @@ +ifeq ($(USE_EXTERNAL_LIBJPEG), true) + LIBJPEG_LIBS := -ljpeg + BUILD_LIBJAVAJPEG_INCLUDE_FILES := \ -+ imageIOJPEG.c \ ++ imageioJPEG.c \ + jpegdecoder.c + BUILD_LIBJAVAJPEG_HEADERS := +else @@ -135,7 +135,7 @@ ########################################################################################## -@@ -1206,6 +1221,13 @@ +@@ -1206,6 +1222,13 @@ GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib endif @@ -149,7 +149,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1268,11 +1290,13 @@ +@@ -1268,11 +1291,13 @@ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ LANG := C, \ OPTIMIZATION := LOW, \ @@ -165,8 +165,8 @@ LDFLAGS_SUFFIX_solaris := -lc, \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ ---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-09-26 08:39:35.086865370 +0200 -+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-09-26 08:40:42.583300530 +0200 +--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2015-02-17 13:25:22.295288644 +0100 ++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2015-02-17 13:27:49.145980439 +0100 @@ -89,7 +89,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { @@ -176,8 +176,8 @@ return null; } }); ---- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-09-26 08:39:35.086865370 +0200 -+++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-09-26 08:40:42.584300507 +0200 +--- jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2015-02-17 13:25:22.295288644 +0100 ++++ jdk8/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2015-02-17 13:27:49.145980439 +0100 @@ -179,7 +179,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { @@ -187,8 +187,8 @@ return null; } }); ---- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2014-09-26 08:39:34.084888603 +0200 -+++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2014-09-26 08:40:42.584300507 +0200 +--- jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2015-02-17 13:25:22.170291459 +0100 ++++ jdk8/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java 2015-02-17 13:27:49.146980416 +0100 @@ -56,7 +56,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction() { @@ -198,8 +198,8 @@ return null; } }); ---- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-09-26 08:39:35.138864165 +0200 -+++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-09-26 08:40:42.584300507 +0200 +--- jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2015-02-17 13:25:22.531283329 +0100 ++++ jdk8/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2015-02-17 13:27:49.146980416 +0100 @@ -51,7 +51,7 @@ /* headers from the JPEG library */ @@ -209,8 +209,8 @@ #undef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) ---- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2014-09-26 08:39:35.138864165 +0200 -+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2014-09-26 08:40:42.584300507 +0200 +--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2015-02-17 13:25:22.539283148 +0100 ++++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2015-02-17 13:27:49.147980394 +0100 @@ -25,9 +25,9 @@ #include "splashscreen_impl.h"