diff -Nru openjfx-8u141-b14/debian/changelog openjfx-8u141-b14/debian/changelog
--- openjfx-8u141-b14/debian/changelog	2017-10-06 11:15:57.000000000 +0000
+++ openjfx-8u141-b14/debian/changelog	2018-05-29 22:38:05.000000000 +0000
@@ -1,3 +1,11 @@
+openjfx (8u141-b14-3+rpi1) buster-staging; urgency=medium
+
+  * Disable jit on sub-armv7 (armel/raspbian), it fails to build
+    there with assembler errors (Closes: 895469).
+  * Fix some uint16/char16 issues in javascriptcore.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 29 May 2018 22:38:05 +0000
+
 openjfx (8u141-b14-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru openjfx-8u141-b14/debian/patches/26-disable-webkit-jit-for-armv4.patch openjfx-8u141-b14/debian/patches/26-disable-webkit-jit-for-armv4.patch
--- openjfx-8u141-b14/debian/patches/26-disable-webkit-jit-for-armv4.patch	2017-10-06 09:57:07.000000000 +0000
+++ openjfx-8u141-b14/debian/patches/26-disable-webkit-jit-for-armv4.patch	2018-05-28 01:37:15.000000000 +0000
@@ -1,5 +1,7 @@
-Description: Disables the WebKit JIT on armel (fails to build)
+Description: Disables the WebKit JIT on armel and raspbian
+ (fails to build with armv7-only assembler)
 Author: Emmanuel Bourg <ebourg@apache.org>
+Author: Peter Michael Green <plugwash@debian.org>
 Forwarded: no
 --- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
 +++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
@@ -7,7 +9,7 @@
  #define ENABLE_JIT 1
  #endif
  
-+#if CPU(ARM) && WTF_ARM_ARCH_VERSION < 5
++#if CPU(ARM) && WTF_ARM_ARCH_VERSION < 7
 +#undef ENABLE_JIT
 +#define ENABLE_JIT 0
 +#endif
diff -Nru openjfx-8u141-b14/debian/patches/javascript-u16-vs-char16 openjfx-8u141-b14/debian/patches/javascript-u16-vs-char16
--- openjfx-8u141-b14/debian/patches/javascript-u16-vs-char16	1970-01-01 00:00:00.000000000 +0000
+++ openjfx-8u141-b14/debian/patches/javascript-u16-vs-char16	2018-05-29 22:38:05.000000000 +0000
@@ -0,0 +1,45 @@
+Description:  Fix some uint16/char16 issues in javascriptcore.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Last-Update: 2018-05-29
+
+--- openjfx-8u141-b14.orig/modules/web/src/main/native/Source/JavaScriptCore/API/JSStringRef.cpp
++++ openjfx-8u141-b14/modules/web/src/main/native/Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
+ JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return &OpaqueJSString::create(chars, numChars).leakRef();
++    return &OpaqueJSString::create((const UChar*)chars, numChars).leakRef();
+ }
+ 
+ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CStrin
+ JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
++    return OpaqueJSString::create(StringImpl::createWithoutCopying((const UChar*)chars, numChars)).leakRef();
+ }
+ 
+ JSStringRef JSStringRetain(JSStringRef string)
+@@ -87,7 +87,7 @@ const JSChar* JSStringGetCharactersPtr(J
+ {
+     if (!string)
+         return nullptr;
+-    return string->characters();
++    return (const JSChar*)(string->characters());
+ }
+ 
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
+--- openjfx-8u141-b14.orig/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
++++ openjfx-8u141-b14/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
+@@ -18,7 +18,7 @@
+ #if PLATFORM(JAVA) && OS(WINDOWS)
+ typedef wchar_t UChar;
+ #else
+-typedef uint16_t UChar;
++typedef char16_t UChar;
+ #endif
+ 
+ // #ifdef UChar32
diff -Nru openjfx-8u141-b14/debian/patches/series openjfx-8u141-b14/debian/patches/series
--- openjfx-8u141-b14/debian/patches/series	2017-10-06 10:06:40.000000000 +0000
+++ openjfx-8u141-b14/debian/patches/series	2018-05-29 22:38:05.000000000 +0000
@@ -21,3 +21,4 @@
 24-disable-buildSrc-tests.patch
 25-webkit-debug-level.patch
 26-disable-webkit-jit-for-armv4.patch
+javascript-u16-vs-char16