changeset in /hg/icedtea6: Document patches and use newer versio...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Mon Jun 23 07:33:17 PDT 2008
changeset eb77784e8b0a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=eb77784e8b0a
description:
Document patches and use newer version of gtkplaf patch.
2008-06-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
* ChangeLog: Correct PATCHES typo.
* HACKING: New file to list patches.
* patches/icedtea-gtkplaf.patch: Changed to use
fix from S6624717 as found in OpenJDK7 b27.
diffstat:
3 files changed, 173 insertions(+), 21 deletions(-)
ChangeLog | 13 +++-
HACKING | 114 +++++++++++++++++++++++++++++++++++++++++
patches/icedtea-gtkplaf.patch | 67 +++++++++++++++++-------
diffs (233 lines):
diff -r dfa695befde7 -r eb77784e8b0a ChangeLog
--- a/ChangeLog Mon Jun 23 10:00:18 2008 -0400
+++ b/ChangeLog Mon Jun 23 15:31:39 2008 +0100
@@ -1,3 +1,10 @@ 2008-06-23 Lillian Angel <langel at redha
+2008-06-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * ChangeLog: Correct PATCHES typo.
+ * HACKING: New file to list patches.
+ * patches/icedtea-gtkplaf.patch: Changed to use
+ fix from S6624717 as found in OpenJDK7 b27.
+
2008-06-23 Lillian Angel <langel at redhat.com>
* aclocal.m4: Regenerated.
@@ -7,7 +14,7 @@ 2008-06-22 Mark Wielaard <mark at klomp.o
* patches/icedtea-rhino.patch: New patch.
* Makefile.am: Add RHINO_JAR to environment variable lists.
- (ICEDTEA_PATHCES): Add patches/icedtea-rhino.patch.
+ (ICEDTEA_PATCHES): Add patches/icedtea-rhino.patch.
* Makefile.in: Regenerated.
* acinclude.m4 (FIND_RHINO_JAR): New.
* configure.ac: Use FIND_RHINO_JAR.
@@ -25,13 +32,13 @@ 2008-06-19 Lillian Angel <langel at redha
Fixes Bug #159
* patches/icedtea-component.patch: New file.
- * Makefile.am (ICEDTEA_PATHCES): Add above patch.
+ * Makefile.am (ICEDTEA_PATCHES): Add above patch.
* Makefile.in: Regenerated.
2008-06-18 Keith Seitz <keiths at redhat.com>
* patches/icedtea-dnd-updatecursor.patch: New file.
- * Makefile.am (ICEDTEA_PATHCES): Add above patch.
+ * Makefile.am (ICEDTEA_PATCHES): Add above patch.
* Makefile.in: Regenerated.
2008-06-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
diff -r dfa695befde7 -r eb77784e8b0a HACKING
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HACKING Mon Jun 23 15:31:39 2008 +0100
@@ -0,0 +1,114 @@
+Patches
+=======
+
+PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+The following patches are currently applied to OpenJDK or OpenJDK6 by IcedTea:
+
+* icedtea-ant.patch: Remove use of $(ANT_HOME).
+* icedtea-arm-uname.patch: Handle output of uname on arm.
+* 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-demo.patch: Fix building of JVMTI demo.
+* icedtea-directaudio-close-trick.patch: Allow hardware sound device to be reopened.
+* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
+* icedtea-fonts.patch: Add Fedora fontconfig.
+* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH.
+* 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.
+* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
+* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140).
+* icedtea-lcms-leak.patch: Fix LCMS memory leak.
+* icedtea-LCMS-setTagData.patch: Add support for setTagData to LCMS peer.
+* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
+* icedtea-libraries.patch: Use system JPEG and zlib libraries.
+* icedtea-license-headers.patch: Generate GPL header from automulti tool.
+* icedtea-linker-options.patch: Add -Xlinker option when linking.
+* icedtea-memory-limits.patch: Increase default memory limits.
+* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
+* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
+* icedtea-lsb-release.patch: Generate Debian LSB file.
+* icedtea-rhino.patch: Add support for Javascript.
+* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
+* icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
+* icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
+* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
+* icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package.
+* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64.
+* icedtea-sunsrc.patch: Remove service property files from TOOLS list.
+* icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms.
+* icedtea-timerqueue.patch: Fix setting of running variable (PR87).
+* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti.
+* icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
+* icedtea-version.patch: Replace name and bug URL with IcedTea versions.
+* icedtea-webservices.patch: Add applet support.
+* icedtea-zero-build.patch: Add support for the zero assembler build.
+
+The following patches are only applied to OpenJDK6 in IcedTea6:
+
+* icedtea-component.patch: Fix deadlock in AWT code (PR159/S6608764). Fixed in OpenJDK7 b25.
+* icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
+* icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
+* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
+
+The following patches are only applied to OpenJDK in IcedTea:
+
+* icedtea-override.patch: Remove @Override annotation in javax.management.AttributeValueExp (unsupported by ecj < 3.4).
+
+The following patches are only applied to the icedtea-ecj bootstrap tree:
+
+* icedtea-ecj.patch: Don't generate CORBA sources using MC/idlj, link against -lgcj
+ instead of -ljava, force use of boot tools, don't run HotSpot's test_gamma, use
+ javac executable with Ant, remove -Werror from javac call, don't build JDK demos,
+ don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
+ calls, replace hexadecimal floating point literals with decimal variants in
+ java.lang.Double and java.lang.Float.
+
+The following patches are only applied for IcedTea builds using the zero-assembler:
+
+* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
+* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
+* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-hotspot-6b06-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only).
+* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef.
+* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
+* icedtea-signature-iterator.patch: Add zero-specific signature handling.
+* icedtea-signed-types.patch: Make use of unsigned/signed types explicit.
+* icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
+* icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
+
+The following patches are only applied when building with experimental NetX plugin support:
+
+* icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel.
+
+The following patches are only applied when building with the CACAO virtual machine:
+
+* icedtea-cacao.patch: Add support for additional architectures and don't run 'java' in a new thread.
+
+Obsolete Patches
+================
+
+The following patches were previously applied, but have been made obsolete by
+changes to the OpenJDK code base and/or changes within IcedTea:
+
+* icedtea-certbundle.patch: Add support for certificates packaged by Fedora in /etc/pki: Methodology for certificates changed.
+* icedtea-color-profiles.patch: Add missing color profiles (S6523403): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
+* icedtea-hat-spl-gpl.patch: JHat has conflicting GPL/SPL licensing terms (PR143/S6695553): Included upstream in OpenJDK6 b10 and OpenJDK7 b29.
+* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH: Obsoleted by icedtea-headers.patch.
+* icedtea-liveconnect.patch: Add LiveConnect support to plugin: No longer developed.
+* icedtea-netx-applet-visibility.patch: Make applet classes package-private for the plugin: Obsoleted by icedtea-webservices.patch.
+* icedtea-xinerama.patch: Fix crash talking to second X screen (S6604044): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
+* icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
+* openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
diff -r dfa695befde7 -r eb77784e8b0a patches/icedtea-gtkplaf.patch
--- a/patches/icedtea-gtkplaf.patch Mon Jun 23 10:00:18 2008 -0400
+++ b/patches/icedtea-gtkplaf.patch Mon Jun 23 15:31:39 2008 +0100
@@ -1,23 +1,54 @@
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c.orig 2007-09-27 04:08:04.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c 2007-10-04 16:31:04.000000000 -0400
-@@ -1410,20 +1410,6 @@
- (*fp_gtk_menu_item_set_submenu)((GtkMenuItem*)root_menu, result);
- (*fp_gtk_menu_shell_append)((GtkMenuShell *)menu_bar, root_menu);
- }
-- else if (widget_type == COMBO_BOX_ARROW_BUTTON ||
-- widget_type == COMBO_BOX_TEXT_FIELD)
-- {
-- /*
+--- openjdk6/jdk/src/solaris/native/sun/awt/gtk2_interface.c 2008-05-30 08:55:40.000000000 +0100
++++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c 2008-06-22 20:47:39.000000000 +0100
+@@ -333,6 +333,7 @@
+ static GdkPixbuf* (*fp_gtk_widget_render_icon)(GtkWidget *widget,
+ const gchar *stock_id, GtkIconSize size, const gchar *detail);
+ static void (*fp_gtk_widget_set_name)(GtkWidget *widget, const gchar *name);
++static void (*fp_gtk_widget_set_parent)(GtkWidget *widget, GtkWidget *parent);
+ static void (*fp_gtk_widget_set_direction)(GtkWidget *widget,
+ GtkTextDirection direction);
+ static void (*fp_gtk_widget_style_get)(GtkWidget *widget,
+@@ -570,6 +571,8 @@
+ dl_symbol("gtk_widget_render_icon");
+ fp_gtk_widget_set_name =
+ dl_symbol("gtk_widget_set_name");
++ fp_gtk_widget_set_parent =
++ dl_symbol("gtk_widget_set_parent");
+ fp_gtk_widget_set_direction =
+ dl_symbol("gtk_widget_set_direction");
+ fp_gtk_widget_style_get =
+@@ -1040,7 +1043,7 @@
+ (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))
+ {
+ gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] =
+- (*fp_gtk_button_new)();
++ (*fp_gtk_toggle_button_new)();
+ }
+ result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE];
+ break;
+@@ -1414,12 +1417,20 @@
+ widget_type == COMBO_BOX_TEXT_FIELD)
+ {
+ /*
- * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
- * in order to trick engines into thinking it's a real combobox
- * arrow button/text field.
- */
-- GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
++ * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
++ * in order to trick engines into thinking it's a real combobox
++ * arrow button/text field.
++ */
+ GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
- (*fp_gtk_container_add)((GtkContainer *)combo, result);
-- (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
-- (*fp_gtk_widget_realize)(result);
-- return result;
-- }
- else if (widget_type != TOOL_TIP &&
- widget_type != INTERNAL_FRAME &&
- widget_type != OPTION_PANE)
++
++ if (widget_type == COMBO_BOX_TEXT_FIELD)
++ (*fp_gtk_container_add)((GtkContainer *)combo, result);
++ else
++ {
++ (*fp_gtk_widget_set_parent)(result, combo);
++ ((GtkBin*)combo)->child = result;
++ }
++
+ (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
+ (*fp_gtk_widget_realize)(result);
+ return result;
More information about the distro-pkg-dev
mailing list