From 62a46687d6788c34e417e9f70626a684b705656c Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 21 Feb 2020 12:12:47 +0000
Subject: [PATCH 1/4] [gfx] Put Skia-specific CTOR init behind
 Skia-conditional.

---
 gfx/2d/ScaledFontDWrite.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gfx/2d/ScaledFontDWrite.cpp b/gfx/2d/ScaledFontDWrite.cpp
index dc8e586f56..cf173f8497 100644
--- a/gfx/2d/ScaledFontDWrite.cpp
+++ b/gfx/2d/ScaledFontDWrite.cpp
@@ -110,10 +110,12 @@ ScaledFontDWrite::ScaledFontDWrite(IDWriteFontFace *aFontFace, Float aSize,
     , mUseEmbeddedBitmap(aUseEmbeddedBitmap)
     , mForceGDIMode(aForceGDIMode)
 {
+#ifdef USE_SKIA
   mStyle = SkFontStyle(aStyle->weight,
                        DWriteFontStretchFromStretch(aStyle->stretch),
                        aStyle->style == NS_FONT_STYLE_NORMAL ?
                        SkFontStyle::kUpright_Slant : SkFontStyle::kItalic_Slant);
+#endif
 }
 
 already_AddRefed<Path>

From 33ac2fa2192d967f7d088cdbb2a15f90ab32fa7e Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 21 Feb 2020 12:21:10 +0000
Subject: [PATCH 2/4] Remove gtest reference to non-existing path of removed
 component

---
 testing/gtest/moz.build | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/testing/gtest/moz.build b/testing/gtest/moz.build
index d409023ec2..f824cde88f 100644
--- a/testing/gtest/moz.build
+++ b/testing/gtest/moz.build
@@ -77,9 +77,4 @@ if CONFIG['ENABLE_TESTS']:
         'gtest/include',
     ]
 
-    if CONFIG['OS_ARCH'] == 'WINNT':
-        LOCAL_INCLUDES += [
-            '/security/sandbox/chromium',
-        ]    
-    
     FINAL_LIBRARY = 'xul-gtest'

From 86930daef4ebd99661b21540b60ce09aa4848de7 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 21 Feb 2020 18:50:28 +0100
Subject: [PATCH 3/4] Set module default identification properly.

---
 config/version_win.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/version_win.pl b/config/version_win.pl
index 47c7dfe30e..26c3fea9ed 100644
--- a/config/version_win.pl
+++ b/config/version_win.pl
@@ -93,7 +93,7 @@ if (!defined($official)) {$official="";}
 if (!defined($milestone)) {$milestone="";}
 if (!defined($module)) {$module="";}
 if (!defined($binary)) {$binary="";}
-if (!defined($displayname)) {$displayname="Mozilla";}
+if (!defined($displayname)) {$displayname="UXP";}
 if (!defined($appversion)) {$appversion=$milestone;}
 if (!defined($depth)) {$depth=".";}
 if (!defined($rcinclude)) {$rcinclude="";}
@@ -234,10 +234,10 @@ for ($j = 1; $j < 4; $j++)
 }
 my $winappversion = "$appver[0],$appver[1],$appver[2],$appver[3]";
 
-my $copyright = "License: MPL 2";
-my $company = "Mozilla Foundation";
-my $trademarks = "Mozilla";
-my $productname = $displayname;
+my $copyright = "License: MPL 2.0";
+my $company = "Moonchild Productions";
+my $trademarks = "Moonchild";
+my $productname = "UXP";
 
 
 if (defined($override_comment)){$override_comment =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $comment=$override_comment;}

From 28e0b0cd577c4c1bd1d888d0d122b9404000a0aa Mon Sep 17 00:00:00 2001
From: Pale Moon <git-repo@palemoon.org>
Date: Fri, 21 Feb 2020 18:53:31 +0100
Subject: [PATCH 4/4] [Pale-Moon] Minor corrections in module info

---
 application/palemoon/app/module.ver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/palemoon/app/module.ver b/application/palemoon/app/module.ver
index 7a00230cf9..66d703a174 100644
--- a/application/palemoon/app/module.ver
+++ b/application/palemoon/app/module.ver
@@ -2,7 +2,7 @@ WIN32_MODULE_COMPANYNAME=Moonchild Productions
 WIN32_MODULE_COPYRIGHT=ŠPale Moon, Firefox and Mozilla Developers, available under the MPL 2.0.
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
-WIN32_MODULE_TRADEMARKS=The Pale Moon logo and project names are the property of Moonchild Productions.
+WIN32_MODULE_TRADEMARKS=The Pale Moon logo and project names are trademarks of Moonchild Productions.
 WIN32_MODULE_DESCRIPTION=Pale Moon web browser
 WIN32_MODULE_PRODUCTNAME=Pale Moon
 WIN32_MODULE_NAME=Pale Moon