aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2004-08-12 21:54:01 +0000
committerGreg Lewis <glewis@FreeBSD.org>2004-08-12 21:54:01 +0000
commite551896df5b5962ef0f41d20ca16e189457afb79 (patch)
tree1405c23d76b7dc91c83e94362d0175ce877408c7 /java
parent57447419e763a6319ffa9b5db94fff100cb70f0c (diff)
downloadports-e551896df5b5962ef0f41d20ca16e189457afb79.tar.gz
ports-e551896df5b5962ef0f41d20ca16e189457afb79.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/jdk14/files/patch-awt_fontmanager_t2kScalerContext.cpp21
-rw-r--r--java/jdk14/files/patch-plugin_ns600_nscore.h13
-rw-r--r--java/jdk14/files/patch-plugin_ns610_nscore.h13
-rw-r--r--java/jdk15/files/patch-awt_fontmanager_t2kScalerContext.cpp21
-rw-r--r--java/jdk15/files/patch-plugin_ns600_nscore.h13
-rw-r--r--java/jdk15/files/patch-plugin_ns610_nscore.h13
-rw-r--r--java/jdk16/files/patch-awt_fontmanager_t2kScalerContext.cpp21
-rw-r--r--java/jdk16/files/patch-plugin_ns600_nscore.h13
-rw-r--r--java/jdk16/files/patch-plugin_ns610_nscore.h13
9 files changed, 141 insertions, 0 deletions
diff --git a/java/jdk14/files/patch-awt_fontmanager_t2kScalerContext.cpp b/java/jdk14/files/patch-awt_fontmanager_t2kScalerContext.cpp
new file mode 100644
index 000000000000..7f39f7cceabb
--- /dev/null
+++ b/java/jdk14/files/patch-awt_fontmanager_t2kScalerContext.cpp
@@ -0,0 +1,21 @@
+$FreeBSD$
+
+--- ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp.orig Fri Jul 30 18:00:09 2004
++++ ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp Fri Jul 30 22:11:36 2004
+@@ -937,14 +937,14 @@
+ CMAPMapper::CharsToGlyphs(
+ int count, const Unicode16 unicodes[], UInt32 glyphs[]) const
+ {
+- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs);
++ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs);
+ }
+
+ void
+ CMAPMapper::CharsToGlyphs(
+ int count, const Unicode32 unicodes[], UInt32 glyphs[]) const
+ {
+- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs);
++ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs);
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
diff --git a/java/jdk14/files/patch-plugin_ns600_nscore.h b/java/jdk14/files/patch-plugin_ns600_nscore.h
new file mode 100644
index 000000000000..9e4bcacf650a
--- /dev/null
+++ b/java/jdk14/files/patch-plugin_ns600_nscore.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns600/nscore.h.orig Fri Jul 30 18:00:04 2004
++++ ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns600/nscore.h Fri Jul 30 23:32:31 2004
+@@ -163,7 +163,7 @@
+ */
+
+ /* under Metrowerks (Mac), we don't have autoconf yet */
+-#ifdef __MWERKS__
++#if defined(__MWERKS__) || defined(NS_UNIX)
+ #define HAVE_CPP_SPECIALIZATION
+ #define HAVE_CPP_PARTIAL_SPECIALIZATION
+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
diff --git a/java/jdk14/files/patch-plugin_ns610_nscore.h b/java/jdk14/files/patch-plugin_ns610_nscore.h
new file mode 100644
index 000000000000..de8cc76e5fa3
--- /dev/null
+++ b/java/jdk14/files/patch-plugin_ns610_nscore.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns610/nscore.h.orig Fri Jul 30 18:00:05 2004
++++ ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns610/nscore.h Fri Jul 30 23:23:36 2004
+@@ -163,7 +163,7 @@
+ */
+
+ /* under Metrowerks (Mac), we don't have autoconf yet */
+-#ifdef __MWERKS__
++#if defined(__MWERKS__) || defined(NS_UNIX)
+ #define HAVE_CPP_SPECIALIZATION
+ #define HAVE_CPP_PARTIAL_SPECIALIZATION
+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
diff --git a/java/jdk15/files/patch-awt_fontmanager_t2kScalerContext.cpp b/java/jdk15/files/patch-awt_fontmanager_t2kScalerContext.cpp
new file mode 100644
index 000000000000..7f39f7cceabb
--- /dev/null
+++ b/java/jdk15/files/patch-awt_fontmanager_t2kScalerContext.cpp
@@ -0,0 +1,21 @@
+$FreeBSD$
+
+--- ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp.orig Fri Jul 30 18:00:09 2004
++++ ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp Fri Jul 30 22:11:36 2004
+@@ -937,14 +937,14 @@
+ CMAPMapper::CharsToGlyphs(
+ int count, const Unicode16 unicodes[], UInt32 glyphs[]) const
+ {
+- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs);
++ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs);
+ }
+
+ void
+ CMAPMapper::CharsToGlyphs(
+ int count, const Unicode32 unicodes[], UInt32 glyphs[]) const
+ {
+- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs);
++ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs);
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
diff --git a/java/jdk15/files/patch-plugin_ns600_nscore.h b/java/jdk15/files/patch-plugin_ns600_nscore.h
new file mode 100644
index 000000000000..9e4bcacf650a
--- /dev/null
+++ b/java/jdk15/files/patch-plugin_ns600_nscore.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns600/nscore.h.orig Fri Jul 30 18:00:04 2004
++++ ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns600/nscore.h Fri Jul 30 23:32:31 2004
+@@ -163,7 +163,7 @@
+ */
+
+ /* under Metrowerks (Mac), we don't have autoconf yet */
+-#ifdef __MWERKS__
++#if defined(__MWERKS__) || defined(NS_UNIX)
+ #define HAVE_CPP_SPECIALIZATION
+ #define HAVE_CPP_PARTIAL_SPECIALIZATION
+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
diff --git a/java/jdk15/files/patch-plugin_ns610_nscore.h b/java/jdk15/files/patch-plugin_ns610_nscore.h
new file mode 100644
index 000000000000..de8cc76e5fa3
--- /dev/null
+++ b/java/jdk15/files/patch-plugin_ns610_nscore.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns610/nscore.h.orig Fri Jul 30 18:00:05 2004
++++ ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns610/nscore.h Fri Jul 30 23:23:36 2004
+@@ -163,7 +163,7 @@
+ */
+
+ /* under Metrowerks (Mac), we don't have autoconf yet */
+-#ifdef __MWERKS__
++#if defined(__MWERKS__) || defined(NS_UNIX)
+ #define HAVE_CPP_SPECIALIZATION
+ #define HAVE_CPP_PARTIAL_SPECIALIZATION
+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
diff --git a/java/jdk16/files/patch-awt_fontmanager_t2kScalerContext.cpp b/java/jdk16/files/patch-awt_fontmanager_t2kScalerContext.cpp
new file mode 100644
index 000000000000..7f39f7cceabb
--- /dev/null
+++ b/java/jdk16/files/patch-awt_fontmanager_t2kScalerContext.cpp
@@ -0,0 +1,21 @@
+$FreeBSD$
+
+--- ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp.orig Fri Jul 30 18:00:09 2004
++++ ../../j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp Fri Jul 30 22:11:36 2004
+@@ -937,14 +937,14 @@
+ CMAPMapper::CharsToGlyphs(
+ int count, const Unicode16 unicodes[], UInt32 glyphs[]) const
+ {
+- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs);
++ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs);
+ }
+
+ void
+ CMAPMapper::CharsToGlyphs(
+ int count, const Unicode32 unicodes[], UInt32 glyphs[]) const
+ {
+- ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs);
++ ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs);
+ }
+
+ //////////////////////////////////////////////////////////////////////////////
diff --git a/java/jdk16/files/patch-plugin_ns600_nscore.h b/java/jdk16/files/patch-plugin_ns600_nscore.h
new file mode 100644
index 000000000000..9e4bcacf650a
--- /dev/null
+++ b/java/jdk16/files/patch-plugin_ns600_nscore.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns600/nscore.h.orig Fri Jul 30 18:00:04 2004
++++ ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns600/nscore.h Fri Jul 30 23:32:31 2004
+@@ -163,7 +163,7 @@
+ */
+
+ /* under Metrowerks (Mac), we don't have autoconf yet */
+-#ifdef __MWERKS__
++#if defined(__MWERKS__) || defined(NS_UNIX)
+ #define HAVE_CPP_SPECIALIZATION
+ #define HAVE_CPP_PARTIAL_SPECIALIZATION
+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
diff --git a/java/jdk16/files/patch-plugin_ns610_nscore.h b/java/jdk16/files/patch-plugin_ns610_nscore.h
new file mode 100644
index 000000000000..de8cc76e5fa3
--- /dev/null
+++ b/java/jdk16/files/patch-plugin_ns610_nscore.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns610/nscore.h.orig Fri Jul 30 18:00:05 2004
++++ ../../deploy/src/plugin/oji-plugin/include/mozilla_headers_ns610/nscore.h Fri Jul 30 23:23:36 2004
+@@ -163,7 +163,7 @@
+ */
+
+ /* under Metrowerks (Mac), we don't have autoconf yet */
+-#ifdef __MWERKS__
++#if defined(__MWERKS__) || defined(NS_UNIX)
+ #define HAVE_CPP_SPECIALIZATION
+ #define HAVE_CPP_PARTIAL_SPECIALIZATION
+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX