changeset in /hg/icedtea: 2008-09-12 Matthias Klose <doko at ubun...
doko at ubuntu.com
doko at ubuntu.com
Sat Oct 18 21:23:13 PDT 2008
changeset 16c322628d9f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=16c322628d9f
description:
2008-09-12 Matthias Klose <doko at ubuntu.com>
* fsg.sh: Update for b12 code drop.
* Makefile.am, NEWS: Update for b12.
* patches/icedtea-LCMS-setTagData.patch: Remove, applied upstream.
* patches/icedtea-color-createcontext.patch: Likewise.
* patches/icedtea-hotspot-citypeflow.patch: Likewise.
* patches/icedtea-hotspot-gcc-pr36917.patch: Likewise.
* patches/icedtea-lcms-leak.patch: Likewise.
* patches/icedtea-corba.patch: Likewise.
* patches/icedtea-gervill.patch: Likewise.
* patches/icedtea-directaudio-close-trick.patch: Likewise.
* patches/icedtea-generated.patch: Remove, obsolete.
* patches/icedtea-version.patch: Update.
* patches/icedtea-ecj.patch: Update.
* patches/icedtea-javafiles.patch: Regenerate.
* HACKING: Update for b12.
diffstat:
17 files changed, 71 insertions(+), 768 deletions(-)
ChangeLog | 18 +
HACKING | 7
Makefile.am | 15 -
NEWS | 2
fsg.sh | 4
patches/icedtea-LCMS-setTagData.patch | 296 -------------------------
patches/icedtea-color-createcontext.patch | 36 ---
patches/icedtea-corba.patch | 14 -
patches/icedtea-directaudio-close-trick.patch | 193 ----------------
patches/icedtea-ecj.patch | 5
patches/icedtea-generated.patch | 10
patches/icedtea-gervill.patch | 99 --------
patches/icedtea-hotspot-citypeflow.patch | 11
patches/icedtea-hotspot-gcc-pr36917.patch | 9
patches/icedtea-javafiles.patch | 78 +++---
patches/icedtea-lcms-leak.patch | 11
patches/icedtea-version.patch | 31 --
diffs (truncated from 1027 to 500 lines):
diff -r 8306580ee906 -r 16c322628d9f ChangeLog
--- a/ChangeLog Fri Sep 12 15:20:06 2008 +0100
+++ b/ChangeLog Fri Sep 12 22:35:46 2008 +0200
@@ -1,3 +1,21 @@ 2008-09-12 Gary Benson <gbenson at redhat
+2008-09-12 Matthias Klose <doko at ubuntu.com>
+
+ * fsg.sh: Update for b12 code drop.
+ * Makefile.am, NEWS: Update for b12.
+ * patches/icedtea-LCMS-setTagData.patch: Remove, applied upstream.
+ * patches/icedtea-color-createcontext.patch: Likewise.
+ * patches/icedtea-hotspot-citypeflow.patch: Likewise.
+ * patches/icedtea-hotspot-gcc-pr36917.patch: Likewise.
+ * patches/icedtea-lcms-leak.patch: Likewise.
+ * patches/icedtea-corba.patch: Likewise.
+ * patches/icedtea-gervill.patch: Likewise.
+ * patches/icedtea-directaudio-close-trick.patch: Likewise.
+ * patches/icedtea-generated.patch: Remove, obsolete.
+ * patches/icedtea-version.patch: Update.
+ * patches/icedtea-ecj.patch: Update.
+ * patches/icedtea-javafiles.patch: Regenerate.
+ * HACKING: Update for b12.
+
2008-09-12 Gary Benson <gbenson at redhat.com>
Xerxes RÃ¥nby <xerxes at zafena.se>
diff -r 8306580ee906 -r 16c322628d9f HACKING
--- a/HACKING Fri Sep 12 15:20:06 2008 +0100
+++ b/HACKING Fri Sep 12 22:35:46 2008 +0200
@@ -17,21 +17,16 @@ The following patches are currently appl
* icedtea-ant.patch: Remove use of $(ANT_HOME).
* icedtea-uname.patch: Handle output of uname on arm and mips{,el}.
* icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60).
-* icedtea-color-createcontext.patch: Add support for a PaintContext to java.awt.Color.
* icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add
cast to getAnnotation and trapAuthenticationFailure variable to com.sun.jmx.snmp.SnmpPduTrap.
-* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
* icedtea-core-build.patch: Add support for building IcedTea core VM.
* icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
* icedtea-demos.patch: Fix building of JVMTI demo.
-* icedtea-directaudio-close-trick.patch: Allow hardware sound device to be reopened.
* icedtea-enum-bug-181.patch: Fixes class type check (PR181/S6736248)
* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
* icedtea-fonts.patch: Add Fedora fontconfig.
* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
-* icedtea-generated.patch: Force use of /bin/bash.
-* icedtea-gervill.patch: Add support for Gervill from the overlay.
* icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649)
* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64.
* icedtea-javafiles.patch: Add missing Java files to list.
@@ -61,8 +56,6 @@ The following patches are currently appl
* icedtea-webservices.patch: Add applet support.
* icedtea-zero-build.patch: Add support for the zero assembler build.
* icedtea-shark-build.patch: Add support for building the Shark JIT.
-* icedtea-hotspot-gcc-pr36917.patch: Work around miscompilation with GCC 4.3 (PR 36917).
-* icedtea-hotspot-citypeflow.patch: Fix hotspot miscompilation with GCC 4.3 on x86.
* icedtea-alpha-fixes.patch: Fix build issues on alpha-linux.
* icedtea-arch.patch: Add support for additional architectures.
* icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building.
diff -r 8306580ee906 -r 16c322628d9f Makefile.am
--- a/Makefile.am Fri Sep 12 15:20:06 2008 +0100
+++ b/Makefile.am Fri Sep 12 22:35:46 2008 +0200
@@ -1,6 +1,6 @@ OPENJDK_DATE = 10_jul_2008
-OPENJDK_DATE = 10_jul_2008
-OPENJDK_MD5SUM = 8e60cdac02ec1b2d8ddb9d7369be69df
-OPENJDK_VERSION = b11
+OPENJDK_DATE = 28_aug_2008
+OPENJDK_MD5SUM = b53e1ef643909ce82721ee4c970d958b
+OPENJDK_VERSION = b12
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -467,24 +467,17 @@ ICEDTEA_PATCHES = \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
- patches/icedtea-corba.patch \
patches/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
patches/icedtea-static-libstdc++.patch \
- patches/icedtea-lcms-leak.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
- patches/icedtea-LCMS-setTagData.patch \
- patches/icedtea-color-createcontext.patch \
patches/icedtea-fonts.patch \
- patches/icedtea-gervill.patch \
- patches/icedtea-directaudio-close-trick.patch \
patches/icedtea-sparc.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
@@ -496,8 +489,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-nomotif-6706121.patch \
patches/icedtea-nomotif.patch \
- patches/icedtea-hotspot-gcc-pr36917.patch \
- patches/icedtea-hotspot-citypeflow.patch \
patches/icedtea-alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
patches/icedtea-enum-bug-181.patch \
diff -r 8306580ee906 -r 16c322628d9f NEWS
--- a/NEWS Fri Sep 12 15:20:06 2008 +0100
+++ b/NEWS Fri Sep 12 22:35:46 2008 +0200
@@ -1,6 +1,6 @@ New in release UNRELEASED (2008-xx-xx)
New in release UNRELEASED (2008-xx-xx)
-- Updated to b11 build.
+- Updated to b12 build.
New in release 1.2 (2008-05-28)
diff -r 8306580ee906 -r 16c322628d9f fsg.sh
--- a/fsg.sh Fri Sep 12 15:20:06 2008 +0100
+++ b/fsg.sh Fri Sep 12 22:35:46 2008 +0200
@@ -87,9 +87,5 @@ rm -f \
openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet \
openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64
-# PR157, S6713083
-rm -f \
- openjdk/jdk/src/share/classes/java/lang/instrument/package.html
-
# END Debian/Ubuntu additions
diff -r 8306580ee906 -r 16c322628d9f patches/icedtea-LCMS-setTagData.patch
--- a/patches/icedtea-LCMS-setTagData.patch Fri Sep 12 15:20:06 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,296 +0,0 @@
-*** openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h.orig 2008-04-11 19:17:54.000000000 -0700
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h 2008-04-11 19:19:48.000000000 -0700
-*************** LCMSAPI BOOL LCMSEXPORT _cmsSaveProfile(
-*** 1244,1250 ****
- LCMSAPI BOOL LCMSEXPORT _cmsSaveProfileToMem(cmsHPROFILE hProfile, void *MemPtr,
- size_t* BytesNeeded);
-
-!
-
- // PostScript ColorRenderingDictionary and ColorSpaceArray
-
---- 1244,1251 ----
- LCMSAPI BOOL LCMSEXPORT _cmsSaveProfileToMem(cmsHPROFILE hProfile, void *MemPtr,
- size_t* BytesNeeded);
-
-! // Modify data for a tag in a profile
-! LCMSAPI BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig, void *data, size_t size);
-
- // PostScript ColorRenderingDictionary and ColorSpaceArray
-
-*************** typedef struct _lcms_iccprofile_struct {
-*** 1838,1843 ****
---- 1839,1845 ----
- BOOL (* Seek)(struct _lcms_iccprofile_struct* Icc, size_t offset);
- BOOL (* Close)(struct _lcms_iccprofile_struct* Icc);
- size_t (* Tell)(struct _lcms_iccprofile_struct* Icc);
-+ BOOL (* Grow)(struct _lcms_iccprofile_struct* Icc, size_t amount);
-
- // Writting
-
-*** openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c.orig 2008-04-11 19:18:43.000000000 -0700
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c 2008-04-11 19:19:48.000000000 -0700
-*************** JNIEXPORT void JNICALL Java_sun_java2d_c
-*** 347,353 ****
- JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagData
- (JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data)
- {
-! fprintf(stderr, "setTagData operation is not implemented");
- }
-
- void* getILData (JNIEnv *env, jobject img, jint* pDataType,
---- 347,368 ----
- JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagData
- (JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data)
- {
-! cmsHPROFILE profile;
-! storeID_t sProf;
-! jbyte* dataArray;
-! int tagSize;
-!
-! if (tagSig == SigHead) {
-! fprintf(stderr, "setTagData on icSigHead not permitted");
-! return;
-! }
-!
-! sProf.j = id;
-! profile = (cmsHPROFILE) sProf.pf;
-! dataArray = (*env)->GetByteArrayElements(env, data, 0);
-! tagSize =(*env)->GetArrayLength(env, data);
-! _cmsModifyTagData(profile, (icTagSignature) tagSig, dataArray, tagSize);
-! (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
- }
-
- void* getILData (JNIEnv *env, jobject img, jint* pDataType,
-*** openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c.orig 2008-04-11 19:17:54.000000000 -0700
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2008-04-11 19:19:48.000000000 -0700
-*************** BOOL MemoryWrite(struct _lcms_iccprofile
-*** 157,164 ****
- if (size == 0) return TRUE;
-
- if (ResData != NULL)
-! CopyMemory(ResData ->Block + Icc ->UsedSpace, Ptr, size);
-
- Icc->UsedSpace += size;
-
- return TRUE;
---- 157,165 ----
- if (size == 0) return TRUE;
-
- if (ResData != NULL)
-! CopyMemory(ResData ->Block + ResData ->Pointer, Ptr, size);
-
-+ ResData->Pointer += size;
- Icc->UsedSpace += size;
-
- return TRUE;
-*************** BOOL MemoryWrite(struct _lcms_iccprofile
-*** 166,171 ****
---- 167,184 ----
-
-
- static
-+ BOOL MemoryGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
-+ {
-+ FILEMEM* ResData = (FILEMEM*) Icc->stream;
-+ ResData->Size += size;
-+ ResData->Block = realloc(ResData->Block, ResData->Size);
-+ if (!ResData->Block)
-+ return FALSE;
-+ return TRUE;
-+ }
-+
-+
-+ static
- BOOL MemoryClose(struct _lcms_iccprofile_struct* Icc)
- {
- FILEMEM* ResData = (FILEMEM*) Icc ->stream;
-*************** BOOL FileWrite(struct _lcms_iccprofile_s
-*** 239,244 ****
---- 252,264 ----
-
-
- static
-+ BOOL FileGrow(struct _lcms_iccprofile_struct* Icc, size_t size)
-+ {
-+ return TRUE;
-+ }
-+
-+
-+ static
- BOOL FileClose(struct _lcms_iccprofile_struct* Icc)
- {
- return fclose((FILE*) Icc ->stream);
-*************** LPLCMSICCPROFILE _cmsCreateProfileFromFi
-*** 382,387 ****
---- 402,408 ----
- NewIcc ->Seek = FileSeek;
- NewIcc ->Tell = FileTell;
- NewIcc ->Close = FileClose;
-+ NewIcc ->Grow = FileGrow;
- NewIcc ->Write = NULL;
-
- NewIcc ->IsWrite = FALSE;
-*************** LPLCMSICCPROFILE _cmsCreateProfileFromMe
-*** 419,425 ****
- NewIcc ->Seek = MemorySeek;
- NewIcc ->Tell = MemoryTell;
- NewIcc ->Close = MemoryClose;
-! NewIcc ->Write = NULL;
-
- NewIcc ->IsWrite = FALSE;
-
---- 440,447 ----
- NewIcc ->Seek = MemorySeek;
- NewIcc ->Tell = MemoryTell;
- NewIcc ->Close = MemoryClose;
-! NewIcc ->Grow = MemoryGrow;
-! NewIcc ->Write = MemoryWrite;
-
- NewIcc ->IsWrite = FALSE;
-
-*** openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c.orig 2008-04-11 19:17:54.000000000 -0700
---- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2008-04-11 19:19:48.000000000 -0700
-*************** CleanUp:
-*** 3661,3663 ****
---- 3661,3800 ----
- CopyMemory(Icc, &Keep, sizeof(LCMSICCPROFILE));
- return FALSE;
- }
-+
-+ BOOL LCMSEXPORT _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
-+ void *data, size_t size)
-+ {
-+ BOOL isNew;
-+ int i, idx, delta, count;
-+ LPBYTE padChars[3] = {0, 0, 0};
-+ LPBYTE beforeBuf, afterBuf, ptr;
-+ size_t beforeSize, afterSize;
-+ icUInt32Number profileSize, temp;
-+ LPLCMSICCPROFILE Icc = (LPLCMSICCPROFILE) (LPSTR) hProfile;
-+
-+ isNew = FALSE;
-+ idx = _cmsSearchTag(Icc, sig, FALSE);
-+ if (idx < 0)
-+ {
-+ isNew = TRUE;
-+ idx = Icc->TagCount++;
-+ if (Icc->TagCount >= MAX_TABLE_TAG)
-+ {
-+ fprintf(stderr, "Too many tags (%d)\n", Icc->TagCount);
-+ Icc->TagCount = MAX_TABLE_TAG-1;
-+ return FALSE;
-+ }
-+ }
-+
-+ /* Read in size from header */
-+ Icc->Seek(Icc, 0);
-+ Icc->Read(&profileSize, sizeof(icUInt32Number), 1, Icc);
-+ AdjustEndianess32((LPBYTE) &profileSize);
-+
-+ /* Compute the change in profile size */
-+ if (isNew)
-+ delta = sizeof(icTag) + ALIGNLONG(size);
-+ else
-+ delta = ALIGNLONG(size) - ALIGNLONG(Icc->TagSizes[idx]);
-+
-+ /* Add tag to internal structures */
-+ ptr = malloc(size);
-+ CopyMemory(ptr, data, size);
-+ Icc->TagSizes[idx] = size;
-+ Icc->TagNames[idx] = sig;
-+ if (Icc->TagPtrs[idx])
-+ free(Icc->TagPtrs[idx]);
-+ Icc->TagPtrs[idx] = ptr;
-+ if (isNew)
-+ Icc->TagOffsets[idx] = profileSize;
-+
-+ /* Compute size of tag data before/after the modified tag */
-+ beforeSize = Icc->TagOffsets[idx] - Icc->TagOffsets[0];
-+ if (Icc->TagCount == (idx + 1))
-+ afterSize = 0;
-+ else
-+ afterSize = profileSize - Icc->TagOffsets[idx+1];
-+
-+ /* Make copies of the data before/after the modified tag */
-+ if (beforeSize > 0)
-+ {
-+ beforeBuf = malloc(beforeSize);
-+ Icc->Seek(Icc, Icc->TagOffsets[0]);
-+ Icc->Read(beforeBuf, beforeSize, 1, Icc);
-+ }
-+
-+ if (afterSize > 0)
-+ {
-+ afterBuf = malloc(afterSize);
-+ Icc->Seek(Icc, Icc->TagOffsets[idx+1]);
-+ Icc->Read(afterBuf, afterSize, 1, Icc);
-+ }
-+
-+ /* Update the profile size in the header */
-+ profileSize += delta;
-+ Icc->Seek(Icc, 0);
-+ temp = TransportValue32(profileSize);
-+ Icc->Write(Icc, sizeof(icUInt32Number), &temp);
-+
-+ Icc->Grow(Icc, delta);
-+
-+ /* Adjust tag offsets: if the tag is new, we must account
-+ for the new tag table entry; otherwise, only those tags after
-+ the modified tag are changed (by delta) */
-+ if (isNew)
-+ {
-+ for (i = 0; i < Icc->TagCount; ++i)
-+ Icc->TagOffsets[i] += sizeof(icTag);
-+ }
-+ else
-+ {
-+ for (i = idx+1; i < Icc->TagCount; ++i)
-+ Icc->TagOffsets[i] += delta;
-+ }
-+
-+ /* Write out a new tag table */
-+ count = 0;
-+ for (i = 0; i < Icc->TagCount; ++i)
-+ {
-+ if (Icc->TagNames[i] != 0)
-+ ++count;
-+ }
-+ Icc->Seek(Icc, sizeof(icHeader));
-+ temp = TransportValue32(count);
-+ Icc->Write(Icc, sizeof(icUInt32Number), &temp);
-+
-+ for (i = 0; i < Icc->TagCount; ++i)
-+ {
-+ if (Icc->TagNames[i] != 0)
-+ {
-+ icTag tag;
-+ tag.sig = TransportValue32(Icc->TagNames[i]);
-+ tag.offset = TransportValue32((icInt32Number) Icc->TagOffsets[i]);
-+ tag.size = TransportValue32((icInt32Number) Icc->TagSizes[i]);
-+ Icc->Write(Icc, sizeof(icTag), &tag);
-+ }
-+ }
-+
-+ /* Write unchanged data before the modified tag */
-+ if (beforeSize > 0)
-+ {
-+ Icc->Write(Icc, beforeSize, beforeBuf);
-+ free(beforeBuf);
-+ }
-+
-+ /* Write modified tag data */
-+ Icc->Write(Icc, size, data);
-+ if (size % 4)
-+ Icc->Write(Icc, 4 - (size % 4), padChars);
-+
-+ /* Write unchanged data after the modified tag */
-+ if (afterSize > 0)
-+ {
-+ Icc->Write(Icc, afterSize, afterBuf);
-+ free(afterBuf);
-+ }
-+
-+ return TRUE;
-+ }
-+
diff -r 8306580ee906 -r 16c322628d9f patches/icedtea-color-createcontext.patch
--- a/patches/icedtea-color-createcontext.patch Fri Sep 12 15:20:06 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-*** openjdk/jdk/src/share/classes/java/awt/Color.java.orig 2008-04-02 17:12:00.000000000 -0700
---- openjdk/jdk/src/share/classes/java/awt/Color.java 2008-04-02 17:29:29.000000000 -0700
-*************** public class Color implements Paint, jav
-*** 251,256 ****
---- 251,262 ----
- */
- private ColorSpace cs = null;
-
-+ /**
-+ * The <code>PaintContext</code> for this solid color.
-+ * @see #createContext
-+ */
-+ private transient PaintContext context;
-+
- /*
- * JDK 1.1 serialVersionUID
- */
-*************** public class Color implements Paint, jav
-*** 1205,1211 ****
- Rectangle2D r2d,
- AffineTransform xform,
- RenderingHints hints) {
-! return new ColorPaintContext(getRGB(), cm);
- }
-
- /**
---- 1211,1219 ----
- Rectangle2D r2d,
- AffineTransform xform,
- RenderingHints hints) {
-! if (context == null || !context.getColorModel().equals(cm))
-! context = new ColorPaintContext(getRGB(), cm);
-! return context;
- }
-
- /**
diff -r 8306580ee906 -r 16c322628d9f patches/icedtea-corba.patch
--- a/patches/icedtea-corba.patch Fri Sep 12 15:20:06 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- openjdk.old/corba/make/org/omg/CORBA/Makefile 2007-10-12 03:49:14.000000000 -0400
-+++ openjdk/corba/make/org/omg/CORBA/Makefile 2007-11-06 13:57:24.000000000 -0500
-@@ -49,7 +49,10 @@
- FILES_java = \
- $(ORG_OMG_SENDINGCONTEXT_java) \
- $(ORG_OMG_CORBA_2_3_java) \
-- $(ORG_OMG_CORBA_java)
-+ $(ORG_OMG_CORBA_java) \
-+ $(org_omg_SENDINGCONTEXT_java) \
-+ $(org_omg_CORBA_2_3_java) \
-+ $(org_omg_CORBA_java)
-
- #
- # Include
diff -r 8306580ee906 -r 16c322628d9f patches/icedtea-directaudio-close-trick.patch
--- a/patches/icedtea-directaudio-close-trick.patch Fri Sep 12 15:20:06 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
---- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java 2008-04-13 01:05:30.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java 2008-05-09 02:18:21.000000000 +0200
-@@ -394,7 +394,12 @@
- private float leftGain, rightGain;
- protected volatile boolean noService = false; // do not run the nService method
-
-+ // Guards all native calls.
- protected Object lockNative = new Object();
More information about the distro-pkg-dev
mailing list