changeset in /hg/icedtea: Regenerated icedtea-libraries.patch.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:13:57 PDT 2008
changeset d550fe3b2a75 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d550fe3b2a75
description:
Regenerated icedtea-libraries.patch.
diffstat:
2 files changed, 104 insertions(+), 122 deletions(-)
ChangeLog | 5
patches/icedtea-libraries.patch | 221 +++++++++++++++++----------------------
diffs (truncated from 770 to 500 lines):
diff -r e9872d5722d6 -r d550fe3b2a75 ChangeLog
--- a/ChangeLog Mon May 26 22:59:09 2008 +0100
+++ b/ChangeLog Mon May 26 23:24:13 2008 +0100
@@ -1,3 +1,8 @@ 2008-05-26 Andrew John Hughes <gnu_and
+2008-05-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/icedtea-libraries.patch:
+ Regenerated post-merge.
+
2008-05-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r e9872d5722d6 -r d550fe3b2a75 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Mon May 26 22:59:09 2008 +0100
+++ b/patches/icedtea-libraries.patch Mon May 26 23:24:13 2008 +0100
@@ -1,36 +1,13 @@ diff -Nru openjdk.orig/jdk/make/com/sun/
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 2008-05-16 22:15:14.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2008-05-23 22:50:53.000000000 +0100
-@@ -64,23 +64,21 @@
- ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2008-05-26 23:08:44.000000000 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2008-05-26 23:18:09.000000000 +0100
+@@ -75,12 +75,10 @@
+ $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
- ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
-- $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
--
- ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
- OTHER_CXXFLAGS += $(ZINCLUDE)
- LDDFLAGS += $(ZIPOBJS)
-+ $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
-+ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
-+LDLIBS += -ldl
-+
+ OTHER_LDLIBS += -lz
else
OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
@@ -55,8 +32,8 @@ diff -Nru openjdk.orig/jdk/make/com/sun/
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 2008-05-16 22:15:14.000000000 +0100
-+++ openjdk/jdk/make/common/Program.gmk 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/make/common/Program.gmk 2008-05-26 23:08:44.000000000 +0100
++++ openjdk/jdk/make/common/Program.gmk 2008-05-26 23:13:05.000000000 +0100
@@ -85,7 +85,7 @@
endif
endif
@@ -75,8 +52,8 @@ diff -Nru openjdk.orig/jdk/make/common/P
# this may not be necessary...
ifeq ($(PLATFORM), windows)
diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile
---- openjdk.orig/jdk/make/java/jli/Makefile 2008-05-19 22:56:22.000000000 +0100
-+++ openjdk/jdk/make/java/jli/Makefile 2008-05-23 22:56:04.000000000 +0100
+--- openjdk.orig/jdk/make/java/jli/Makefile 2008-05-26 23:08:44.000000000 +0100
++++ openjdk/jdk/make/java/jli/Makefile 2008-05-26 23:13:05.000000000 +0100
@@ -44,8 +44,6 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -127,8 +104,8 @@ diff -Nru openjdk.orig/jdk/make/java/jli
-vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
+vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_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 2008-05-16 22:15:14.000000000 +0100
-+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2008-05-26 23:08:44.000000000 +0100
++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2008-05-26 23:13:05.000000000 +0100
@@ -30,15 +30,4 @@
Inflater.c \
ZipFile.c \
@@ -146,8 +123,8 @@ diff -Nru openjdk.orig/jdk/make/java/zip
- 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 2008-05-16 22:15:14.000000000 +0100
-+++ openjdk/jdk/make/java/zip/Makefile 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/make/java/zip/Makefile 2008-05-26 23:08:44.000000000 +0100
++++ openjdk/jdk/make/java/zip/Makefile 2008-05-26 23:13:05.000000000 +0100
@@ -30,8 +30,6 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -176,8 +153,8 @@ diff -Nru openjdk.orig/jdk/make/java/zip
-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 2008-05-16 22:15:15.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2008-05-26 23:08:45.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2008-05-26 23:13:05.000000000 +0100
@@ -25,51 +25,7 @@
FILES_c = \
@@ -232,8 +209,8 @@ diff -Nru openjdk.orig/jdk/make/sun/jpeg
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 2008-05-16 22:15:15.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/Makefile 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2008-05-26 23:08:45.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/Makefile 2008-05-26 23:13:05.000000000 +0100
@@ -68,6 +68,8 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
@@ -244,8 +221,8 @@ diff -Nru openjdk.orig/jdk/make/sun/jpeg
# 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 2008-05-16 22:15:15.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2008-05-26 23:08:45.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2008-05-26 23:13:05.000000000 +0100
@@ -30,81 +30,5 @@
splashscreen_impl.c \
splashscreen_jpeg.c \
@@ -330,8 +307,8 @@ diff -Nru openjdk.orig/jdk/make/sun/spla
+ 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 2008-05-19 22:56:22.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/Makefile 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2008-05-26 23:08:45.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/Makefile 2008-05-26 23:13:05.000000000 +0100
@@ -59,12 +59,12 @@
# C Flags
#
@@ -363,8 +340,8 @@ diff -Nru openjdk.orig/jdk/make/sun/spla
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 2008-05-16 22:15:22.000000000 +0100
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2008-05-26 23:08:52.000000000 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2008-05-26 23:13:05.000000000 +0100
@@ -87,11 +87,7 @@
// bytes and byte arrays
@@ -378,8 +355,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
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 2008-05-16 22:15:22.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2008-05-26 23:08:52.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2008-05-26 23:13:05.000000000 +0100
@@ -29,7 +29,7 @@
#include "jni.h"
@@ -390,8 +367,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
#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 2008-05-16 22:15:22.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2008-05-26 23:08:52.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2008-05-26 23:13:05.000000000 +0100
@@ -29,7 +29,7 @@
#include "jni.h"
@@ -402,8 +379,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
#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 2008-05-16 22:15:22.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2008-05-26 23:08:52.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2008-05-26 23:13:05.000000000 +0100
@@ -32,7 +32,7 @@
#include "jlong.h"
#include "jni.h"
@@ -414,8 +391,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
#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 2008-05-16 22:15:22.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2008-05-26 23:08:52.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2008-05-26 23:13:05.000000000 +0100
@@ -35,7 +35,7 @@
#include "jni.h"
#include "jvm.h"
@@ -426,8 +403,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
#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 2008-05-16 22:15:22.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2008-05-26 23:08:52.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2008-05-26 23:13:05.000000000 +0100
@@ -44,7 +44,8 @@
#include "io_util.h"
#include "io_util_md.h"
@@ -439,7 +416,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
/* 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/README openjdk/jdk/src/share/native/sun/awt/image/jpeg/README
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,385 +0,0 @@
-The Independent JPEG Group's JPEG software
@@ -828,8 +805,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
-
-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/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 2008-05-16 22:15:22.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-05-23 22:50:53.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-05-26 23:08:52.000000000 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2008-05-26 23:13:05.000000000 +0100
@@ -51,7 +51,9 @@
/* headers from the JPEG library */
@@ -1373,7 +1350,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
if (scale != 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 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 2008-05-26 23:08:52.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 @@
-/*
@@ -1661,7 +1638,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- */
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,165 +0,0 @@
-/*
@@ -1830,7 +1807,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- return lines_per_iMCU_row;
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,453 +0,0 @@
-/*
@@ -2287,7 +2264,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,462 +0,0 @@
-/*
@@ -2753,7 +2730,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,391 +0,0 @@
-/*
@@ -3148,7 +3125,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,913 +0,0 @@
-/*
@@ -4065,7 +4042,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-/*
@@ -4120,7 +4097,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
-EXTERN(void) jpeg_gen_optimal_table
- JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]));
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,76 +0,0 @@
-/*
@@ -4200,7 +4177,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- (*cinfo->marker->write_file_header) (cinfo);
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,297 +0,0 @@
-/*
@@ -4501,7 +4478,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,682 +0,0 @@
-/*
@@ -5187,7 +5164,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- marker->last_restart_interval = 0;
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,594 +0,0 @@
-/*
@@ -5785,7 +5762,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- master->total_passes = cinfo->num_scans;
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,110 +0,0 @@
-/*
@@ -5899,7 +5876,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- return tbl;
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-/* jconfig.cfg --- source file edited by configure script */
@@ -5946,7 +5923,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
-
-#endif /* JPEG_CJPEG_DJPEG */
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,614 +0,0 @@
-/*
@@ -6564,7 +6541,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
-
-#endif /* C_PROGRESSIVE_SUPPORTED */
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,837 +0,0 @@
-/*
@@ -7405,7 +7382,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
-
-#endif /* C_PROGRESSIVE_SUPPORTED */
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,358 +0,0 @@
-/*
@@ -7767,7 +7744,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,523 +0,0 @@
-/*
@@ -8294,7 +8271,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
-#endif
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,392 +0,0 @@
-/*
@@ -8690,7 +8667,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,399 +0,0 @@
-/*
@@ -9093,7 +9070,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- return TRUE;
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,279 +0,0 @@
-/*
@@ -9376,7 +9353,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
-
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,740 +0,0 @@
-/*
@@ -10120,7 +10097,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,398 +0,0 @@
-/*
@@ -10522,7 +10499,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- cinfo->output_components = cinfo->out_color_components;
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdct.h
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,180 +0,0 @@
-/*
@@ -10706,7 +10683,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
-#define MULTIPLY16V16(var1,var2) ((var1) * (var2))
-#endif
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,273 +0,0 @@
-/*
@@ -10983,7 +10960,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,655 +0,0 @@
-/*
@@ -11642,7 +11619,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,205 +0,0 @@
-/*
@@ -11851,7 +11828,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- JPP((bitread_working_state * state, register bit_buf_type get_buffer,
- register int bits_left, d_derived_tbl * htbl, int min_bits));
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,385 +0,0 @@
-/*
@@ -12240,7 +12217,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- inputctl->inheaders = TRUE;
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,516 +0,0 @@
-/*
@@ -12760,7 +12737,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- }
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,1384 +0,0 @@
-/*
@@ -14148,7 +14125,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
- ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
-}
diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 2008-05-16 22:15:22.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 2008-05-26 23:08:52.000000000 +0100
+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,561 +0,0 @@
More information about the distro-pkg-dev
mailing list