firefox: improve usize type confusion workaround.

cbindgen gets confused by netbsd's #define uintptr_t..., undef it
https://mail-index.netbsd.org/tech-pkg/2018/10/25/msg020395.html

4 files changed, 21 insertions, 29 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 86363b7bf23..09701a69c60 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.328 2018/11/04 04:46:57 ryoon Exp $
+$NetBSD: distinfo,v 1.329 2018/11/04 09:10:40 maya Exp $
 
 SHA1 (firefox-63.0.1.source.tar.xz) = d62a85ce78904171e9f863154fb8cd031cdbe4ee
 RMD160 (firefox-63.0.1.source.tar.xz) = 28f6431150deb10b967e4181ebfb5c332deedbd2
@@ -7,6 +7,7 @@ Size (firefox-63.0.1.source.tar.xz) = 265358784 bytes
 SHA1 (patch-aa) = 2df509e4c7478eb2a9d894b661ff62bca0e4c785
 SHA1 (patch-browser_app_profile_firefox.js) = 3ff1487607da5c7dc917fe9f793c6d281119974a
 SHA1 (patch-build_moz.configure_old.configure) = 91bab1cbbe02332ec076b49b6e598730202fbc99
+SHA1 (patch-dom_base_nsAttrName.h) = 89389af93bda7de9fd9a4b0fc6fa6505da390134
 SHA1 (patch-dom_media_CubebUtils.cpp) = ee3b7dca9f9486249b134262891d55dabe1a8f90
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 383f25417ad74f3ef8034437b52fc23f3bcbfc24
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
@@ -29,7 +30,6 @@ SHA1 (patch-media_libcubeb_update.sh) = cddb5849fa2972e961e4891bc8a79a650df06d8d
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
 SHA1 (patch-modules_pdfium_update.sh) = b0bf091325c9322c54880de067871354cd689038
 SHA1 (patch-servo_components_style_build__gecko.rs) = 1045b4e336c329d2673d096aeead83b6bc58ed13
-SHA1 (patch-servo_components_style_gecko_snapshot__helpers.rs) = fae6c2802a02750fe42b96227d794c26545d8741
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 082aa7830b33cb91c2606fb06059d544c70a7e62
 SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278
 SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 2f925047cde..c02acd93791 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.117 2018/11/04 00:38:44 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.118 2018/11/04 09:10:40 maya Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -117,19 +117,6 @@ SUBST_MESSAGE.prefix=		Setting PREFIX
 SUBST_FILES.prefix+=		${MOZILLA_DIR}xpcom/build/BinaryPath.h
 SUBST_VARS.prefix+=		PREFIX
 
-.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
-	(defined(ABI) && ${ABI} == "64")
-RUST_USIZE=	u64
-.else
-RUST_USIZE=	u32
-.endif
-
-SUBST_CLASSES+=			rust-usize
-SUBST_STAGE.rust-usize=		pre-configure
-SUBST_MESSAGE.rust-usize=	Workaround for usize type mismatch
-SUBST_FILES.rust-usize+=	${MOZILLA_DIR}servo/components/style/gecko/snapshot_helpers.rs
-SUBST_VARS.rust-usize+=		RUST_USIZE
-
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}js/src/build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
diff --git a/www/firefox/patches/patch-dom_base_nsAttrName.h b/www/firefox/patches/patch-dom_base_nsAttrName.h
new file mode 100644
index 00000000000..0020eb80863
--- /dev/null
+++ b/www/firefox/patches/patch-dom_base_nsAttrName.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-dom_base_nsAttrName.h,v 1.1 2018/11/04 09:10:40 maya Exp $
+
+cbindgen gets confused by NetBSD's types being macros too
+https://mail-index.netbsd.org/tech-pkg/2018/10/25/msg020395.html
+
+--- dom/base/nsAttrName.h.orig	2018-10-31 00:08:05.000000000 +0000
++++ dom/base/nsAttrName.h
+@@ -16,6 +16,10 @@
+ #include "mozilla/dom/NodeInfo.h"
+ #include "nsAtom.h"
+ #include "nsDOMString.h"
++#ifdef __NetBSD__
++/* This is also a macro which causes problems with cbindgen */
++#undef uintptr_t
++#endif
+ 
+ #define NS_ATTRNAME_NODEINFO_BIT 1
+ class nsAttrName
diff --git a/www/firefox/patches/patch-servo_components_style_gecko_snapshot__helpers.rs b/www/firefox/patches/patch-servo_components_style_gecko_snapshot__helpers.rs
deleted file mode 100644
index b3c1c46f700..00000000000
--- a/www/firefox/patches/patch-servo_components_style_gecko_snapshot__helpers.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-servo_components_style_gecko_snapshot__helpers.rs,v 1.1 2018/11/04 00:38:45 ryoon Exp $
-
---- servo/components/style/gecko/snapshot_helpers.rs.orig	2018-10-18 20:06:10.000000000 +0000
-+++ servo/components/style/gecko/snapshot_helpers.rs
-@@ -60,7 +60,7 @@ pub fn find_attr<'a>(
-     name: &Atom,
- ) -> Option<&'a structs::nsAttrValue> {
-     attrs.iter()
--        .find(|attr| attr.mName.mBits == name.as_ptr() as usize)
-+        .find(|attr| attr.mName.mBits == name.as_ptr() as @RUST_USIZE@)
-         .map(|attr| &attr.mValue)
- }
-