Merge remote-tracking branch 'upstream/master' into buildfix

Author: NicoHood

app/build.xml

@@ -112,6 +112,8 @@
       <classpath>
         <pathelement location="bin"/>
         <pathelement location="test-bin"/>
+        <pathelement location="${work.dir}/lib/jna-4.2.2.jar"/>
+        <pathelement location="${work.dir}/lib/jna-platform-4.2.2.jar"/>
         <path refid="class.path.test"/>
       </classpath>
 

app/lib/jna-4.1.0.jar

@@ -221,6 +221,7 @@ private JTextPane makeNewDescription() {
       StyleSheet s = html.getStyleSheet();
       s.addRule("body { margin: 0; padding: 0;"
                 + "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;"
+                + "color: black;"
                 + "font-size: " + 10 * Theme.getScale() / 100 + "; }");
     }
     description.setOpaque(false);

app/lib/jna-platform-4.1.0.jar

@@ -51,8 +51,12 @@ public class SplashScreenHelper {
 
   public SplashScreenHelper(SplashScreen splash) {
     this.splash = splash;
-    Toolkit tk = Toolkit.getDefaultToolkit();
-    desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
+    if (splash != null) {
+      Toolkit tk = Toolkit.getDefaultToolkit();
+      desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
+    } else {
+      desktopHints = null;
+    }
   }
 
   public void splashText(String text) {