diff options
Diffstat (limited to 'java')
3 files changed, 29 insertions, 3 deletions
diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile index f59a0ef4239d..13cbd11ceaa5 100644 --- a/java/openjfx14/Makefile +++ b/java/openjfx14/Makefile @@ -1,6 +1,6 @@ PORTNAME= openjfx DISTVERSION= 14.0.2.1+1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= java x11-toolkits devel MASTER_SITES= https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.1/:core \ https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.1/:grouping \ @@ -23,8 +23,6 @@ WWW= https://openjdk.java.net/projects/openjfx/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= Fails to build with libxml2 2.13+, error: no matching constructor for initialization of 'XMLDocumentParserScope' - ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le BUILD_DEPENDS= zip:archivers/zip \ diff --git a/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessor.h b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessor.h new file mode 100644 index 000000000000..cc2e056db3e0 --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessor.h @@ -0,0 +1,14 @@ +--- modules/javafx.web/src/main/native/Source/WebCore/xml/XSLTProcessor.h.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/WebCore/xml/XSLTProcessor.h +@@ -62,7 +62,11 @@ class XSLTProcessor : public RefCounted<XSLTProcessor> + + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void parseErrorFunc(void* userData, const xmlError*); ++#else + static void parseErrorFunc(void* userData, xmlError*); ++#endif + static void genericErrorFunc(void* userData, const char* msg, ...); + + // Only for libXSLT callbacks diff --git a/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessorLibxslt.cpp b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessorLibxslt.cpp new file mode 100644 index 000000000000..d74934a317b2 --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WebCore_xml_XSLTProcessorLibxslt.cpp @@ -0,0 +1,14 @@ +--- modules/javafx.web/src/main/native/Source/WebCore/xml/XSLTProcessorLibxslt.cpp.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +@@ -60,7 +60,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char + // It would be nice to do something with this error message. + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error) ++#else + void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error) ++#endif + { + PageConsoleClient* console = static_cast<PageConsoleClient*>(userData); + if (!console) |