openjdk8-openjfx: fix assorted build issues and Linux ifdefs

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Fri Mar 4 03:41:49 2016 +0100
Changeset:	bc467d1a7b9d3633289f8efbb7cd651702965d2f

Modified Files:
	openjdk8-openjfx/Makefile
	openjdk8-openjfx/distinfo
	openjdk8-openjfx/patches/patch-build.gradle
	openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh
	openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh
Added Files:
	openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Java.cpp
	openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Platform.h
	openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp
	openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.h
	openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
	openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_main.cpp
	openjdk8-openjfx/patches/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h

Log Message:
openjdk8-openjfx: fix assorted build issues and Linux ifdefs

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bc467d1a7b9d3633289f8efbb7cd651702965d2f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openjdk8-openjfx/Makefile                          |  5 +++-
 openjdk8-openjfx/distinfo                          | 13 +++++++--
 openjdk8-openjfx/patches/patch-build.gradle        |  2 ++
 ...ackager_src_main_native_library_common_Java.cpp | 33 ++++++++++++++++++++++
 ...kager_src_main_native_library_common_Platform.h | 15 ++++++++++
 ...c_main_native_library_common_PlatformString.cpp | 15 ++++++++++
 ...src_main_native_library_common_PlatformString.h | 15 ++++++++++
 ...rc_main_native_library_common_PosixPlatform.cpp | 28 ++++++++++++++++++
 ...ackager_src_main_native_library_common_main.cpp | 15 ++++++++++
 ...phics_src_main_native-glass_gtk_glass__window.h | 15 ++++++++++
 ...s_web_src_main_native_Tools_ReducedFTL_build.sh |  2 ++
 ...c_main_native_Tools_ReducedFTL_processIRDump.sh |  2 ++
 12 files changed, 156 insertions(+), 4 deletions(-)

diffs:
diff --git a/openjdk8-openjfx/Makefile b/openjdk8-openjfx/Makefile
index b0b7c88..d6533c7 100644
--- a/openjdk8-openjfx/Makefile
+++ b/openjdk8-openjfx/Makefile
@@ -34,7 +34,10 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 .endif
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BASH} ../gradle-1.8/bin/gradle
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BASH} ../gradle-1.8/bin/gradle zips
+
+do-install:
+	false
 
 .include "../../wip/mk/hg-package.mk"
 .include "../../x11/libXtst/buildlink3.mk"
diff --git a/openjdk8-openjfx/distinfo b/openjdk8-openjfx/distinfo
index 1054a4e..b302609 100644
--- a/openjdk8-openjfx/distinfo
+++ b/openjdk8-openjfx/distinfo
@@ -4,6 +4,13 @@ SHA1 (gradle-1.8-bin.zip) = f14299582a1ab6c1293a43697ecda4b2673e34b1
 RMD160 (gradle-1.8-bin.zip) = 0f80d8a065633c2405317bea5a9225650acf0dd7
 SHA512 (gradle-1.8-bin.zip) = 2692f36626576a511e688ff42fc3381f8ecdf4fdf537939ab59de6c807eb17f4b4df722c4912e373ad3d9fe95be8516841ccb78a00111b5a7d38b848e632337b
 Size (gradle-1.8-bin.zip) = 39400269 bytes
