--- /dev/null Thu Jan 01 00:00:00 1970 +0000+++ b/src/macosx/javavm/export/jawt_md.h Mon Jun 17 22:27:38 2013 -0700@@ -0,0 +1,110 @@+/*+ * Copyright (c) 1999, 2013 Oracle and/or its affiliates. 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. Oracle designates this+ * particular file as subject to the "Classpath" exception as provided+ * by Oracle in the LICENSE file that accompanied this code.+ *+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA+ * or visit www.oracle.com if you need additional information or have any+ * questions.+ */++#ifndef _JAVASOFT_JAWT_MD_H_+#define _JAVASOFT_JAWT_MD_H_++/*+ * To use jawt_X11DrawingSurfaceInfo you must define XAWT before including this header+ * file. You must also have the X11 headers installed on your system.+ */+#ifdef XAWT+#include <X11/Xlib.h>+#include <X11/Xutil.h>+#include <X11/Intrinsic.h>+#endif // XAWT++#include "jawt.h"++#ifdef __OBJC__+#import <QuartzCore/CALayer.h>+#endif++#ifdef __cplusplus+extern "C" {+#endif++/*+ * Mac OS X specific declarations for AWT native interface.+ * See notes in jawt.h for an example of use.+ */++/*+ * When calling JAWT_GetAWT with a JAWT version less than 1.7, you must pass this+ * flag or you will not be able to get a valid drawing surface and JAWT_GetAWT will+ * return false. This is to maintain compatibility with applications that used the+ * interface with Java 6 which had multiple rendering models. This flag is not necessary+ * when JAWT version 1.7 or greater is used as this is the only supported rendering mode.+ *+ * Example:+ * JAWT awt;+ * awt.version = JAWT_VERSION_1_4 | JAWT_MACOSX_USE_CALAYER;+ * jboolean success = JAWT_GetAWT(env, &awt);+ */+#define JAWT_MACOSX_USE_CALAYER 0x80000000++/*+ * When the native Cocoa toolkit is in use, the pointer stored in+ * JAWT_DrawingSurfaceInfo->platformInfo points to a NSObject that conforms to the+ * JAWT_SurfaceLayers protocol. Setting the layer property of this object will cause the+ * specified layer to be overlaid on the Components rectangle. If the window the+ * Component belongs to has a CALayer attached to it, this layer will be accessible via+ * the windowLayer property.+ */+#ifdef __OBJC__+@protocol JAWT_SurfaceLayers+@property (readwrite, retain) CALayer *layer;+@property (readonly) CALayer *windowLayer;+@end+#endif++#ifdef XAWT+/*+ * X11-specific declarations for AWT native interface.+ * See notes in jawt.h for an example of use.+ *+ * WARNING: This interface is deprecated and will be removed in a future release.+ */+typedef struct jawt_X11DrawingSurfaceInfo {+ Drawable drawable;+ Display* display;+ VisualID visualID;+ Colormap colormapID;+ int depth;+ /*+ * Since 1.4+ * Returns a pixel value from a set of RGB values.+ * This is useful for paletted color (256 color) modes.+ */+ int (JNICALL *GetAWTColor)(JAWT_DrawingSurface* ds,+ int r, int g, int b);+} JAWT_X11DrawingSurfaceInfo;+#endif // XAWT++#ifdef __cplusplus+}+#endif++#endif /* !_JAVASOFT_JAWT_MD_H_ */

--- /dev/null Thu Jan 01 00:00:00 1970 +0000+++ b/src/macosx/javavm/export/jni_md.h Mon Jun 17 22:27:38 2013 -0700@@ -0,0 +1,41 @@+/*+ * Copyright (c) 1996, 2000, Oracle and/or its affiliates. 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. Oracle designates this+ * particular file as subject to the "Classpath" exception as provided+ * by Oracle in the LICENSE file that accompanied this code.+ *+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA+ * or visit www.oracle.com if you need additional information or have any+ * questions.+ */++#ifndef _JAVASOFT_JNI_MD_H_+#define _JAVASOFT_JNI_MD_H_++#define JNIEXPORT+#define JNIIMPORT+#define JNICALL++typedef int jint;+#ifdef _LP64 /* 64-bit */+typedef long jlong;+#else+typedef long long jlong;+#endif+typedef signed char jbyte;++#endif /* !_JAVASOFT_JNI_MD_H_ */

--- a/src/solaris/classes/sun/print/IPPPrintService.java Sun Jun 16 22:18:54 2013 -0700+++ b/src/solaris/classes/sun/print/IPPPrintService.java Mon Jun 17 22:27:38 2013 -0700@@ -1023,6 +1023,13 @@ // this is already supported in UnixPrintJob catList.add(Destination.class);++ // It is unfortunate that CUPS doesn't provide a way to query+ // if printer supports collation but since most printers+ // now supports collation and that most OS has a way+ // of setting it, it is a safe assumption to just always+ // include SheetCollate as supported attribute.+ catList.add(SheetCollate.class); } // With the assumption that Chromaticity is equivalent to