sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

java/openjfx8-devel: Update to 8u172-b11

Browse source
This commit is contained in:
Tobias Kortkamp 2018-04-21 18:51:13 +00:00
parent 41569c17f1
commit f95f2ae918
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=467902
6 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
java/openjfx8-devel/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= openjfx8 PORTNAME= openjfx8
DISTVERSION= 8u172-b03 DISTVERSION= 8u172-b11
PORTREVISION= 1
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= java x11-toolkits devel CATEGORIES= java x11-toolkits devel
MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \ MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \
@ -102,10 +101,9 @@ post-patch:
# Pull Java dependencies from LOCALBASE # Pull Java dependencies from LOCALBASE
@${REINPLACE_CMD} 's@/usr/local@${LOCALBASE}@g' \ @${REINPLACE_CMD} 's@/usr/local@${LOCALBASE}@g' \
${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
# Remove the bundled libicu and libsqlite3. We use the system's # Remove bundled libraries. We use the system's versions instead.
# versions instead. @cd ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty && \
@${RM} -r ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty/icu \ ${RM} -r icu libxml libxslt sqlite
${WRKSRC}/modules/web/src/main/native/Source/ThirdParty/sqlite
post-patch-SWT-off: post-patch-SWT-off:
@${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt @${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt

6
java/openjfx8-devel/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1517218697 TIMESTAMP = 1524062144
SHA256 (openjfx8-8u172-b03.tar.gz) = 1648bcce3a9f3ee9ac4353f0b3fb896818a3a89440497d0bb8853d22dddf132d SHA256 (openjfx8-8u172-b11.tar.gz) = 2e88966dadaa93d172a67b6bd6e9f32002ac41e5c4eabf625c143c53f4ed6391
SIZE (openjfx8-8u172-b03.tar.gz) = 107849167 SIZE (openjfx8-8u172-b11.tar.gz) = 107629343

12
java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_PlatformJava.cmake
View file

@ -1,10 +1,8 @@
--- modules/web/src/main/native/Source/PlatformJava.cmake.orig 2017-09-08 16:56:55 UTC --- modules/web/src/main/native/Source/PlatformJava.cmake.orig 2018-03-23 23:53:57 UTC
+++ modules/web/src/main/native/Source/PlatformJava.cmake +++ modules/web/src/main/native/Source/PlatformJava.cmake
@@ -1,5 +1,5 @@ @@ -1,4 +1 @@
-add_subdirectory(ThirdParty/sqlite) -add_subdirectory(ThirdParty/sqlite)
-add_subdirectory(ThirdParty/icu) -add_subdirectory(ThirdParty/icu)
+# add_subdirectory(ThirdParty/sqlite) -add_subdirectory(ThirdParty/libxml)
+# add_subdirectory(ThirdParty/icu) -add_subdirectory(ThirdParty/libxslt)
+
# libxml2 should be compiled only on windows
if (WIN32)

10
java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_CMakeLists.txt Normal file
View file

@ -0,0 +1,10 @@
--- modules/web/src/main/native/Source/WebCore/CMakeLists.txt.orig 2018-03-23 23:53:57 UTC
+++ modules/web/src/main/native/Source/WebCore/CMakeLists.txt
@@ -131,6 +131,7 @@ set(WebCore_INCLUDE_DIRECTORIES
set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
${ICU_INCLUDE_DIRS}
+ ${CMAKE_INSTALL_PREFIX}/include/libxml2
)
set(WebCore_IDL_INCLUDES

15
java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_PlatformJava.cmake
View file

@ -1,6 +1,17 @@
--- modules/web/src/main/native/Source/WebCore/PlatformJava.cmake.orig 2018-01-16 01:40:56 UTC --- modules/web/src/main/native/Source/WebCore/PlatformJava.cmake.orig 2018-03-23 23:53:57 UTC
+++ modules/web/src/main/native/Source/WebCore/PlatformJava.cmake +++ modules/web/src/main/native/Source/WebCore/PlatformJava.cmake
@@ -242,7 +242,7 @@ set(WebCore_FORWARDING_HEADERS_FILES @@ -188,8 +188,8 @@ elseif (APPLE)
endif ()
list(APPEND WebCore_LIBRARIES
- XMLJava
- XSLTJava
+ ${CMAKE_INSTALL_PREFIX}/lib/libxml2.so
+ ${CMAKE_INSTALL_PREFIX}/lib/libxslt.so
)
list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
@@ -225,7 +225,7 @@ set(WebCore_FORWARDING_HEADERS_FILES
set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/java/RenderThemeJava.cpp) set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/java/RenderThemeJava.cpp)
list(APPEND WebCore_LIBRARIES list(APPEND WebCore_LIBRARIES

13
java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake
View file

@ -1,6 +1,6 @@
--- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig 2018-01-16 01:40:56 UTC --- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig 2018-03-23 23:53:57 UTC
+++ modules/web/src/main/native/Source/cmake/OptionsJava.cmake +++ modules/web/src/main/native/Source/cmake/OptionsJava.cmake
@@ -52,9 +52,9 @@ elseif (APPLE) @@ -49,9 +49,9 @@ elseif (APPLE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
elseif (UNIX) elseif (UNIX)
#### ICU #### #### ICU ####
@ -12,8 +12,8 @@
+ set(ICU_JAVA_DATA_LIB ${CMAKE_INSTALL_PREFIX}/lib/libicudata.so) + set(ICU_JAVA_DATA_LIB ${CMAKE_INSTALL_PREFIX}/lib/libicudata.so)
#### ICU-END #### #### ICU-END ####
find_package(LibXml2 2.7.0 REQUIRED) set(CMAKE_SKIP_RPATH TRUE)
@@ -191,8 +191,9 @@ if (CMAKE_MAJOR_VERSION LESS 3) @@ -60,11 +60,12 @@ else ()
endif () endif ()
set(ICU_INCLUDE_DIRS set(ICU_INCLUDE_DIRS
@ -21,6 +21,9 @@
"${THIRDPARTY_DIR}/icu/source/common" "${THIRDPARTY_DIR}/icu/source/common"
"${THIRDPARTY_DIR}/icu/source/i18n" "${THIRDPARTY_DIR}/icu/source/i18n"
) )
set(ICU_LIBRARIES ${ICU_JAVA_COMMON_LIB} ${ICU_JAVA_DATA_LIB})
- -
+set(ICU_LIBRARIES ${ICU_JAVA_COMMON_LIB} ${ICU_JAVA_DATA_LIB}) +set(ICU_LIBRARIES ${ICU_JAVA_COMMON_LIB} ${ICU_JAVA_DATA_LIB})
find_package(JNI REQUIRED)
find_package(Threads REQUIRED)