[packages/icedtea7: 88/103] - rel 7 ; more build fixes

[jajcus]

commit 763d0591c43fe1f1cb0c4ce7d4d9fd767e1712e4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Feb 11 14:43:55 2012 +0000

    - rel 7 ; more build fixes
    
    Changed files:
        icedtea6-build.patch -> 1.1
        icedtea6.spec -> 1.80

 icedtea6-build.patch | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 icedtea6.spec        |  5 +++-
 2 files changed, 87 insertions(+), 1 deletion(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 9a7b5f2..81aa8f9 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -21,7 +21,7 @@ Summary:	OpenJDK and GNU Classpath code
 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
@@ -42,6 +42,7 @@ Patch3:		%{name}-rpath.patch
 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
@@ -415,6 +416,8 @@ cp "%{PATCH5}" pld-patches
 
 %patch6 -p1
 
+cp "%{PATCH7}" pld-patches
+
 # let the build system extract the sources where it wants them
 mkdir drops
 ln -s %{SOURCE1} .
diff --git a/icedtea6-build.patch b/icedtea6-build.patch
new file mode 100644
index 0000000..b98545b
--- /dev/null
+++ b/icedtea6-build.patch
@@ -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 */
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf