/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 18 18:07:42 UTC 2016
changeset bb99dd5bb69f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bb99dd5bb69f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed May 18 16:54:56 2016 +0100
PR2961: Latest security update broke bundled LCMS2 build
2016-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
PR2961: Latest security update broke bundled
LCMS2 build
* NEWS:
Updated.
* patches/openjdk/lcms2/bundled/6523398-writing_tags.patch:
Regenerated.
changeset b04ff35af086 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b04ff35af086
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed May 18 19:05:31 2016 +0100
PR2962: System default check doesn't match all GNU/Linux systems
2016-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
PR2962: System default check doesn't match all
GNU/Linux systems
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Use a similar case statement
as in IT_SET_OS_DIRS to determine default based on OS.
(IT_CHECK_FOR_JPEG): Likewise.
(IT_CHECK_FOR_PNG): Likewise.
(IT_CHECK_FOR_GIF): Likewise.
diffstat:
ChangeLog | 21 ++
NEWS | 2 +
acinclude.m4 | 65 ++++--
patches/openjdk/lcms2/bundled/6523398-writing_tags.patch | 143 +++++++-------
4 files changed, 136 insertions(+), 95 deletions(-)
diffs (truncated from 600 to 500 lines):
diff -r 40d81bb30914 -r b04ff35af086 ChangeLog
--- a/ChangeLog Tue May 17 23:38:10 2016 +0100
+++ b/ChangeLog Wed May 18 19:05:31 2016 +0100
@@ -1,3 +1,24 @@
+2016-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2962: System default check doesn't match all
+ GNU/Linux systems
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Use a similar case statement
+ as in IT_SET_OS_DIRS to determine default based on OS.
+ (IT_CHECK_FOR_JPEG): Likewise.
+ (IT_CHECK_FOR_PNG): Likewise.
+ (IT_CHECK_FOR_GIF): Likewise.
+
+2016-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2961: Latest security update broke bundled
+ LCMS2 build
+ * NEWS:
+ Updated.
+ * patches/openjdk/lcms2/bundled/6523398-writing_tags.patch:
+ Regenerated.
+
2016-05-16 Andrew John Hughes <gnu.andrew at redhat.com>
S7050826, PR2956, RH1334465: Hebrew characters
diff -r 40d81bb30914 -r b04ff35af086 NEWS
--- a/NEWS Tue May 17 23:38:10 2016 +0100
+++ b/NEWS Wed May 18 19:05:31 2016 +0100
@@ -30,6 +30,8 @@
- PR2849: wget not required when downloading is disabled
- PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java
- PR2957: Build bootstrap code (rt-class-files.stamp) using bootstrap flags (source/target 1.5)
+ - PR2961: Latest security update broke bundled LCMS2 build
+ - PR2962: System default check doesn't match all GNU/Linux systems
New in release 1.13.11 (2016-05-05):
diff -r 40d81bb30914 -r b04ff35af086 acinclude.m4
--- a/acinclude.m4 Tue May 17 23:38:10 2016 +0100
+++ b/acinclude.m4 Wed May 18 19:05:31 2016 +0100
@@ -1566,10 +1566,15 @@
ENABLE_SYSTEM_LCMS="${enableval}"
],
[
- if test x"${ENABLE_LCMS2}" = "xyes" -a x"${target_os}" = "xlinux-gnu" ; then
- ENABLE_SYSTEM_LCMS="yes" ;
- else
- ENABLE_SYSTEM_LCMS="no" ;
+ if test x"${ENABLE_LCMS2}" = "xyes" ; then
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_LCMS="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_LCMS="no" ;
+ ;;
+ esac
fi;
])
AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
@@ -1596,11 +1601,14 @@
ENABLE_SYSTEM_ZLIB="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
- ENABLE_SYSTEM_ZLIB="yes" ;
- else
- ENABLE_SYSTEM_ZLIB="no" ;
- fi
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_ZLIB="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_ZLIB="no" ;
+ ;;
+ esac
])
AC_MSG_RESULT(${ENABLE_SYSTEM_ZLIB})
if test x"${ENABLE_SYSTEM_ZLIB}" = "xyes"; then
@@ -1627,11 +1635,14 @@
ENABLE_SYSTEM_JPEG="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
- ENABLE_SYSTEM_JPEG="yes" ;
- else
- ENABLE_SYSTEM_JPEG="no" ;
- fi
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_JPEG="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_JPEG="no" ;
+ ;;
+ esac
])
AC_MSG_RESULT(${ENABLE_SYSTEM_JPEG})
if test x"${ENABLE_SYSTEM_JPEG}" = "xyes"; then
@@ -1656,11 +1667,14 @@
ENABLE_SYSTEM_PNG="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
- ENABLE_SYSTEM_PNG="yes" ;
- else
- ENABLE_SYSTEM_PNG="no" ;
- fi
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_PNG="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_PNG="no" ;
+ ;;
+ esac
])
AC_MSG_RESULT(${ENABLE_SYSTEM_PNG})
if test x"${ENABLE_SYSTEM_PNG}" = "xyes"; then
@@ -1686,11 +1700,14 @@
ENABLE_SYSTEM_GIF="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
- ENABLE_SYSTEM_GIF="yes" ;
- else
- ENABLE_SYSTEM_GIF="no" ;
- fi
+ case "${target_os}" in
+ *linux*)
+ ENABLE_SYSTEM_GIF="yes"
+ ;;
+ *)
+ ENABLE_SYSTEM_GIF="no" ;
+ ;;
+ esac
])
AC_MSG_RESULT(${ENABLE_SYSTEM_GIF})
if test x"${ENABLE_SYSTEM_GIF}" = "xyes"; then
diff -r 40d81bb30914 -r b04ff35af086 patches/openjdk/lcms2/bundled/6523398-writing_tags.patch
--- a/patches/openjdk/lcms2/bundled/6523398-writing_tags.patch Tue May 17 23:38:10 2016 +0100
+++ b/patches/openjdk/lcms2/bundled/6523398-writing_tags.patch Wed May 18 19:05:31 2016 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2013-12-19 12:12:15.815239068 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2016-05-18 03:56:07.430737147 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -401,7 +401,7 @@
}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2013-12-06 00:20:25.000000000 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 2016-05-03 23:38:49.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscam97.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,750 +0,0 @@
-/*
@@ -1155,8 +1155,8 @@
-
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2013-12-19 12:12:15.819239130 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2016-05-03 23:59:14.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2016-05-18 03:59:35.483319782 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -2920,11 +2920,11 @@
+ cmsHANDLE hIT8;
+ cmsIT8* it8;
+ int type;
-+
+
+- int type = IsMyBlock((LPBYTE) Ptr, len);
+ _cmsAssert(Ptr != NULL);
+ _cmsAssert(len != 0);
-
-- int type = IsMyBlock((LPBYTE) Ptr, len);
++
+ type = IsMyBlock((cmsUInt8Number*)Ptr, len);
if (type == 0) return NULL;
@@ -2967,10 +2967,10 @@
+ cmsHANDLE hIT8;
+ cmsIT8* it8;
+ int type;
++
++ _cmsAssert(cFileName != NULL);
- int type = IsMyFile(cFileName);
-+ _cmsAssert(cFileName != NULL);
-+
+ type = IsMyFile(cFileName);
if (type == 0) return NULL;
@@ -3013,9 +3013,9 @@
- LPTABLE t = GetTable(it8);
+ cmsIT8* it8 = (cmsIT8*) hIT8;
+ TABLE* t;
-+
+
+ _cmsAssert(hIT8 != NULL);
-
++
+ t = GetTable(it8);
+
+ if (SampleNames)
@@ -3101,7 +3101,7 @@
return i;
}
}
-@@ -2459,62 +2390,65 @@
+@@ -2459,63 +2390,66 @@
static
@@ -3140,11 +3140,12 @@
for (i=0; i < t->nSamples; i++) {
fld = GetDataFormat(it8, i);
-- if (stricmp(fld, cSample) == 0)
-+ if (cmsstrcasecmp(fld, cSample) == 0)
- return i;
- }
-
+ if (fld != NULL) {
+- if (stricmp(fld, cSample) == 0)
++ if (cmsstrcasecmp(fld, cSample) == 0)
+ return i;
+ }
+ }
-
- // SynError(it8, "Couldn't find data field %s\n", cSample);
return -1;
@@ -3182,7 +3183,7 @@
{
const char* Buffer;
-@@ -2530,19 +2464,23 @@
+@@ -2531,19 +2465,23 @@
}
@@ -3210,7 +3211,7 @@
sprintf(Buff, it8->DoubleFormatter, Val);
return SetData(it8, row, col, Buff);
-@@ -2550,18 +2488,18 @@
+@@ -2551,18 +2489,18 @@
@@ -3232,7 +3233,7 @@
iSet = LocatePatch(it8, cPatch);
if (iSet < 0) {
return NULL;
-@@ -2571,7 +2509,7 @@
+@@ -2572,7 +2510,7 @@
}
@@ -3241,7 +3242,7 @@
{
const char* Buffer;
-@@ -2589,100 +2527,109 @@
+@@ -2590,100 +2528,109 @@
@@ -3398,7 +3399,7 @@
if (cField != NULL && *cField == 0)
cField = "LABEL";
-@@ -2700,18 +2647,21 @@
+@@ -2701,18 +2648,21 @@
if (ExpectedType) {
@@ -3424,7 +3425,7 @@
if(pos == -1)
return FALSE;
-@@ -2720,9 +2670,11 @@
+@@ -2721,9 +2671,11 @@
}
@@ -3439,8 +3440,8 @@
if (Formatter == NULL)
strcpy(it8->DoubleFormatter, DEFAULT_DBL_FORMAT);
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2013-12-19 12:12:15.819239130 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2016-05-18 03:56:07.430737147 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -4889,8 +4890,8 @@
+}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2013-12-19 12:12:15.819239130 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2016-05-18 03:56:07.434737081 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -5357,8 +5358,8 @@
+}
+
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2013-12-19 12:12:15.819239130 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2016-05-18 03:56:07.434737081 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -7159,8 +7160,8 @@
}
+
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2013-12-19 12:12:15.819239130 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2016-05-18 03:56:07.434737081 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -8784,8 +8785,8 @@
+ return TRUE;
}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2013-12-19 12:12:15.823239190 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2016-05-18 03:56:07.434737081 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -10848,8 +10849,8 @@
-#undef DENS
-
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2013-12-19 12:12:15.823239190 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2016-05-18 03:56:07.438737016 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -12897,8 +12898,8 @@
+ return TRUE;
+}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2013-12-19 12:12:15.823239190 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2016-05-18 03:56:07.438737016 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -17088,8 +17089,8 @@
}
-
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2013-12-19 12:12:15.827239250 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2016-05-18 03:56:07.442736950 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -19209,7 +19210,7 @@
-
-
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 2013-12-06 00:20:25.000000000 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 2016-05-03 23:38:49.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,411 +0,0 @@
-/*
@@ -19625,7 +19626,7 @@
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c
--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2013-12-19 12:12:15.835239368 +0000
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2016-05-18 03:56:07.442736950 +0100
@@ -0,0 +1,346 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -19974,8 +19975,8 @@
+}
+
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2013-12-19 12:12:15.827239250 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c 2016-05-18 03:56:07.442736950 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -20860,8 +20861,8 @@
-
-
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2013-12-19 12:12:15.827239250 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2016-05-18 03:56:07.446736885 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -21683,7 +21684,7 @@
+
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c
--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2013-12-19 12:12:15.835239368 +0000
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2016-05-18 03:56:07.446736885 +0100
@@ -0,0 +1,1657 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -23343,8 +23344,8 @@
+}
+
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2013-12-19 12:12:15.827239250 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2016-05-18 03:56:07.450736818 +0100
@@ -27,8 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -27383,8 +27384,8 @@
+ return FLOAT_SH(Float) | COLORSPACE_SH(ColorSpaceBits) | BYTES_SH(nBytes) | CHANNELS_SH(nOutputChans);
}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2013-12-19 12:12:15.831239308 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2016-05-18 03:56:07.450736818 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -28582,7 +28583,7 @@
+}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c
--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2013-12-19 12:12:15.835239368 +0000
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2016-05-18 03:56:07.450736818 +0100
@@ -0,0 +1,641 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29226,8 +29227,8 @@
+ PluginPool = NULL;
+}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2013-12-19 12:12:15.831239308 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2016-05-18 03:56:07.450736818 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -31123,8 +31124,8 @@
+
}
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c
---- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2013-12-06 00:20:25.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2013-12-19 12:12:15.831239308 +0000
+--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2016-05-03 23:38:49.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2016-05-18 03:56:07.450736818 +0100
@@ -27,9 +27,10 @@
// However, the following notice accompanied the original version of this
// file:
@@ -31955,7 +31956,7 @@
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c
--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c 2013-12-19 12:12:15.835239368 +0000
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c 2016-05-18 03:56:07.450736818 +0100
@@ -0,0 +1,762 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32721,7 +32722,7 @@
+#endif
diff -Nru openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c
--- openjdk.orig/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 2013-12-19 12:12:15.839239428 +0000
More information about the distro-pkg-dev
mailing list