pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openjdk8-openjfx: Rename to openjdk8-openjfx-hg
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Sep 30 00:09:31 2016 +0200
Changeset: 070ecab7d9da62ec2283a29084b6dc0d30849403
Modified Files:
Makefile
Added Files:
openjdk8-openjfx-hg/DESCR
openjdk8-openjfx-hg/Makefile
openjdk8-openjfx-hg/PLIST
openjdk8-openjfx-hg/TODO
openjdk8-openjfx-hg/distinfo
openjdk8-openjfx-hg/patches/patch-build.gradle
openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_Java.cpp
openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_Platform.h
openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp
openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.h
openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_main.cpp
openjdk8-openjfx-hg/patches/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h
openjdk8-openjfx-hg/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh
openjdk8-openjfx-hg/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh
Removed Files:
openjdk8-openjfx/DESCR
openjdk8-openjfx/Makefile
openjdk8-openjfx/PLIST
openjdk8-openjfx/TODO
openjdk8-openjfx/distinfo
openjdk8-openjfx/patches/patch-build.gradle
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
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
Log Message:
openjdk8-openjfx: Rename to openjdk8-openjfx-hg
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=070ecab7d9da62ec2283a29084b6dc0d30849403
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
openjdk8-openjfx-hg/DESCR | 2 +
openjdk8-openjfx-hg/Makefile | 46 ++++++++++++++++++++++
openjdk8-openjfx-hg/PLIST | 1 +
openjdk8-openjfx-hg/TODO | 2 +
openjdk8-openjfx-hg/distinfo | 16 ++++++++
openjdk8-openjfx-hg/patches/patch-build.gradle | 15 +++++++
...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 | 15 +++++++
...c_main_native_Tools_ReducedFTL_processIRDump.sh | 15 +++++++
openjdk8-openjfx/DESCR | 2 -
openjdk8-openjfx/Makefile | 46 ----------------------
openjdk8-openjfx/PLIST | 1 -
openjdk8-openjfx/TODO | 2 -
openjdk8-openjfx/distinfo | 16 --------
openjdk8-openjfx/patches/patch-build.gradle | 15 -------
...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 | 15 -------
...c_main_native_Tools_ReducedFTL_processIRDump.sh | 15 -------
31 files changed, 249 insertions(+), 249 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index a80bc5b..3a23c42 100644
--- a/Makefile
+++ b/Makefile
@@ -2080,7 +2080,7 @@ SUBDIR+= opendylan
SUBDIR+= openerp-server
SUBDIR+= openfodder
SUBDIR+= openh264
-SUBDIR+= openjdk8-openjfx
+SUBDIR+= openjdk8-openjfx-hg
SUBDIR+= openlogos
SUBDIR+= openmpi
SUBDIR+= openmpi163
diff --git a/openjdk8-openjfx-hg/DESCR b/openjdk8-openjfx-hg/DESCR
new file mode 100644
index 0000000..de46da8
--- /dev/null
+++ b/openjdk8-openjfx-hg/DESCR
@@ -0,0 +1,2 @@
+OpenJFX is an open source, next generation client application platform for
+desktop and embedded systems based on JavaSE.
diff --git a/openjdk8-openjfx-hg/Makefile b/openjdk8-openjfx-hg/Makefile
new file mode 100644
index 0000000..d6533c7
--- /dev/null
+++ b/openjdk8-openjfx-hg/Makefile
@@ -0,0 +1,46 @@
+# $NetBSD$
+
+DISTNAME= # hg package, intentionally left blank
+PKGNAME= openjdk8-openjfx-0
+CATEGORIES= x11
+MASTER_SITES= # hg package, intentionally left blank
+
+MAINTAINER= tnn%NetBSD.org@localhost
+HOMEPAGE= http://wiki.openjdk.java.net/display/OpenJFX/Main
+COMMENT= JavaFX application toolkit
+#LICENSE= GPL2 + classpath exception
+
+#DISTFILES= ${DEFAULT_DISTFILES}
+#EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+
+GRADLE_ZIP= gradle-1.8-bin.zip
+SITES.${GRADLE_ZIP}= https://services.gradle.org/distributions/
+DISTFILES+= ${GRADLE_ZIP}
+EXTRACT_ONLY+= ${GRADLE_ZIP}
+
+HG_REPOSITORIES= rt
+HG_REPO.rt= http://hg.openjdk.java.net/openjfx/8u-dev/rt
+WRKSRC= ${WRKDIR}/rt
+
+USE_LANGUAGES= c c++
+USE_TOOLS+= bash pkg-config
+
+MAKE_ENV+= JAVA_HOME=${PREFIX}/java/openjdk8
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
+BUILDLINK_TRANSFORM+= rm:-ldl
+.endif
+
+do-build:
+ 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"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../lang/openjdk8/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/openjdk8-openjfx-hg/PLIST b/openjdk8-openjfx-hg/PLIST
new file mode 100644
index 0000000..48d96a5
--- /dev/null
+++ b/openjdk8-openjfx-hg/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD$
diff --git a/openjdk8-openjfx-hg/TODO b/openjdk8-openjfx-hg/TODO
new file mode 100644
index 0000000..d2a65ad
--- /dev/null
+++ b/openjdk8-openjfx-hg/TODO
@@ -0,0 +1,2 @@
+- don't download maven crap in the build phase
+- fix linux specific things
diff --git a/openjdk8-openjfx-hg/distinfo b/openjdk8-openjfx-hg/distinfo
new file mode 100644
index 0000000..b302609
--- /dev/null
+++ b/openjdk8-openjfx-hg/distinfo
@@ -0,0 +1,16 @@
+$NetBSD$
+
+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) = 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-hg/patches/patch-build.gradle b/openjdk8-openjfx-hg/patches/patch-build.gradle
new file mode 100644
index 0000000..ba70f55
--- /dev/null
+++ b/openjdk8-openjfx-hg/patches/patch-build.gradle
@@ -0,0 +1,15 @@
+$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
+ ext.IS_64 = OS_ARCH.toLowerCase().contains("64")
+ ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin")
+ ext.IS_WINDOWS = OS_NAME.contains("windows")
+-ext.IS_LINUX = OS_NAME.contains("linux")
++ext.IS_LINUX = OS_NAME.contains("linux") || OS_NAME.contains("bsd")
+
+ // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
+ // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, and/or JAVAH, all of which may be specified
diff --git a/openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_Java.cpp b/openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_Java.cpp
new file mode 100644
index 0000000..6ce904b
--- /dev/null
+++ b/openjdk8-openjfx-hg/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-hg/patches/patch-modules_fxpackager_src_main_native_library_common_Platform.h b/openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_Platform.h
new file mode 100644
index 0000000..37cbca7
--- /dev/null
+++ b/openjdk8-openjfx-hg/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-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp b/openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp
new file mode 100644
index 0000000..a99bce2
--- /dev/null
+++ b/openjdk8-openjfx-hg/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-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.h b/openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.h
new file mode 100644
index 0000000..37d46c7
--- /dev/null
+++ b/openjdk8-openjfx-hg/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-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp b/openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
new file mode 100644
index 0000000..111f0dc
--- /dev/null
+++ b/openjdk8-openjfx-hg/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-hg/patches/patch-modules_fxpackager_src_main_native_library_common_main.cpp b/openjdk8-openjfx-hg/patches/patch-modules_fxpackager_src_main_native_library_common_main.cpp
new file mode 100644
index 0000000..288efe1
--- /dev/null
+++ b/openjdk8-openjfx-hg/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-hg/patches/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h b/openjdk8-openjfx-hg/patches/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h
new file mode 100644
index 0000000..ad4edc8
--- /dev/null
+++ b/openjdk8-openjfx-hg/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-hg/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh b/openjdk8-openjfx-hg/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh
new file mode 100644
index 0000000..930ba77
--- /dev/null
+++ b/openjdk8-openjfx-hg/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh
@@ -0,0 +1,15 @@
+$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 @@
+ set -e
+ set -x
+
+-if test "x${LLVM_PATH}" == "x"
++if test "x${LLVM_PATH}" = "x"
+ then
+ configPath="llvm-config"
+ else
diff --git a/openjdk8-openjfx-hg/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh b/openjdk8-openjfx-hg/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh
new file mode 100644
index 0000000..2644e26
--- /dev/null
+++ b/openjdk8-openjfx-hg/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh
@@ -0,0 +1,15 @@
+$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 @@
+ set -e
+ set -x
+
+-if test "x${LLVM_PATH}" == "x"
++if test "x${LLVM_PATH}" = "x"
+ then
+ path=
+ else
diff --git a/openjdk8-openjfx/DESCR b/openjdk8-openjfx/DESCR
deleted file mode 100644
index de46da8..0000000
--- a/openjdk8-openjfx/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-OpenJFX is an open source, next generation client application platform for
-desktop and embedded systems based on JavaSE.
diff --git a/openjdk8-openjfx/Makefile b/openjdk8-openjfx/Makefile
deleted file mode 100644
index d6533c7..0000000
--- a/openjdk8-openjfx/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD$
-
-DISTNAME= # hg package, intentionally left blank
-PKGNAME= openjdk8-openjfx-0
-CATEGORIES= x11
-MASTER_SITES= # hg package, intentionally left blank
-
-MAINTAINER= tnn%NetBSD.org@localhost
-HOMEPAGE= http://wiki.openjdk.java.net/display/OpenJFX/Main
-COMMENT= JavaFX application toolkit
-#LICENSE= GPL2 + classpath exception
-
-#DISTFILES= ${DEFAULT_DISTFILES}
-#EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-GRADLE_ZIP= gradle-1.8-bin.zip
-SITES.${GRADLE_ZIP}= https://services.gradle.org/distributions/
-DISTFILES+= ${GRADLE_ZIP}
-EXTRACT_ONLY+= ${GRADLE_ZIP}
-
-HG_REPOSITORIES= rt
-HG_REPO.rt= http://hg.openjdk.java.net/openjfx/8u-dev/rt
-WRKSRC= ${WRKDIR}/rt
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= bash pkg-config
-
-MAKE_ENV+= JAVA_HOME=${PREFIX}/java/openjdk8
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
-BUILDLINK_TRANSFORM+= rm:-ldl
-.endif
-
-do-build:
- 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"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../lang/openjdk8/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/openjdk8-openjfx/PLIST b/openjdk8-openjfx/PLIST
deleted file mode 100644
index 48d96a5..0000000
--- a/openjdk8-openjfx/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD$
diff --git a/openjdk8-openjfx/TODO b/openjdk8-openjfx/TODO
deleted file mode 100644
index d2a65ad..0000000
--- a/openjdk8-openjfx/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- don't download maven crap in the build phase
-- fix linux specific things
diff --git a/openjdk8-openjfx/distinfo b/openjdk8-openjfx/distinfo
deleted file mode 100644
index b302609..0000000
--- a/openjdk8-openjfx/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-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) = 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
deleted file mode 100644
index ba70f55..0000000
--- a/openjdk8-openjfx/patches/patch-build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
- ext.IS_64 = OS_ARCH.toLowerCase().contains("64")
- ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin")
- ext.IS_WINDOWS = OS_NAME.contains("windows")
--ext.IS_LINUX = OS_NAME.contains("linux")
-+ext.IS_LINUX = OS_NAME.contains("linux") || OS_NAME.contains("bsd")
-
- // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
- // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, and/or JAVAH, all of which may be specified
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
deleted file mode 100644
index 6ce904b..0000000
--- a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Java.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-$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
deleted file mode 100644
index 37cbca7..0000000
--- a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_Platform.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index a99bce2..0000000
--- a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 37d46c7..0000000
--- a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PlatformString.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 111f0dc..0000000
--- a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$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
deleted file mode 100644
index 288efe1..0000000
--- a/openjdk8-openjfx/patches/patch-modules_fxpackager_src_main_native_library_common_main.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index ad4edc8..0000000
--- a/openjdk8-openjfx/patches/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 930ba77..0000000
--- a/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 @@
- set -e
- set -x
-
--if test "x${LLVM_PATH}" == "x"
-+if test "x${LLVM_PATH}" = "x"
- then
- configPath="llvm-config"
- else
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
deleted file mode 100644
index 2644e26..0000000
--- a/openjdk8-openjfx/patches/patch-modules_web_src_main_native_Tools_ReducedFTL_processIRDump.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 @@
- set -e
- set -x
-
--if test "x${LLVM_PATH}" == "x"
-+if test "x${LLVM_PATH}" = "x"
- then
- path=
- else
Home |
Main Index |
Thread Index |
Old Index