diff options
Diffstat (limited to 'package/openjdk7')
| -rw-r--r-- | package/openjdk7/Makefile | 5 | ||||
| -rw-r--r-- | package/openjdk7/patches/openadk.patch | 136 |
2 files changed, 67 insertions, 74 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 2787168bf..ed4fc21b4 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openjdk7 -PKG_VERSION:= 2.3.9 +PKG_VERSION:= 2.3.12 PKG_RELEASE:= 1 -PKG_MD5SUM:= e96e5e578d442d3ae56cd332e8dbc6b6 +PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11 PKG_DESCR:= OpenJDK 7 Java VM PKG_SECTION:= lang PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host @@ -75,6 +75,7 @@ CONFIGURE_COMMON:= --disable-docs \ --disable-system-jpeg \ --disable-system-lcms \ --disable-system-zlib \ + --disable-system-kerberos \ --disable-system-png \ --disable-system-gif \ --disable-system-gtk \ diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index 25e979fce..effd32a92 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -1,16 +1,8 @@ -diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in ---- icedtea-2.3.9.orig/Makefile.in 2013-04-21 22:48:31.000000000 +0200 -+++ icedtea-2.3.9/Makefile.in 2013-11-15 12:28:32.000000000 +0100 -@@ -90,7 +90,6 @@ - @WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \ - @WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \ - @WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \ --@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \ - @WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/revert_arm_debug.patch - - @WITH_RHINO_TRUE@am__append_9 = \ -@@ -657,7 +656,7 @@ - $(am__append_17) $(am__append_18) $(DISTRIBUTION_PATCHES) +diff -Nur icedtea-2.3.11.orig/Makefile.in icedtea-2.3.11/Makefile.in +--- icedtea-2.3.11.orig/Makefile.in 2013-07-25 02:39:55.000000000 +0200 ++++ icedtea-2.3.11/Makefile.in 2013-12-08 15:43:27.000000000 +0100 +@@ -695,7 +695,7 @@ + $(DISTRIBUTION_PATCHES) # Bootstrapping patches -ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ @@ -18,7 +10,7 @@ diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \ patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \ patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \ -@@ -2050,7 +2049,7 @@ +@@ -2090,7 +2090,7 @@ # Optional native ecj stamps/native-ecj.stamp: mkdir -p stamps @@ -27,13 +19,13 @@ diff -Nur icedtea-2.3.9.orig/Makefile.in icedtea-2.3.9/Makefile.in @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} touch $@ -diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk.patch ---- icedtea-2.3.9.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.3.9/patches/openadk.patch 2013-11-15 13:52:27.000000000 +0100 +diff -Nur icedtea-2.3.11.orig/patches/openadk.patch icedtea-2.3.11/patches/openadk.patch +--- icedtea-2.3.11.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 ++++ icedtea-2.3.11/patches/openadk.patch 2013-12-08 16:22:41.000000000 +0100 @@ -0,0 +1,493 @@ +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-03-15 17:33:37.000000000 +0100 -++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-07-17 20:14:46.000000000 +0200 +++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2013-12-08 15:44:03.000000000 +0100 +@@ -115,7 +115,6 @@ + # include <string.h> + # include <syscall.h> @@ -42,7 +34,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + # include <sys/ipc.h> + # include <sys/shm.h> + # include <link.h> -+@@ -644,9 +643,7 @@ ++@@ -649,9 +648,7 @@ + os::Linux::set_glibc_version(str); + } else { + // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() @@ -53,7 +45,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + os::Linux::set_glibc_version(_gnu_libc_version); + } + -+@@ -2640,10 +2637,7 @@ ++@@ -2648,10 +2645,7 @@ + // If we are running with earlier version, which did not have symbol versions, + // we should use the base version. + void* os::Linux::libnuma_dlsym(void* handle, const char *name) { @@ -65,7 +57,7 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + return f; + } + -+@@ -4908,7 +4902,21 @@ ++@@ -4916,7 +4910,21 @@ + // Linux doesn't yet have a (official) notion of processor sets, + // so just return the system wide load average. + int os::loadavg(double loadavg[], int nelem) { @@ -89,8 +81,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + + void os::pause() { +diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-03-15 17:33:37.000000000 +0100 -++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-11-15 13:51:57.000000000 +0100 ++--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-07-17 20:14:46.000000000 +0200 +++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2013-12-08 15:44:03.000000000 +0100 +@@ -253,7 +253,7 @@ + #elif defined(__APPLE__) + inline int g_isnan(double f) { return isnan(f); } @@ -112,8 +104,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + + // Wide characters +diff -Nur 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 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2013-12-08 15:44:03.000000000 +0100 +@@ -80,7 +80,7 @@ + LDDFLAGS += $(ZIPOBJS) + endif @@ -124,8 +116,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + endif + +diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile -+--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile 2013-12-08 15:44:03.000000000 +0100 +@@ -64,7 +64,7 @@ + COMPILER_WARNINGS_FATAL=true + endif @@ -136,8 +128,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + ifeq ($(PLATFORM), solaris) + #LIBSCTP = -lsctp +diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk -+--- openjdk.orig/jdk/make/common/Defs.gmk 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/common/Defs.gmk 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/common/Defs.gmk 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/common/Defs.gmk 2013-12-08 15:44:03.000000000 +0100 +@@ -204,7 +204,7 @@ + ifeq ($(PLATFORM), macosx) + FREETYPE_HEADERS_PATH = /usr/X11R6/include @@ -148,8 +140,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + endif + endif +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk -+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/common/shared/Platform.gmk 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/common/shared/Platform.gmk 2013-12-08 15:44:03.000000000 +0100 +@@ -160,9 +160,6 @@ + else + mach := $(shell uname -m) @@ -161,8 +153,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + i[3-9]86) \ + echo i586 \ +diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile -+--- openjdk.orig/jdk/make/java/instrument/Makefile 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/java/instrument/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/java/instrument/Makefile 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/java/instrument/Makefile 2013-12-08 15:44:04.000000000 +0100 +@@ -140,6 +140,8 @@ + # We don't want to link against -ljava + JAVALIB= @@ -173,8 +165,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + # Add to ambient vpath so we pick up the library files + # +diff -Nur openjdk.orig/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile -+--- openjdk.orig/jdk/make/java/net/Makefile 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/java/net/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/java/net/Makefile 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/java/net/Makefile 2013-12-08 15:44:04.000000000 +0100 +@@ -25,7 +25,7 @@ + + BUILDDIR = ../.. @@ -185,8 +177,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + include $(BUILDDIR)/common/Defs.gmk + +diff -Nur openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile -+--- openjdk.orig/jdk/make/java/nio/Makefile 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/java/nio/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/java/nio/Makefile 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/java/nio/Makefile 2013-12-08 15:44:04.000000000 +0100 +@@ -369,7 +369,7 @@ + endif + @@ -215,8 +207,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR + $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java +diff -Nur openjdk.orig/jdk/make/java/npt/Makefile openjdk/jdk/make/java/npt/Makefile -+--- openjdk.orig/jdk/make/java/npt/Makefile 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/java/npt/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/java/npt/Makefile 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/java/npt/Makefile 2013-12-08 15:44:04.000000000 +0100 +@@ -64,6 +64,8 @@ + # We don't want to link against -ljava + JAVALIB= @@ -227,8 +219,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + ifeq ($(PLATFORM), windows) + OTHER_LCF += -export:nptInitialize -export:nptTerminate +diff -Nur openjdk.orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk -+--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-12-08 15:44:04.000000000 +0100 +@@ -151,22 +151,6 @@ + #endif + @@ -286,8 +278,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + ifeq ($(PLATFORM), macosx)) + CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ +diff -Nur openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile -+--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/sun/splashscreen/Makefile 2013-12-08 15:44:04.000000000 +0100 +@@ -55,6 +55,8 @@ + + JAVALIB= @@ -298,8 +290,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + # C Flags + # +diff -Nur openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile -+--- openjdk.orig/jdk/make/sun/xawt/Makefile 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/make/sun/xawt/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/make/sun/xawt/Makefile 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/make/sun/xawt/Makefile 2013-12-08 15:44:04.000000000 +0100 +@@ -292,16 +292,10 @@ + SIZERS = $(SIZER).32 + SIZERS_C = $(SIZER_32_C) @@ -340,8 +332,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ + $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java -+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2013-12-08 15:44:04.000000000 +0100 +@@ -69,7 +69,7 @@ + */ + static { @@ -352,8 +344,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + + /** +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java -+--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2013-12-08 15:44:04.000000000 +0100 +@@ -78,7 +78,7 @@ + */ + static { @@ -364,8 +356,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + + /** +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java -+--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/share/classes/java/net/DatagramPacket.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2013-12-08 15:44:04.000000000 +0100 +@@ -47,7 +47,7 @@ + */ + static { @@ -376,8 +368,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + } + +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java -+--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/share/classes/java/net/InetAddress.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2013-12-08 15:44:04.000000000 +0100 +@@ -260,7 +260,7 @@ + static { + preferIPv6Address = java.security.AccessController.doPrivileged( @@ -388,8 +380,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + } + +diff -Nur openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java -+--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/share/classes/java/net/NetworkInterface.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2013-12-08 15:44:04.000000000 +0100 +@@ -53,7 +53,7 @@ + private static final int defaultIndex; /* index of defaultInterface */ + @@ -400,8 +392,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + defaultInterface = DefaultInterface.getDefault(); + if (defaultInterface != null) { +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java -+--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java 2013-12-08 15:44:04.000000000 +0100 +@@ -76,6 +76,6 @@ + + static { @@ -411,8 +403,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + } + } +diff -Nur openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java -+--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2013-12-08 15:44:04.000000000 +0100 +@@ -95,7 +95,7 @@ + }}); + if (b != null && b.booleanValue()) { @@ -423,8 +415,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + } + } +diff -Nur openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java -+--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Util.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2013-12-08 15:44:04.000000000 +0100 +@@ -483,7 +483,7 @@ + return; + loaded = true; @@ -435,8 +427,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + .doPrivileged(new sun.security.action.LoadLibraryAction("nio")); + // IOUtil must be initialized; Its native methods are called from +diff -Nur openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java -+--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-12-08 15:44:04.000000000 +0100 +@@ -247,7 +247,7 @@ + + static { @@ -447,8 +439,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + + } +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c -+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-12-08 15:44:04.000000000 +0100 +@@ -246,7 +246,8 @@ + if (wcs == NULL) + return NULL; @@ -460,8 +452,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + mbs = (char *) malloc(n * sizeof(char)); + if (mbs == NULL) { +diff -Nur openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c -+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2013-12-08 15:44:04.000000000 +0100 +@@ -27,9 +27,6 @@ + #include <X11/Xutil.h> + #include <X11/Xos.h> @@ -499,8 +491,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + Window get_xawt_root_shell(JNIEnv *env) { + static jclass classXRootWindow = NULL; +diff -Nur openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java -+--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-04-16 00:41:13.000000000 +0200 -++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-06-23 17:54:05.000000000 +0200 +++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2013-12-08 15:44:04.000000000 +0100 +@@ -159,7 +159,7 @@ + + static { @@ -511,8 +503,8 @@ diff -Nur icedtea-2.3.9.orig/patches/openadk.patch icedtea-2.3.9/patches/openadk + + // start the address listener thread +diff -Nur openjdk.orig/Makefile openjdk/Makefile -+--- openjdk.orig/Makefile 2013-03-08 17:04:19.000000000 +0100 -++++ openjdk/Makefile 2013-11-15 13:51:09.000000000 +0100 ++--- openjdk.orig/Makefile 2013-06-23 17:53:43.000000000 +0200 +++++ openjdk/Makefile 2013-12-08 15:44:04.000000000 +0100 +@@ -53,9 +53,7 @@ + REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME) + REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME) |