changeset in /hg/icedtea6: 2008-03-25 Matthias Klose <doko at ubu...
doko at ubuntu.com
doko at ubuntu.com
Tue Mar 25 03:01:34 PDT 2008
changeset 3ef0fc18a758 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ef0fc18a758
description:
2008-03-25 Matthias Klose <doko at ubuntu.com>
* Makefile.am: Updated to b07.
* Makefile.in: Regenerated.
* patches/icedtea-libraries.patch: Update to b07.
* patches/icedtea-lesstif-64.patch: Remove, integrated in b07.
diffstat:
5 files changed, 16 insertions(+), 38 deletions(-)
ChangeLog | 7 +++++++
Makefile.am | 7 +++----
Makefile.in | 7 +++----
patches/icedtea-lesstif-64.patch | 29 -----------------------------
patches/icedtea-libraries.patch | 4 +++-
diffs (113 lines):
diff -r 45e29a903d8b -r 3ef0fc18a758 ChangeLog
--- a/ChangeLog Mon Mar 24 11:04:57 2008 -0400
+++ b/ChangeLog Tue Mar 25 11:01:32 2008 +0100
@@ -1,3 +1,10 @@ 2008-03-24 Lillian Angel <langel at redha
+2008-03-25 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am: Updated to b07.
+ * Makefile.in: Regenerated.
+ * patches/icedtea-libraries.patch: Update to b07.
+ * patches/icedtea-lesstif-64.patch: Remove, integrated in b07.
+
2008-03-24 Lillian Angel <langel at redhat.com>
* Makefile.am
diff -r 45e29a903d8b -r 3ef0fc18a758 Makefile.am
--- a/Makefile.am Mon Mar 24 11:04:57 2008 -0400
+++ b/Makefile.am Tue Mar 25 11:01:32 2008 +0100
@@ -1,6 +1,6 @@ OPENJDK_DATE = 28_feb_2008
-OPENJDK_DATE = 28_feb_2008
-OPENJDK_MD5SUM = 08bdfb4d78340788969a4edd853fcd2b
-OPENJDK_VERSION = b06
+OPENJDK_DATE = 20_mar_2008
+OPENJDK_MD5SUM = 9753b5807efe32be4fa168fc4e855b51
+OPENJDK_VERSION = b07
if NETX_PLUGIN
NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -268,7 +268,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-static-libstdc++.patch \
patches/icedtea-lcms-leak.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-lesstif-64.patch \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
diff -r 45e29a903d8b -r 3ef0fc18a758 Makefile.in
--- a/Makefile.in Mon Mar 24 11:04:57 2008 -0400
+++ b/Makefile.in Tue Mar 25 11:01:32 2008 +0100
@@ -228,9 +228,9 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_DATE = 28_feb_2008
-OPENJDK_MD5SUM = 08bdfb4d78340788969a4edd853fcd2b
-OPENJDK_VERSION = b06
+OPENJDK_DATE = 20_mar_2008
+OPENJDK_MD5SUM = 9753b5807efe32be4fa168fc4e855b51
+OPENJDK_VERSION = b07
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -379,7 +379,6 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-static-libstdc++.patch \
patches/icedtea-lcms-leak.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-lesstif-64.patch \
patches/icedtea-generated.patch patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch $(GCC_PATCH) \
diff -r 45e29a903d8b -r 3ef0fc18a758 patches/icedtea-lesstif-64.patch
--- a/patches/icedtea-lesstif-64.patch Mon Mar 24 11:04:57 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- openjdk/j2se/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java~ 2007-09-01 12:47:07.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2007-09-01 13:38:52.000000000 +0200
-@@ -1137,12 +1137,25 @@ public class WrapperGenerator {
-
- pw.println("/* This file is an automatically generated file, please do not edit this file, modify the XlibParser.java file instead !*/\n" );
- pw.println("#include <X11/Xlib.h>\n#include <X11/Xutil.h>\n#include <X11/Xos.h>\n#include <X11/Xatom.h>\n#include <stdio.h>\n");
-- pw.println("#include <Xm/MwmUtil.h>");
- pw.println("#include <X11/extensions/Xdbe.h>");
- pw.println("#include \"awt_p.h\"");
- pw.println("#include \"color.h\"");
- pw.println("#include \"colordata.h\"");
-
-+ pw.println("\n/* the struct below was copied from MwmUtil.h to workaround a lesstif bug:");
-+ pw.println(" http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6586752 */");
-+ pw.println("\ntypedef struct PROPMOTIFWMHINTS {");
-+ pw.println("/* 32-bit property items are stored as long on the client (whether");
-+ pw.println(" * that means 32 bits or 64). XChangeProperty handles the conversion");
-+ pw.println(" * to the actual 32-bit quantities sent to the server.");
-+ pw.println(" */");
-+ pw.println(" unsigned long flags;");
-+ pw.println(" unsigned long functions;");
-+ pw.println(" unsigned long decorations;");
-+ pw.println(" long inputMode;");
-+ pw.println(" unsigned long status;");
-+ pw.println("} PropMwmHints;");
-+
- pw.println("\n\nint main(){");
- j=0;
- for ( eo = symbolTable.elements() ; eo.hasMoreElements() ;) {
diff -r 45e29a903d8b -r 3ef0fc18a758 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Mon Mar 24 11:04:57 2008 -0400
+++ b/patches/icedtea-libraries.patch Tue Mar 25 11:01:32 2008 +0100
@@ -255,7 +255,7 @@
else # PLATFORM
CFLAGS += -DWITH_WIN32
OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
-@@ -76,12 +76,8 @@
+@@ -76,14 +76,10 @@
#
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
@@ -268,6 +268,8 @@
CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ ifeq ($(PLATFORM), linux)
+ ifeq ($(ARCH_DATA_MODEL), 64)
diff -ruN openjdk.old/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk
--- openjdk.old/jdk/make/sun/jpeg/FILES_c.gmk 2007-10-12 03:54:08.000000000 -0400
+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2007-10-23 17:13:59.000000000 -0400
More information about the distro-pkg-dev
mailing list