-SHA1 (patch-build.gradle) = ee1decb109cd70a4b43c1b04b87f34b86a3121d3
-SHA1 (patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh) = f11170c34010b08ac1850d0259234d82050320da
-SHA1 (patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh) = 4378f27ffc7dd5a9ace9ef41812fe4a5c8488cb1
+SHA1 (patch-build.gradle) = 173c2784b9ae70c4163ae41781f914e8c7ff80fb
+SHA1 (patch-modules_fxpackager_src_main_native_library_common_Java.cpp) = c059a8756636d97fde7fe5f86a3371459ede2efe
+SHA1 (patch-modules_fxpackager_src_main_native_library_common_Platform.h) = 14a4c17d5208a77e509de91d6205d597ee51c6bb
+SHA1 (patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp) = fca32ee51041508aa12de630f5e1a377468c81d7
+SHA1 (patch-modules_fxpackager_src_main_native_library_common_PlatformString.h) = 1a71dece6fb4bc5f3fc3c75439565da9efc47160
+SHA1 (patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp) = 44aad76bbdb4a0869ff1004767b384cd23a2e979
+SHA1 (patch-modules_fxpackager_src_main_native_library_common_main.cpp) = 3208b6076e6f660fd445702748521a3596627381
+SHA1 (patch-modules_graphics_src_main_native-glass_gtk_glass__window.h) = 1a87943d8052a6b744aef0273b1087a267020e99
+SHA1 (patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh) = ce979da13de40a66d8070ad37106b4a3e2b1a6c7
+SHA1 (patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh) = 203822d82ee29177ad9cda0def4eee400b1c55db
diff --git a/openjdk8-openjfx/patches/patch-build.gradle b/openjdk8-openjfx/patches/patch-build.gradle
index d52c06b..ba70f55 100644
--- a/openjdk8-openjfx/patches/patch-build.gradle
+++ b/openjdk8-openjfx/patches/patch-build.gradle
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Pretend we are Linux for now.
+
 --- build.gradle.orig	2016-03-03 23:18:49.000000000 +0000
 +++ build.gradle
 @@ -250,7 +250,7 @@ ext.OS_ARCH = System.getProperty("os.arc
diff --git a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Java.cpp b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Java.cpp
new file mode 100644
index 0000000..6ce904b
--- /dev/null
+++ b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Java.cpp
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Cannot pass non-trivial type TString through variadic method Format.
+
+--- modules/fxpackager/src/main/native/library/common/Java.cpp.orig	2016-03-04 00:57:09.000000000 +0000
++++ modules/fxpackager/src/main/native/library/common/Java.cpp
+@@ -225,7 +225,7 @@ JavaClass::JavaClass(JNIEnv *Env, TStrin
+     if (FClass == NULL || FEnv->ExceptionCheck() == JNI_TRUE) {
+         Messages& messages = Messages::GetInstance();
+         TString message = messages.GetMessage(CLASS_NOT_FOUND);
+-        message = PlatformString::Format(message, FClassName.data());
++        message = PlatformString::Format(message.c_str(), FClassName.data());
+         throw JavaException(FEnv, message);
+     }
+ }
+@@ -244,7 +244,7 @@ JavaStaticMethod JavaClass::GetStaticMet
+     if (method == NULL || FEnv->ExceptionCheck() == JNI_TRUE) {
+         Messages& messages = Messages::GetInstance();
+         TString message = messages.GetMessage(METHOD_NOT_FOUND);
+-        message = PlatformString::Format(message, Name.data(), FClassName.data());
++        message = PlatformString::Format(message.c_str(), Name.data(), FClassName.data());
+         throw JavaException(FEnv, message);
+     }
+ 
+@@ -263,7 +263,7 @@ void JavaStringArray::Initialize(size_t 
+     if (FEnv->ExceptionCheck() == JNI_TRUE) {
+         Messages& messages = Messages::GetInstance();
+         TString message = messages.GetMessage(CLASS_NOT_FOUND);
+-        message = PlatformString::Format(message, _T("String"));
++        message = PlatformString::Format(message.c_str(), _T("String"));
+         throw JavaException(FEnv, message.data());
+     }
+ 
diff --git a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Platform.h b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Platform.h
new file mode 100644
index 0000000..37cbca7
--- /dev/null
+++ b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Platform.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Pretend we are Linux for now.
+
+--- modules/fxpackager/src/main/native/library/common/Platform.h.orig	2016-03-04 00:57:09.000000000 +0000
++++ modules/fxpackager/src/main/native/library/common/Platform.h
+@@ -55,7 +55,7 @@
+ #endif //__APPLE__
+ 
+ 
+-#ifdef __linux
++#if defined(__linux) || defined(__NetBSD__)
+ #define LINUX
+ #endif //__linux
+ 
diff --git a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp
new file mode 100644
index 0000000..a99bce2
--- /dev/null
+++ b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Cannot pass non-trivial type TString through variadic method Format.
+
+--- modules/fxpackager/src/main/native/library/common/PlatformString.cpp.orig	2016-03-04 00:57:09.000000000 +0000
++++ modules/fxpackager/src/main/native/library/common/PlatformString.cpp
+@@ -268,7 +268,7 @@ PlatformString::PlatformString(JNIEnv *e
+     }
+ }
+ 
+-TString PlatformString::Format(const TString value, ...) {
++TString PlatformString::Format(const char* value, ...) {
+ //std::string PlatformString::Format(std::string value, ...) {
+     TString result = value;
+ 
diff --git a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.h b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.h
new file mode 100644
index 0000000..37d46c7
--- /dev/null
+++ b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Cannot pass non-trivial type TString through variadic method Format.
+
+--- modules/fxpackager/src/main/native/library/common/PlatformString.h.orig	2016-03-04 00:57:09.000000000 +0000
++++ modules/fxpackager/src/main/native/library/common/PlatformString.h
+@@ -188,7 +188,7 @@ public:
+     PlatformString(JNIEnv *env, jstring value);
+     PlatformString(size_t Value);
+ 
+-    static TString Format(const TString value, ...);
++    static TString Format(const char* value, ...);
+ 
+     ~PlatformString(void);
+ 
diff --git a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
new file mode 100644
index 0000000..111f0dc
--- /dev/null
+++ b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Needs sys/wait.h for WIFEXITED.
+
+--- modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp.orig	2016-03-04 00:57:09.000000000 +0000
++++ modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+@@ -41,6 +41,7 @@
+ #include <assert.h>
+ #include <stdbool.h>
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ #include <sys/sysctl.h>
+ #include <iostream>
+@@ -231,9 +232,13 @@ bool PosixProcess::Wait() {
+     pid_t wpid;
+ 
+     //TODO Use waitpid instead of wait
++#if defined(__NetBSD__)
++    wpid = wait(&status);
++#else
+ #ifdef LINUX
+     wait();
+ #endif
++#endif
+ #ifdef MAC
+     wpid = wait(&status);
+ #endif
diff --git a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_main.cpp b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_main.cpp
new file mode 100644
index 0000000..288efe1
--- /dev/null
+++ b/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_main.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Cannot pass non-trivial type TString through variadic method Format.
+
+--- modules/fxpackager/src/main/native/library/common/main.cpp.orig	2016-03-04 00:57:09.000000000 +0000
++++ modules/fxpackager/src/main/native/library/common/main.cpp
+@@ -182,7 +182,7 @@ extern "C" {
+ 
+                             if (FilePath::FileExists(cacheFileName) == false) {
+                                 Messages& messages = Messages::GetInstance();
+-                                TString message = PlatformString::Format(messages.GetMessage(APPCDS_CACHE_FILE_NOT_FOUND), cacheFileName.data());
++                                TString message = PlatformString::Format(messages.GetMessage(APPCDS_CACHE_FILE_NOT_FOUND).c_str(), cacheFileName.data());
+                                 throw FileNotFoundException(message);
+                             }
+                             break;
diff --git a/openjdk8-openjfx/patches/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h b/openjdk8-openjfx/patches/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h
new file mode 100644
index 0000000..ad4edc8
--- /dev/null
+++ b/openjdk8-openjfx/patches/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+WindowContext is a class, not a struct.
+
+--- modules/graphics/src/main/native-glass/gtk/glass_window.h.orig	2016-03-04 00:57:09.000000000 +0000
++++ modules/graphics/src/main/native-glass/gtk/glass_window.h
+@@ -365,7 +365,7 @@ private:
+ class WindowContextTop: public WindowContextBase {
+     jlong screen;
+     WindowFrameType frame_type;
+-    struct WindowContext *owner;
++    WindowContext *owner;
+     WindowGeometry geometry;
+     int stale_config_notifications;
+     struct _Resizable{// we can't use set/get gtk_window_resizable function
diff --git a/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh b/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh
index d8cf9bf..930ba77 100644
--- a/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh
+++ b/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh
@@ -1,5 +1,7 @@
 $NetBSD$
 
+bashism
+
 --- modules/web/src/main/native/Tools/ReducedFTL/build.sh.orig	2016-03-03 23:18:49.000000000 +0000
 +++ modules/web/src/main/native/Tools/ReducedFTL/build.sh
 @@ -3,7 +3,7 @@
diff --git a/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh b/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh
index 11068ce..2644e26 100644
--- a/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh
+++ b/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh
@@ -1,5 +1,7 @@
 $NetBSD$
 
+bashism
+
 --- modules/web/src/main/native/Tools/ReducedFTL/processIRDump.sh.orig	2016-03-03 23:18:49.000000000 +0000
 +++ modules/web/src/main/native/Tools/ReducedFTL/processIRDump.sh
 @@ -3,7 +3,7 @@