packages: icedtea6/icedtea6.spec, icedtea6/icedtea6-build.patch (NEW)=?UTF-8?Q?=20?=- rel...

[arekm]

Author: arekm                        Date: Sat Feb 11 14:44:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7 ; more build fixes

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.79 -> 1.80) , icedtea6-build.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.79 packages/icedtea6/icedtea6.spec:1.80
--- packages/icedtea6/icedtea6.spec:1.79	Sat Feb 11 15:03:58 2012
+++ packages/icedtea6/icedtea6.spec	Sat Feb 11 15:43:55 2012
@@ -22,7 +22,7 @@
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea6
 Version:	1.8.3
-Release:	6
+Release:	7
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz
@@ -43,6 +43,7 @@
 Patch4:		%{name}-libpath.patch
 Patch5:		%{name}-system_tray.patch
 Patch6:		%{name}-xul.patch
+Patch7:		%{name}-build.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 BuildRequires:	ant-nodeps
@@ -416,6 +417,8 @@
 
 %patch6 -p1
 
+cp "%{PATCH7}" pld-patches
+
 # let the build system extract the sources where it wants them
 mkdir drops
 ln -s %{SOURCE1} .
@@ -889,6 +892,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2012/02/11 14:43:55  arekm
+- rel 7 ; more build fixes
+
 Revision 1.79  2012/02/11 14:03:58  arekm
 - disable OS version check (checks for kernel)
 

================================================================
Index: packages/icedtea6/icedtea6-build.patch
diff -u /dev/null packages/icedtea6/icedtea6-build.patch:1.1
--- /dev/null	Sat Feb 11 15:44:00 2012
+++ packages/icedtea6/icedtea6-build.patch	Sat Feb 11 15:43:55 2012
@@ -0,0 +1,83 @@
+--- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp.org	2012-02-11 15:04:57.730027726 +0100
++++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	2012-02-11 15:05:11.420335355 +0100
+@@ -46,7 +46,7 @@
+   }
+ };
+ 
+-// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
++// InterfaceSupport provides functionality used by the __JDK_LEAF and __ENTRY
+ // macros. These macros are used to guard entry points into the VM and
+ // perform checks upon leave of the VM.
+ 
+@@ -391,7 +391,7 @@
+ 
+ // LEAF routines do not lock, GC or throw exceptions
+ 
+-#define __LEAF(result_type, header)                                  \
++#define __JDK_LEAF(result_type, header)                                  \
+   TRACE_CALL(result_type, header)                                    \
+   debug_only(NoHandleMark __hm;)                                     \
+   /* begin of body */
+@@ -427,7 +427,7 @@
+ 
+ #define IRT_LEAF(result_type, header)                                \
+   result_type header {                                               \
+-    __LEAF(result_type, header)                                      \
++    __JDK_LEAF(result_type, header)                                      \
+     debug_only(No_Safepoint_Verifier __nspv(true);)
+ 
+ 
+@@ -461,7 +461,7 @@
+ 
+ #define JRT_LEAF(result_type, header)                                \
+   result_type header {                                               \
+-  __LEAF(result_type, header)                                        \
++  __JDK_LEAF(result_type, header)                                        \
+   debug_only(JRT_Leaf_Verifier __jlv;)
+ 
+ 
+@@ -521,7 +521,7 @@
+   result_type JNICALL header {                                \
+     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
+     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
+-    __LEAF(result_type, header)
++    __JDK_LEAF(result_type, header)
+ 
+ 
+ // Close the routine and the extern "C"
+@@ -562,7 +562,7 @@
+ extern "C" {                                                         \
+   result_type JNICALL header {                                       \
+     VM_Exit::block_if_vm_exited();                                   \
+-    __LEAF(result_type, header)
++    __JDK_LEAF(result_type, header)
+ 
+ 
+ #define JVM_END } }
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c.org	2012-02-11 15:20:11.416431939 +0100
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2012-02-11 15:26:24.905098592 +0100
+@@ -36,7 +36,7 @@
+ {
+     png_uint_32 check;
+ 
+-    SplashStream * stream = (SplashStream*)png_ptr->io_ptr;
++    SplashStream * stream = (SplashStream*)png_get_io_ptr(png_ptr);
+     check = stream->read(stream, data, length);
+     if (check != length)
+         png_error(png_ptr, "Read Error");
+@@ -71,12 +71,12 @@
+         goto done;
+     }
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         goto done;
+     }
+ 
+-    png_ptr->io_ptr = io_ptr;
+-    png_ptr->read_data_fn = read_func;
++    png_get_io_ptr(png_ptr);
++    png_set_read_fn(png_ptr, NULL, read_func);
+ 
+     png_set_sig_bytes(png_ptr, SIG_BYTES);      /* we already read the 8 signature bytes */
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.79&r2=1.80&f=u