[PATCH] firefox: fix some installed file conditions on non-Linux

To: tech-pkg%netbsd.org@localhost
Subject: [PATCH] firefox: fix some installed file conditions on non-Linux
From: Michael Forney <mforney%mforney.org@localhost>
Date: Wed, 26 Feb 2020 22:07:27 -0800
This likely fixes emoji and formautofill support on non-Linux
operating systems.

This is reported upstream here:
https://bugzilla.mozilla.org/show_bug.cgi?id=1618411

The patches are currently out for review here:
https://phabricator.services.mozilla.com/D64496

---
Only tested on Linux, but I'm fairly confident it won't break on
other platforms.

 www/firefox/Makefile                          |  5 ----
 www/firefox/PLIST                             |  5 ++--
 www/firefox/PLIST.Linux                       |  3 ---
 www/firefox/distinfo                          |  3 +++
 ...-browser_extensions_formautofill_moz.build | 27 +++++++++++++++++++
 .../patches/patch-browser_fonts_moz.build     | 15 +++++++++++
 .../patch-browser_themes_shared_jar.inc.mn    | 24 +++++++++++++++++
 7 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 www/firefox/patches/patch-browser_extensions_formautofill_moz.build
 create mode 100644 www/firefox/patches/patch-browser_fonts_moz.build
 create mode 100644 www/firefox/patches/patch-browser_themes_shared_jar.inc.mn

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 143d61c8112..a19f30c5bfb 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -67,11 +67,6 @@ MOZILLA_NAME=	Firefox
 MOZILLA_NAME=	Browser
 .endif
 
-PLIST_VARS+=	notlinux
-.if ${OPSYS} != "Linux"
-PLIST.notlinux=	yes
-.endif
-
 post-extract:
 	mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
 # XXX Hack taken from lang/rust.
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 78603577444..59adb43a206 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1133,7 +1133,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/history.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/home.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/illustrations/error-session-restore.svg
-${PLIST.notlinux}lib/firefox/browser/chrome/browser/skin/classic/browser/import-export.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/info.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/library-bookmark-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/library-pocket-animation.svg
@@ -1267,7 +1266,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars-right.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sign-out.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
-${PLIST.notlinux}lib/firefox/browser/chrome/browser/skin/classic/browser/sort.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/stop-to-reload.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/stop.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sync.svg
@@ -3949,9 +3947,11 @@ lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/ProfileAutoComp
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/addressmetadata/addressReferences.js
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/addressmetadata/addressReferencesExt.js
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/autocomplete-item-shared.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/autocomplete-item.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/editAddress.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/editCreditCard.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/editDialog-shared.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/editDialog.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/phonenumberutils/PhoneNumber.jsm
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/phonenumberutils/PhoneNumberMetaData.jsm
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/phonenumberutils/PhoneNumberNormalizer.jsm
@@ -5113,6 +5113,7 @@ lib/firefox/dictionaries/en-US.aff
 lib/firefox/dictionaries/en-US.dic
 lib/firefox/firefox
 lib/firefox/firefox-bin
+lib/firefox/fonts/TwemojiMozilla.ttf
 lib/firefox/gmp-clearkey/0.1/libclearkey.so
 lib/firefox/gmp-clearkey/0.1/manifest.json
 lib/firefox/greprefs.js
diff --git a/www/firefox/PLIST.Linux b/www/firefox/PLIST.Linux
index 7d8b666a402..41c6a811212 100644
--- a/www/firefox/PLIST.Linux
+++ b/www/firefox/PLIST.Linux
@@ -1,5 +1,2 @@
 @comment $NetBSD: PLIST.Linux,v 1.1 2020/02/26 20:55:43 maya Exp $
-lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/autocomplete-item.css
-lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/editDialog.css
-lib/firefox/fonts/TwemojiMozilla.ttf
 lib/firefox/libmozsandbox.so
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 76cd90bb35c..58b0847c586 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -6,6 +6,9 @@ SHA512 (firefox-73.0.1.source.tar.xz) = 89fac2c50e092f2805f48399f68cdf0793324e1d
 Size (firefox-73.0.1.source.tar.xz) = 326596084 bytes
 SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
 SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
