/hg/icedtea6: PR718: Backport LCMS2 support from IcedTea7
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 22 16:00:10 PDT 2013
changeset f9036c0f3155 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9036c0f3155
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jul 22 23:59:29 2013 +0100
PR718: Backport LCMS2 support from IcedTea7
2013-07-22 Andrew John Hughes <gnu.andrew at redhat.com>
PR718: Backport LCMS2 support from IcedTea7
* Makefile.am:
(LCMS_PATCHES): Populate based on which version
of LCMS is being built.
(ICEDTEA_PATCHES): Add LCMS_PATCHES. Remove
lcms.patch and patches/jtreg-ReadWriteProfileTest.patch,
the latter being 6733501 in disguise.
* NEWS: Mention PR718.
* acinclude.m4:
(IT_ENABLE_LCMS2): New macro to enable or disable
the use of LCMS 2 (enabled by default).
* configure.ac: Invoke IT_ENABLE_LCMS2.
* patches/libraries.patch: Adjust due to JPEG changes
in 7002766.
* patches/openjdk/6733501-icedtea_lcms_test.patch:
Identical to ReadWriteProfileTest.patch with addition
of upstream changeset information.
* patches/openjdk/7002766-parfait-jpeg.patch:
JPEG segment of 7002766 applied on all builds.
* patches/openjdk/lcms2/6523398-writing_tags.patch,
* patches/openjdk/lcms2/6988213-windows_build_failure.patch,
* patches/openjdk/lcms2/7002766-parfait.patch,
* patches/openjdk/lcms2/7042594-tck_failure.patch,
* patches/openjdk/lcms2/7053526-lcms_2.4.patch,
* patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch,
* patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch,
* patches/openjdk/lcms2/8007929-improve_curvesalloc.patch,
* patches/openjdk/lcms2/8009654-cmsnamed_stability.patch,
* patches/openjdk/lcms2/system_lcms2.patch:
Add backports from OpenJDK 7 to provide LCMS 2 support.
* patches/jtreg-ReadWriteProfileTest.patch:
This is 6733501 above.
diffstat:
ChangeLog | 35 +
Makefile.am | 22 +-
NEWS | 1 +
acinclude.m4 | 17 +
configure.ac | 2 +
patches/jtreg-ReadWriteProfileTest.patch | 124 -
patches/libraries.patch | 63 +-
patches/openjdk/6733501-icedtea_lcms_test.patch | 133 +
patches/openjdk/7002766-parfait-jpeg.patch | 42 +
patches/openjdk/lcms2/6523398-writing_tags.patch | 51207 ++++++++++
patches/openjdk/lcms2/6988213-windows_build_failure.patch | 25 +
patches/openjdk/lcms2/7002766-parfait.patch | 20 +
patches/openjdk/lcms2/7042594-tck_failure.patch | 375 +
patches/openjdk/lcms2/7053526-lcms_2.4.patch | 10111 +
patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch | 30 +
patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch | 23 +
patches/openjdk/lcms2/8007929-improve_curvesalloc.patch | 28 +
patches/openjdk/lcms2/8009654-cmsnamed_stability.patch | 38 +
patches/openjdk/lcms2/system_lcms2.patch | 93 +
19 files changed, 62233 insertions(+), 156 deletions(-)
diffs (truncated from 62672 to 500 lines):
diff -r 8da02dd9a76d -r f9036c0f3155 ChangeLog
--- a/ChangeLog Thu Jul 18 20:03:43 2013 +0100
+++ b/ChangeLog Mon Jul 22 23:59:29 2013 +0100
@@ -1,3 +1,38 @@
+2013-07-22 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR718: Backport LCMS2 support from IcedTea7
+ * Makefile.am:
+ (LCMS_PATCHES): Populate based on which version
+ of LCMS is being built.
+ (ICEDTEA_PATCHES): Add LCMS_PATCHES. Remove
+ lcms.patch and patches/jtreg-ReadWriteProfileTest.patch,
+ the latter being 6733501 in disguise.
+ * NEWS: Mention PR718.
+ * acinclude.m4:
+ (IT_ENABLE_LCMS2): New macro to enable or disable
+ the use of LCMS 2 (enabled by default).
+ * configure.ac: Invoke IT_ENABLE_LCMS2.
+ * patches/libraries.patch: Adjust due to JPEG changes
+ in 7002766.
+ * patches/openjdk/6733501-icedtea_lcms_test.patch:
+ Identical to ReadWriteProfileTest.patch with addition
+ of upstream changeset information.
+ * patches/openjdk/7002766-parfait-jpeg.patch:
+ JPEG segment of 7002766 applied on all builds.
+ * patches/openjdk/lcms2/6523398-writing_tags.patch,
+ * patches/openjdk/lcms2/6988213-windows_build_failure.patch,
+ * patches/openjdk/lcms2/7002766-parfait.patch,
+ * patches/openjdk/lcms2/7042594-tck_failure.patch,
+ * patches/openjdk/lcms2/7053526-lcms_2.4.patch,
+ * patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch,
+ * patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch,
+ * patches/openjdk/lcms2/8007929-improve_curvesalloc.patch,
+ * patches/openjdk/lcms2/8009654-cmsnamed_stability.patch,
+ * patches/openjdk/lcms2/system_lcms2.patch:
+ Add backports from OpenJDK 7 to provide LCMS 2 support.
+ * patches/jtreg-ReadWriteProfileTest.patch:
+ This is 6733501 above.
+
2013-07-18 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/hotspot/hs23/arm-hsdis.patch:
diff -r 8da02dd9a76d -r f9036c0f3155 Makefile.am
--- a/Makefile.am Thu Jul 18 20:03:43 2013 +0100
+++ b/Makefile.am Mon Jul 22 23:59:29 2013 +0100
@@ -446,9 +446,29 @@
SPECIAL_SECURITY_PATCH_1 = patches/security/20120214/7112642.patch
SPECIAL_SECURITY_PATCH_2 = patches/security/20130618/8009071-improve_shape_handling.patch
+if ENABLE_LCMS2
+LCMS_PATCHES = \
+ patches/openjdk/lcms2/6523398-writing_tags.patch \
+ patches/openjdk/lcms2/6988213-windows_build_failure.patch \
+ patches/openjdk/lcms2/system_lcms2.patch \
+ patches/openjdk/lcms2/7053526-lcms_2.4.patch \
+ patches/openjdk/lcms2/8007929-improve_curvesalloc.patch \
+ patches/openjdk/lcms2/8007925-improve_cmsstagealloclabv2tov4curves.patch \
+ patches/openjdk/lcms2/8009654-cmsnamed_stability.patch \
+ patches/openjdk/lcms2/7002766-parfait.patch \
+ patches/openjdk/lcms2/7042594-tck_failure.patch \
+ patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch
+else
+LCMS_PATCHES = \
+ patches/lcms.patch
+endif
+
ICEDTEA_PATCHES = \
$(DROP_PATCHES) \
$(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 \
@@ -478,7 +498,6 @@
patches/gcc-suffix.patch \
patches/libraries.patch \
$(SPECIAL_SECURITY_PATCH_2) \
- patches/lcms.patch \
patches/uname.patch \
patches/freetypeversion.patch \
patches/nomotif-6706121.patch \
@@ -573,7 +592,6 @@
patches/jtreg-FileMap.patch \
patches/jtreg-ChannelsWrite.patch \
patches/jtreg-bug7036148-test.patch \
- patches/jtreg-ReadWriteProfileTest.patch \
patches/openjdk/6818312-com.sun.awt.SecurityWarning.getSize.patch \
patches/jtreg-MappedByteBuffer-Basic.patch \
patches/openjdk/7008106-WindowOpacity.patch \
diff -r 8da02dd9a76d -r f9036c0f3155 NEWS
--- a/NEWS Thu Jul 18 20:03:43 2013 +0100
+++ b/NEWS Mon Jul 22 23:59:29 2013 +0100
@@ -16,6 +16,7 @@
* New features
- PR1317: Provide an option to build with a more up-to-date HotSpot
- PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
+ - PR718: Backport LCMS2 support from IcedTea7
* Backports
- S8009641: OpenJDK 6 build broken via 8007675 fix
- OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build
diff -r 8da02dd9a76d -r f9036c0f3155 acinclude.m4
--- a/acinclude.m4 Thu Jul 18 20:03:43 2013 +0100
+++ b/acinclude.m4 Mon Jul 22 23:59:29 2013 +0100
@@ -2054,3 +2054,20 @@
AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN_ONCE([IT_ENABLE_LCMS2],
+[
+ AC_MSG_CHECKING([whether to enable the use of LCMS2])
+ AC_ARG_ENABLE([lcms2],
+ [AS_HELP_STRING(--enable-lcms2,use LCMS 2 backport from OpenJDK 7 [[default=yes]])],
+ [
+ ENABLE_LCMS2="${enableval}"
+ ],
+ [
+ ENABLE_LCMS2=yes
+ ])
+
+ AC_MSG_RESULT(${ENABLE_LCMS2})
+ AM_CONDITIONAL(ENABLE_LCMS2, test x"${ENABLE_LCMS2}" = "xyes")
+ AC_SUBST(ENABLE_LCMS2)
+])
diff -r 8da02dd9a76d -r f9036c0f3155 configure.ac
--- a/configure.ac Thu Jul 18 20:03:43 2013 +0100
+++ b/configure.ac Mon Jul 22 23:59:29 2013 +0100
@@ -289,6 +289,8 @@
IT_WITH_PAX
AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
+IT_ENABLE_LCMS2
+
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
,[AC_MSG_ERROR("CUPS headers were not found -
diff -r 8da02dd9a76d -r f9036c0f3155 patches/jtreg-ReadWriteProfileTest.patch
--- a/patches/jtreg-ReadWriteProfileTest.patch Thu Jul 18 20:03:43 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-diff -r 9318628e8eee -r 467e4f25965c test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java Fri Mar 20 20:05:22 2009 +0300
-@@ -0,0 +1,120 @@
-+/*
-+ * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+/**
-+ * @test
-+ * @bug 6476665 6523403 6733501
-+ * @summary Verifies reading and writing profiles and tags of the standard color
-+ * spaces
-+ * @run main ReadWriteProfileTest
-+ */
-+import java.awt.color.ColorSpace;
-+import java.awt.color.ICC_Profile;
-+import java.util.*;
-+import java.nio.*;
-+import java.util.Hashtable;
-+
-+public class ReadWriteProfileTest implements Runnable {
-+ /* Location of the tag sig counter in 4-byte words */
-+ final static int TAG_COUNT_OFFSET = 32;
-+
-+ /* Location of the tag sig table in 4-byte words */
-+ final static int TAG_ELEM_OFFSET = 33;
-+
-+ static byte[][] profiles;
-+ static int [][] tagSigs;
-+ static Hashtable<Integer,byte[]> [] tags;
-+
-+ static int [] cspaces = {ColorSpace.CS_sRGB, ColorSpace.CS_PYCC,
-+ ColorSpace.CS_LINEAR_RGB, ColorSpace.CS_CIEXYZ,
-+ ColorSpace.CS_GRAY};
-+
-+ static String [] csNames = {"sRGB", "PYCC", "LINEAR_RGB", "CIEXYZ", "GRAY"};
-+
-+ static void getProfileTags(byte [] data, Hashtable tags) {
-+ ByteBuffer byteBuf = ByteBuffer.wrap(data);
-+ IntBuffer intBuf = byteBuf.asIntBuffer();
-+ int tagCount = intBuf.get(TAG_COUNT_OFFSET);
-+ intBuf.position(TAG_ELEM_OFFSET);
-+ for (int i = 0; i < tagCount; i++) {
-+ int tagSig = intBuf.get();
-+ int tagDataOff = intBuf.get();
-+ int tagSize = intBuf.get();
-+
-+ byte [] tagData = new byte[tagSize];
-+ byteBuf.position(tagDataOff);
-+ byteBuf.get(tagData);
-+ tags.put(tagSig, tagData);
-+ }
-+ }
-+
-+ static {
-+ profiles = new byte[cspaces.length][];
-+ tags = new Hashtable[cspaces.length];
-+
-+ for (int i = 0; i < cspaces.length; i++) {
-+ ICC_Profile pf = ICC_Profile.getInstance(cspaces[i]);
-+ profiles[i] = pf.getData();
-+ tags[i] = new Hashtable();
-+ getProfileTags(profiles[i], tags[i]);
-+ }
-+ }
-+
-+ public void run() {
-+ for (int i = 0; i < cspaces.length; i++) {
-+ ICC_Profile pf = ICC_Profile.getInstance(cspaces[i]);
-+ byte [] data = pf.getData();
-+ pf = ICC_Profile.getInstance(data);
-+ if (!Arrays.equals(data, profiles[i])) {
-+ System.err.println("Incorrect result of getData() " + "with " +
-+ csNames[i] + " profile");
-+ throw new RuntimeException("Incorrect result of getData()");
-+ }
-+
-+ for (int tagSig : tags[i].keySet()) {
-+ byte [] tagData = pf.getData(tagSig);
-+ byte [] empty = new byte[tagData.length];
-+ pf.setData(tagSig, empty);
-+ pf.setData(tagSig, tagData);
-+
-+ byte [] tagData1 = pf.getData(tagSig);
-+
-+ if (!Arrays.equals(tagData1, tags[i].get(tagSig)))
-+ {
-+ System.err.println("Incorrect result of getData(int) with" +
-+ " tag " +
-+ Integer.toHexString(tagSig) +
-+ " of " + csNames[i] + " profile");
-+
-+ throw new RuntimeException("Incorrect result of " +
-+ "getData(int)");
-+ }
-+ }
-+ }
-+ }
-+
-+ public static void main(String [] args) {
-+ ReadWriteProfileTest test = new ReadWriteProfileTest();
-+ test.run();
-+ }
-+}
diff -r 8da02dd9a76d -r f9036c0f3155 patches/libraries.patch
--- a/patches/libraries.patch Thu Jul 18 20:03:43 2013 +0100
+++ b/patches/libraries.patch Mon Jul 22 23:59:29 2013 +0100
@@ -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-04-23 19:45:24.512100652 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-07-22 19:51:20.762208023 +0100
@@ -64,23 +64,21 @@
ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
@@ -55,7 +55,7 @@
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-04-23 19:45:24.528100909 +0100
++++ openjdk/jdk/make/common/Program.gmk 2013-07-22 19:51:20.774208212 +0100
@@ -85,7 +85,7 @@
endif
endif
@@ -75,7 +75,7 @@
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-04-23 19:45:24.528100909 +0100
++++ openjdk/jdk/make/java/jli/Makefile 2013-07-22 19:51:20.774208212 +0100
@@ -44,8 +44,6 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -127,7 +127,7 @@
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-04-23 19:45:24.528100909 +0100
++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100
@@ -30,15 +30,4 @@
Inflater.c \
ZipFile.c \
@@ -146,7 +146,7 @@
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-04-23 19:45:24.528100909 +0100
++++ openjdk/jdk/make/java/zip/Makefile 2013-07-22 19:51:20.774208212 +0100
@@ -30,8 +30,6 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -176,7 +176,7 @@
+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-04-23 19:45:24.532100974 +0100
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100
@@ -25,51 +25,7 @@
FILES_c = \
@@ -232,7 +232,7 @@
FILES_c += \
diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile
--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2012-10-26 19:25:41.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/Makefile 2013-04-23 19:45:24.532100974 +0100
++++ openjdk/jdk/make/sun/jpeg/Makefile 2013-07-22 19:51:20.774208212 +0100
@@ -68,6 +68,8 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
@@ -244,7 +244,7 @@
#
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-04-23 19:45:24.532100974 +0100
++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2013-07-22 19:51:20.774208212 +0100
@@ -30,81 +30,5 @@
splashscreen_impl.c \
splashscreen_jpeg.c \
@@ -330,7 +330,7 @@
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-04-23 19:45:24.532100974 +0100
++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-07-22 19:51:20.774208212 +0100
@@ -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-04-23 18:50:35.139719857 +0100
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-04-23 19:46:32.885201759 +0100
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:49:54.900852754 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-07-22 19:51:20.774208212 +0100
@@ -89,11 +89,7 @@
// bytes and byte arrays
@@ -378,7 +378,7 @@
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-04-23 19:45:24.532100974 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2013-07-22 19:51:20.774208212 +0100
@@ -29,7 +29,7 @@
#include "jni.h"
@@ -390,7 +390,7 @@
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-04-23 19:45:24.532100974 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2013-07-22 19:51:20.774208212 +0100
@@ -29,7 +29,7 @@
#include "jni.h"
@@ -402,7 +402,7 @@
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-04-23 19:45:24.532100974 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2013-07-22 19:51:20.774208212 +0100
@@ -32,7 +32,7 @@
#include "jlong.h"
#include "jni.h"
@@ -414,7 +414,7 @@
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-04-23 19:45:24.532100974 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2013-07-22 19:51:20.774208212 +0100
@@ -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 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-04-23 19:45:24.532100974 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2013-07-22 19:49:56.968885397 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2013-07-22 19:51:20.778208275 +0100
@@ -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-04-23 18:50:43.759856150 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-04-23 19:46:11.140851683 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-07-22 19:49:56.160872642 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-07-22 19:51:20.778208275 +0100
@@ -52,7 +52,9 @@
/* headers from the JPEG library */
@@ -20601,9 +20601,9 @@
-EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo));
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2012-10-26 19:26:12.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2013-07-22 19:49:58.240905475 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 1970-01-01 01:00:00.000000000 +0100
-@@ -1,375 +0,0 @@
+@@ -1,378 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
@@ -20767,11 +20767,11 @@
-
-/* INT32 must hold at least signed 32-bit values. */
-
--#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
--#ifndef _LP64
+-#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
+-#if defined(_LP64) || defined(_WIN32) /* _WIN32 is on all windows platfroms (x86 and x64) */
+-typedef int INT32;
+-#else
-typedef long INT32;
--#else
--typedef int INT32;
-#endif
-#endif
-
@@ -20827,11 +20827,14 @@
- * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
- */
-
+-
+-#ifndef FAR
-#ifdef NEED_FAR_POINTERS
-#define FAR far
-#else
-#define FAR
-#endif
+-#endif
-
-
-/*
@@ -20981,7 +20984,7 @@
-#endif /* JPEG_INTERNAL_OPTIONS */
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2012-10-26 19:26:12.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2013-04-23 19:45:24.556101361 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2013-07-22 19:51:20.798208591 +0100
@@ -45,7 +45,9 @@
#undef boolean
#undef FAR
@@ -25529,7 +25532,7 @@
-Please send bug reports, offers of help, etc. to jpeg-info at uunet.uu.net.
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2012-10-26 19:26:13.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2013-04-23 19:45:24.560101425 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2013-07-22 19:51:20.798208591 +0100
@@ -26,7 +26,7 @@
#include "splashscreen_impl.h"
#include "splashscreen_gfx.h"
@@ -25540,8 +25543,8 @@
#define GIF_TRANSPARENT 0x01
#define GIF_USER_INPUT 0x02
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-04-23 18:50:35.015717895 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-04-23 19:45:24.560101425 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-07-22 19:49:54.864852186 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2013-07-22 19:51:20.802208655 +0100
@@ -25,9 +25,8 @@
#include "splashscreen_impl.h"
@@ -25573,7 +25576,7 @@
src = (stream_src_ptr) cinfo->src;
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c
--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2012-10-26 19:26:13.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-04-23 19:45:24.560101425 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2013-07-22 19:51:20.802208655 +0100
@@ -25,7 +25,7 @@
#include "splashscreen_impl.h"
diff -r 8da02dd9a76d -r f9036c0f3155 patches/openjdk/6733501-icedtea_lcms_test.patch
More information about the distro-pkg-dev
mailing list