/hg/icedtea6: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Dec 18 10:27:29 PST 2013
changeset c2dbf00e2536 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c2dbf00e2536
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Dec 18 16:26:14 2013 +0000
PR1376: Backport javac detection / usability test from IcedTea 2.x
2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Mention PR1376.
changeset 0c68fe8b2ced in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0c68fe8b2ced
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Dec 18 17:50:01 2013 +0000
PR1501: Backport IcedTea 2.x library removal script
2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1501: Backport IcedTea 2.x library removal script
* patches/openjdk/7002766-parfait-jpeg.patch: Moved to...
* patches/openjdk/libjpeg/7002766-parfait-jpeg.patch: ... here.
* Makefile.am:
(ICEDTEA_PATCHES): Drop 7002766 for the time being, until
an option to build with bundled libjpeg is added.
(extract): Depend on remove-intree-libraries.
(clean-extract): Depend on clean-remove-intree-libraries.
(remove-intree-libraries): Run new script.
(clean-remove-intree-libraries): Remove stamp.
* patches/libraries.patch:
Regenerated without removal of entire files, which is now
done by the script.
* patches/openjdk/6989774-imageio_compiler_warnings.patch:
Split libjpeg changes into...
* patches/openjdk/libjpeg/6989774-imageio_compiler_warnings.patch:
... this patch (currently unapplied as above).
* remove-intree-libraries.sh: Script to delete bundled
libjpeg, giflib, libpng & zlib.
* NEWS: Updated.
changeset 8572b7f3f51f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8572b7f3f51f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Dec 18 17:51:12 2013 +0000
Update AUTHORS with Michal.
2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* AUTHORS: Updated with Michal.
changeset c6f899bcf3f4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c6f899bcf3f4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Dec 18 17:52:21 2013 +0000
Put PR1290 in correct NEWS section.
2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Move PR1290 to new features list,
not bug fixes.
changeset 3d60006909d8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3d60006909d8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Dec 18 18:27:02 2013 +0000
Update NEWS with b29 changes not released in earlier versions.
2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Include changes new to b29.
diffstat:
AUTHORS | 1 +
ChangeLog | 40 +
Makefile.am | 14 +-
NEWS | 12 +-
patches/libraries.patch | 24400 +---------
patches/openjdk/6989774-imageio_compiler_warnings.patch | 130 -
patches/openjdk/7002766-parfait-jpeg.patch | 42 -
patches/openjdk/libjpeg/6989774-imageio_compiler_warnings.patch | 130 +
patches/openjdk/libjpeg/7002766-parfait-jpeg.patch | 42 +
remove-intree-libraries.sh | 71 +
10 files changed, 364 insertions(+), 24518 deletions(-)
diffs (truncated from 25257 to 500 lines):
diff -r a81a87c1a918 -r 3d60006909d8 AUTHORS
--- a/AUTHORS Wed Dec 18 15:22:58 2013 +0000
+++ b/AUTHORS Wed Dec 18 18:27:02 2013 +0000
@@ -42,6 +42,7 @@
Christian Thalinger <twisti at complang.tuwien.ac.at>
Dalibor Topic <robilad at kaffe.org>
Arnaud Vandyck <avdyk at debian.org>
+Michal Vyskocil <mvyskocil at suse.cz>
Torsten Werner (mail.twerner at googlemail.com)
Mark Wielaard <mark at klomp.org>
Yi Zhan <yi.zhan at intel.com>
diff -r a81a87c1a918 -r 3d60006909d8 ChangeLog
--- a/ChangeLog Wed Dec 18 15:22:58 2013 +0000
+++ b/ChangeLog Wed Dec 18 18:27:02 2013 +0000
@@ -1,3 +1,43 @@
+2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Include changes new to b29.
+
+2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Move PR1290 to new features list,
+ not bug fixes.
+
+2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * AUTHORS: Updated with Michal.
+
+2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1501: Backport IcedTea 2.x library removal script
+ * patches/openjdk/7002766-parfait-jpeg.patch: Moved to...
+ * patches/openjdk/libjpeg/7002766-parfait-jpeg.patch: ... here.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Drop 7002766 for the time being, until
+ an option to build with bundled libjpeg is added.
+ (extract): Depend on remove-intree-libraries.
+ (clean-extract): Depend on clean-remove-intree-libraries.
+ (remove-intree-libraries): Run new script.
+ (clean-remove-intree-libraries): Remove stamp.
+ * patches/libraries.patch:
+ Regenerated without removal of entire files, which is now
+ done by the script.
+ * patches/openjdk/6989774-imageio_compiler_warnings.patch:
+ Split libjpeg changes into...
+ * patches/openjdk/libjpeg/6989774-imageio_compiler_warnings.patch:
+ ... this patch (currently unapplied as above).
+ * remove-intree-libraries.sh: Script to delete bundled
+ libjpeg, giflib, libpng & zlib.
+ * NEWS: Updated.
+
+2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Mention PR1376.
+
2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1627: JDK check should depend on bootstrapping check
diff -r a81a87c1a918 -r 3d60006909d8 Makefile.am
--- a/Makefile.am Wed Dec 18 15:22:58 2013 +0000
+++ b/Makefile.am Wed Dec 18 18:27:02 2013 +0000
@@ -312,7 +312,6 @@
$(SECURITY_PATCHES) \
patches/openjdk/6733501-icedtea_lcms_test.patch \
$(LCMS_PATCHES) \
- patches/openjdk/7002766-parfait-jpeg.patch \
patches/openjdk/4993545-nativeinlightfixer.patch \
patches/openjdk/6637796-set_bounds.patch \
patches/openjdk/6607660-treelock.patch \
@@ -1133,11 +1132,13 @@
rm -f stamps/download.stamp
stamps/extract.stamp: stamps/extract-openjdk.stamp \
- stamps/extract-cacao.stamp stamps/extract-jamvm.stamp
+ stamps/extract-cacao.stamp stamps/extract-jamvm.stamp \
+ stamps/remove-intree-libraries.stamp
mkdir -p stamps
touch $@
-clean-extract: clean-extract-openjdk clean-cacao clean-jamvm
+clean-extract: clean-extract-openjdk clean-cacao clean-jamvm \
+ clean-remove-intree-libraries
rm -f stamps/extract.stamp
stamps/extract-openjdk.stamp: stamps/download.stamp
@@ -1257,6 +1258,13 @@
done
rm -f stamps/ports.stamp
+stamps/remove-intree-libraries.stamp: stamps/extract-openjdk.stamp
+ sh $(srcdir)/remove-intree-libraries.sh
+ touch stamps/remove-intree-librares.stamp
+
+clean-remove-intree-libraries:
+ rm -f stamps/remove-intree-libraries.stamp
+
stamps/generated.stamp: stamps/ports.stamp
if [ ! -e $(GENERATED_BUILD_DIR) ]; then \
cp -a $(abs_top_srcdir)/generated $(GENERATED_BUILD_DIR) && \
diff -r a81a87c1a918 -r 3d60006909d8 NEWS
--- a/NEWS Wed Dec 18 15:22:58 2013 +0000
+++ b/NEWS Wed Dec 18 18:27:02 2013 +0000
@@ -18,6 +18,9 @@
- PR718: Backport LCMS2 support from IcedTea7
- PR1288: Allow JARs to be optionally compressed by setting COMPRESS_JARS
- PR1361: Check for /usr/lib64 JVMs and generic JPackage alternative
+ - PR1376: Backport javac detection / usability test from IcedTea 2.x
+ - PR1501: Backport IcedTea 2.x library removal script
+ - PR1290: Ensure unlimited crypto policy is in place.
* Import of OpenJDK6 b28
- OJ1: Confirm that community members can commit to hotspot in OpenJDK6
- OJ2: Revert unnecessary file added to hotspot repo
@@ -868,18 +871,19 @@
- S8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
- S8014312: Fork hs23.25 hsx from hs23.21 for jdk7u25 and reinitialize build number
- S8014464: Update jcheck for 6-open
+* Import of OpenJDK6 b29
+ - OJ23: Resolve merge issues in 8015614.
+ - S8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
+ - S8023457: Event based tracing framework needs a mutex for thread groups
+ - S8023478: Test fails with HS crash in GCNotifier.
* Backports
- S7025066: Build systems changes to support SE Embedded Integration
- S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
- - S8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
- - S8023457: Event based tracing framework needs a mutex for thread groups
- - S8023478: Test fails with HS crash in GCNotifier.
* Bug fixes
- PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
- RH902004: very bad performance with E-Porto Add-In für OpenOffice Writer installed (hs23 only)
- RH991170: java does not use correct kerberos credential cache
- PR1535: Allow use of system Kerberos to obtain cache location
- - PR1290: Ensure unlimited crypto policy is in place.
- PR1627: JDK check should depend on bootstrapping check
* JamVM
- JSR 335: Lambda Expressions
diff -r a81a87c1a918 -r 3d60006909d8 patches/libraries.patch
--- a/patches/libraries.patch Wed Dec 18 15:22:58 2013 +0000
+++ b/patches/libraries.patch Wed Dec 18 18:27:02 2013 +0000
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2012-10-26 19:25:40.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-12-18 16:59:48.528719153 +0000
@@ -64,23 +64,21 @@
ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
@@ -54,9 +54,9 @@
endif #LINUX
endif #PLATFORM
diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
---- openjdk.orig/jdk/make/common/Program.gmk 2012-10-26 19:25:40.000000000 +0100
-+++ openjdk/jdk/make/common/Program.gmk 2013-08-30 16:53:14.788401039 +0100
-@@ -85,7 +85,7 @@
+--- openjdk.orig/jdk/make/common/Program.gmk 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/make/common/Program.gmk 2013-12-18 17:01:35.350311481 +0000
+@@ -83,7 +83,7 @@
endif
endif
ifeq ($(PLATFORM), linux)
@@ -64,8 +64,8 @@
+ LDFLAGS += -lz -Wl,-z -Wl,origin
LDFLAGS += -Wl,--allow-shlib-undefined
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
-@@ -229,7 +229,6 @@
+ endif
+@@ -226,7 +226,6 @@
endif
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
@@ -74,8 +74,8 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile
---- openjdk.orig/jdk/make/java/jli/Makefile 2012-10-26 19:25:40.000000000 +0100
-+++ openjdk/jdk/make/java/jli/Makefile 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/make/java/jli/Makefile 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/make/java/jli/Makefile 2013-12-18 16:59:48.528719153 +0000
@@ -44,8 +44,6 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -126,8 +126,8 @@
+vpath %.c $(LAUNCHER_SHARE_SRC)
diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk
---- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100
-+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-12-18 16:59:48.528719153 +0000
@@ -30,15 +30,4 @@
Inflater.c \
ZipFile.c \
@@ -145,8 +145,8 @@
- inffast.c \
zip_util.c
diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile
---- openjdk.orig/jdk/make/java/zip/Makefile 2012-10-26 19:25:41.000000000 +0100
-+++ openjdk/jdk/make/java/zip/Makefile 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/make/java/zip/Makefile 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/make/java/zip/Makefile 2013-12-18 16:59:48.528719153 +0000
@@ -30,8 +30,6 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -175,8 +175,8 @@
-OTHER_LDLIBS = $(JVMLIB)
+OTHER_LDLIBS = $(JVMLIB) -lz
diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk
---- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2012-10-26 19:25:41.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-12-18 16:59:48.528719153 +0000
@@ -25,51 +25,7 @@
FILES_c = \
@@ -231,8 +231,8 @@
ifndef OPENJDK
FILES_c += \
diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile
---- openjdk.orig/jdk/make/sun/jpeg/Makefile 2013-08-30 16:44:07.551631313 +0100
-+++ openjdk/jdk/make/sun/jpeg/Makefile 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2013-12-18 16:51:41.301457861 +0000
++++ openjdk/jdk/make/sun/jpeg/Makefile 2013-12-18 16:59:48.528719153 +0000
@@ -81,6 +81,8 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
@@ -243,8 +243,8 @@
# Add to ambient vpath to get files in a subdirectory
#
diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk
---- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2012-10-26 19:25:42.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-12-18 16:59:48.528719153 +0000
@@ -30,81 +30,5 @@
splashscreen_impl.c \
splashscreen_jpeg.c \
@@ -329,8 +329,8 @@
+ splashscreen_sys.c
diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
---- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2012-10-26 19:25:42.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-12-18 16:59:48.528719153 +0000
@@ -59,12 +59,12 @@
# C Flags
#
@@ -362,8 +362,8 @@
ifeq ($(PLATFORM), linux)
ifeq ($(ARCH_DATA_MODEL), 64)
diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-08-30 16:43:56.687449694 +0100
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-12-18 16:59:48.528719153 +0000
@@ -89,11 +89,7 @@
// bytes and byte arrays
@@ -377,8 +377,8 @@
typedef LONGLONG jlong;
typedef DWORDLONG julong;
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c
---- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-12-18 16:59:48.528719153 +0000
@@ -29,7 +29,7 @@
#include "jni.h"
@@ -389,8 +389,8 @@
#include "java_util_zip_Adler32.h"
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c
---- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-12-18 16:59:48.528719153 +0000
@@ -29,7 +29,7 @@
#include "jni.h"
@@ -401,8 +401,8 @@
#include "java_util_zip_CRC32.h"
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c
---- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-12-18 16:59:48.528719153 +0000
@@ -32,7 +32,7 @@
#include "jlong.h"
#include "jni.h"
@@ -413,8 +413,8 @@
#include "java_util_zip_Deflater.h"
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c
---- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-12-18 16:59:48.528719153 +0000
@@ -35,7 +35,7 @@
#include "jni.h"
#include "jvm.h"
@@ -425,8 +425,8 @@
#define ThrowDataFormatException(env, msg) \
diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c
---- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2013-08-30 16:44:05.355594646 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-08-30 16:53:14.788401039 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2013-12-06 00:20:25.000000000 +0000
++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-12-18 16:59:48.528719153 +0000
@@ -44,7 +44,8 @@
#include "io_util.h"
#include "io_util_md.h"
@@ -438,8 +438,8 @@
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 16:44:07.599632116 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 16:55:38.374649561 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-12-18 16:51:41.449460067 +0000
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-12-18 16:59:48.528719153 +0000
@@ -52,7 +52,9 @@
/* headers from the JPEG library */
@@ -669,7 +669,7 @@
if (numBands != cinfo->output_components) {
JNU_ThrowByName(env, "javax/imageio/IIOException",
-@@ -2053,7 +2113,7 @@
+@@ -2060,7 +2120,7 @@
if (progressive) {
// initialize the next pass. Note that this skips up to
// the first interesting pass.
@@ -678,7 +678,7 @@
if (wantUpdates) {
(*env)->CallVoidMethod(env, this,
JPEGImageReader_passStartedID,
-@@ -2069,7 +2129,7 @@
+@@ -2076,7 +2136,7 @@
// Skip until the first interesting line
while ((data->abortFlag == JNI_FALSE)
&& ((jint)cinfo->output_scanline < sourceYStart)) {
@@ -687,7 +687,7 @@
}
scanlineLimit = sourceYStart+sourceHeight;
-@@ -2082,7 +2142,7 @@
+@@ -2089,7 +2149,7 @@
while ((data->abortFlag == JNI_FALSE)
&& ((jint)cinfo->output_scanline < scanlineLimit)) {
@@ -696,7 +696,7 @@
// Now mangle it into our buffer
out = data->pixelBuf.buf.bp;
-@@ -2144,13 +2204,13 @@
+@@ -2151,13 +2211,13 @@
skipLines = linesLeft;
}
for(i = 0; i < skipLines; i++) {
@@ -713,7 +713,7 @@
|| (cinfo->input_scan_number > maxProgressivePass)) {
done = TRUE;
}
-@@ -2170,9 +2230,9 @@
+@@ -2177,9 +2237,9 @@
if (cinfo->output_scanline == cinfo->output_height) {
// if ((cinfo->output_scanline == cinfo->output_height) &&
//(jpeg_input_complete(cinfo))) { // We read the whole file
@@ -725,7 +725,7 @@
}
free(scanLinePtr);
-@@ -2218,7 +2278,7 @@
+@@ -2225,7 +2285,7 @@
cinfo = (j_decompress_ptr) data->jpegObj;
@@ -734,7 +734,7 @@
}
-@@ -2432,6 +2492,150 @@
+@@ -2439,6 +2499,150 @@
/********************** end of destination manager ************/
@@ -885,7 +885,7 @@
/********************** Writer JNI calls **********************/
-@@ -2442,6 +2646,8 @@
+@@ -2449,6 +2653,8 @@
jclass qTableClass,
jclass huffClass) {
@@ -894,7 +894,7 @@
JPEGImageWriter_writeOutputDataID = (*env)->GetMethodID(env,
cls,
"writeOutputData",
-@@ -2515,7 +2721,7 @@
+@@ -2522,7 +2728,7 @@
}
/* We set up the normal JPEG error routines, then override error_exit. */
@@ -903,7 +903,7 @@
jerr->pub.error_exit = sun_jpeg_error_exit;
/* We need to setup our own print routines */
jerr->pub.output_message = sun_jpeg_output_message;
-@@ -2532,7 +2738,7 @@
+@@ -2539,7 +2745,7 @@
}
/* Perform library initialization */
@@ -912,7 +912,7 @@
/* Now set up the destination */
dest = malloc(sizeof(struct jpeg_destination_mgr));
-@@ -2638,7 +2844,7 @@
+@@ -2645,7 +2851,7 @@
return;
}
@@ -921,7 +921,7 @@
data->streamBuf.suspendable = FALSE;
if (qtables != NULL) {
-@@ -2653,7 +2859,7 @@
+@@ -2660,7 +2866,7 @@
DCHuffmanTables, ACHuffmanTables, TRUE);
}
@@ -930,7 +930,7 @@
RELEASE_ARRAYS(env, data, NULL);
}
-@@ -2827,9 +3033,9 @@
+@@ -2843,9 +3049,9 @@
cinfo->input_components = numBands;
cinfo->in_color_space = inCs;
@@ -942,7 +942,7 @@
cinfo->optimize_coding = optimize;
-@@ -2866,7 +3072,7 @@
+@@ -2882,7 +3088,7 @@
(*env)->ReleaseIntArrayElements(env, QtableSelectors,
qsels, JNI_ABORT);
@@ -951,7 +951,7 @@
qlen = setQTables(env, (j_common_ptr) cinfo, qtables, writeDQT);
-@@ -2891,7 +3097,7 @@
+@@ -2907,7 +3113,7 @@
if (progressive) {
if (numScans == 0) { // then use default scans
@@ -960,7 +960,7 @@
} else {
cinfo->num_scans = numScans;
// Copy the scanInfo to a local array
-@@ -2933,7 +3139,7 @@
+@@ -2949,7 +3155,7 @@
#endif
// start the compressor; tables must already be set
@@ -969,7 +969,7 @@
if (haveMetadata) {
// Flush the buffer
-@@ -2999,7 +3205,7 @@
+@@ -3015,7 +3221,7 @@
}
}
// write it out
@@ -978,7 +978,7 @@
targetLine += stepY;
}
-@@ -3008,9 +3214,9 @@
+@@ -3024,9 +3230,9 @@
* so use jpeg_abort instead of jpeg_finish_compress.
*/
if (cinfo->next_scanline == cinfo->image_height) {
@@ -990,20003 +990,9 @@
}
free(scanLinePtr);
RELEASE_ARRAYS(env, data, NULL);
-diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 1970-01-01 01:00:00.000000000 +0100
-@@ -1,284 +0,0 @@
--/*
-- * reserved comment block
-- * DO NOT REMOVE OR ALTER!
-- */
More information about the distro-pkg-dev
mailing list