+SHA1 (patch-browser_extensions_formautofill_moz.build) = c30b4df167b06aca812877c3aae1186608e1ea81
+SHA1 (patch-browser_fonts_moz.build) = 4e4bcbe1b0ccfafe6370851b3804b3b634b721b5
+SHA1 (patch-browser_themes_shared_jar.inc.mn) = e79779b905e7a891938af1aa9e9c875e10215c34
 SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
 SHA1 (patch-config__make_system_wrappers.py) = c17e03e6c0599f2d14de3688af8552c12bbc61ed
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
diff --git a/www/firefox/patches/patch-browser_extensions_formautofill_moz.build b/www/firefox/patches/patch-browser_extensions_formautofill_moz.build
new file mode 100644
index 00000000000..34ec4ccf420
--- /dev/null
+++ b/www/firefox/patches/patch-browser_extensions_formautofill_moz.build
@@ -0,0 +1,27 @@
+$NetBSD$
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1618411
+
+--- browser/extensions/formautofill/moz.build.orig	Mon Feb 17 19:20:51 2020
++++ browser/extensions/formautofill/moz.build
+@@ -16,17 +16,17 @@ FINAL_TARGET_FILES.features['formautofill%mozilla.org@localhost'
+   'schema.json',
+ ]
+ 
+-if CONFIG['OS_ARCH'] == 'Linux':
++if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'):
+     FINAL_TARGET_FILES.features['formautofill%mozilla.org@localhost'].chrome.res += [
+         'skin/linux/autocomplete-item.css',
+         'skin/linux/editDialog.css',
+     ]
+-elif CONFIG['OS_ARCH'] == 'Darwin':
++elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
+     FINAL_TARGET_FILES.features['formautofill%mozilla.org@localhost'].chrome.res += [
+         'skin/osx/autocomplete-item.css',
+         'skin/osx/editDialog.css',
+     ]
+-elif CONFIG['OS_ARCH'] == 'WINNT':
++elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+     FINAL_TARGET_FILES.features['formautofill%mozilla.org@localhost'].chrome.res += [
+         'skin/windows/autocomplete-item.css',
+         'skin/windows/editDialog.css',
diff --git a/www/firefox/patches/patch-browser_fonts_moz.build b/www/firefox/patches/patch-browser_fonts_moz.build
new file mode 100644
index 00000000000..53808660ec3
--- /dev/null
+++ b/www/firefox/patches/patch-browser_fonts_moz.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1618411
+
+--- browser/fonts/moz.build.orig	Mon Feb 17 19:20:51 2020
++++ browser/fonts/moz.build
+@@ -4,7 +4,7 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
++if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk'):
+     DIST_SUBDIR = ''
+     FINAL_TARGET_FILES.fonts += [
+         'TwemojiMozilla.ttf'
diff --git a/www/firefox/patches/patch-browser_themes_shared_jar.inc.mn b/www/firefox/patches/patch-browser_themes_shared_jar.inc.mn
new file mode 100644
index 00000000000..5a45a0b7723
--- /dev/null
+++ b/www/firefox/patches/patch-browser_themes_shared_jar.inc.mn
@@ -0,0 +1,24 @@
+$NetBSD$
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1618411
+
+--- browser/themes/shared/jar.inc.mn.orig	Mon Feb 17 19:20:51 2020
++++ browser/themes/shared/jar.inc.mn
+@@ -189,7 +189,7 @@
+   skin/classic/browser/fullscreen-exit.svg            (../shared/icons/fullscreen-exit.svg)
+   skin/classic/browser/history.svg                    (../shared/icons/history.svg)
+   skin/classic/browser/home.svg                       (../shared/icons/home.svg)
+-#ifndef XP_LINUX
++#ifndef MOZ_WIDGET_GTK
+   skin/classic/browser/import-export.svg              (../shared/icons/import-export.svg)
+ #endif
+   skin/classic/browser/library.svg                    (../shared/icons/library.svg)
+@@ -222,7 +222,7 @@
+   skin/classic/browser/sidebars.svg                   (../shared/icons/sidebars.svg)
+   skin/classic/browser/sidebars-right.svg             (../shared/icons/sidebars-right.svg)
+   skin/classic/browser/sign-out.svg                   (../shared/icons/sign-out.svg)
+-#ifndef XP_LINUX
++#ifndef MOZ_WIDGET_GTK
+   skin/classic/browser/sort.svg                       (../shared/icons/sort.svg)
+ #endif
+   skin/classic/browser/stop.svg                       (../shared/icons/stop.svg)
-- 
2.25.1
Follow-Ups:
- [PATCH v2] firefox: fix some installed file conditions on non-Linux platforms
  - From: Michael Forney
- Re: [PATCH] firefox: fix some installed file conditions on non-Linux
  - From: Ryo ONODERA
Prev by Date: [PATCH] python38: fix error when uuid.h is not available
Next by Date: daily pkgsrc CVS update output
Previous by Thread: [PATCH] python38: fix error when uuid.h is not available
Next by Thread: Re: [PATCH] firefox: fix some installed file conditions on non-Linux
Indexes:
Home | Main Index | Thread Index | Old Index