electron8: update to v8.1.1.

Chromium patches have been obtained from www/chromium r528250.

Author: tagattie

devel/electron8/Makefile

@@ -4,7 +4,7 @@ PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
 CATEGORIES=	devel java
-MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v8.0.3/:chromium \
+MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v8.1.1/:chromium \
 		https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
@@ -42,6 +42,7 @@ LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libdrm.so:graphics/libdrm \
+		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libopenh264.so:multimedia/openh264 \
@@ -68,9 +69,9 @@ GH_TUPLE=	nodejs:node:v${NODE_VER}:node \
 		# kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests
 
 # Official chromium version containing "gn" which is known to work
-CHROMIUM_OFFICIAL_VER=	80.0.3987.122
+CHROMIUM_OFFICIAL_VER=	80.0.3987.132
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER=	80.0.3987.134
+CHROMIUM_VER=	80.0.3987.141
 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
 CHROMIUM_NODE_MODULES_HASH=	a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c
 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
@@ -162,7 +163,7 @@ PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 POST_BUILD_TARGETS=	licenses version
 POST_BUILD_DIST_TARGETS=	electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip
 
-YARN_TIMESTAMP=	1583225313
+YARN_TIMESTAMP=	1583989772
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
 		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
@@ -228,8 +229,8 @@ post-extract:
 
 pre-patch:
 	${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
-	${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
-	${FIND} ${WRKSRC} -type f -name '*~' -print -delete
+	# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
+	# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
 
 pre-configure:
 	# cd ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} && \
@@ -242,8 +243,8 @@ pre-configure:
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
-		ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxslt \
-		openh264 opus snappy yasm || ${FALSE}
+		ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng \
+		libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files

devel/electron8/Makefile.version

@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-ELECTRON_VER=	8.0.3
+ELECTRON_VER=	8.1.1
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}

devel/electron8/distinfo

@@ -1,16 +1,16 @@
-TIMESTAMP = 1583226734
-SHA256 (electron/chromium-80.0.3987.134.tar.xz) = 53e75cba0c915a21a6e0bf42e712f9909d83d4baaec1b2d7d7a46979e152bfff
-SIZE (electron/chromium-80.0.3987.134.tar.xz) = 1402880060
-SHA256 (electron/chromium-80.0.3987.122.tar.xz) = 48ebcbdcc20fa5864f1b0f0bf8163f8801ed59f82d13744f0303b497db412473
-SIZE (electron/chromium-80.0.3987.122.tar.xz) = 801340492
+TIMESTAMP = 1583990380
+SHA256 (electron/chromium-80.0.3987.141.tar.xz) = 3282df70e4f805f354131e07d3fef8c31dcf28f9b0997af42b376736b897d5c0
+SIZE (electron/chromium-80.0.3987.141.tar.xz) = 1403988704
+SHA256 (electron/chromium-80.0.3987.132.tar.xz) = 2c0012059046a5a7e2bf6e9502f1898f1953226d63b724b82fc18226e285c201
+SIZE (electron/chromium-80.0.3987.132.tar.xz) = 796975056
 SHA256 (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = b8b23fa102ddea8b6b4b6b9161c76636fd48b37e6bcfe955e56bfe04e31ba13b
 SIZE (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = 8072260
 SHA256 (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 6e331676d098a57c53c1250821dc47ed84c47f823901bf30c4704df90d8a34be
 SIZE (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 17469927
-SHA256 (electron/electron-yarn-cache-8.0.3.tar.xz) = da659d02e4c4945a37a323b2a399b811f1d5a0898384652efa1a9b5cb901cd4e
-SIZE (electron/electron-yarn-cache-8.0.3.tar.xz) = 32374720
-SHA256 (electron/electron-electron-v8.0.3_GH0.tar.gz) = e3d015479e725a12ef7259f401b8d30b8d0fed74a211aba314b6a402a3117fa6
-SIZE (electron/electron-electron-v8.0.3_GH0.tar.gz) = 5423521
+SHA256 (electron/electron-yarn-cache-8.1.1.tar.xz) = 630ba4e166aa7d9045ad705f372600c327f2447b0de30b8795d20cd28c131405
+SIZE (electron/electron-yarn-cache-8.1.1.tar.xz) = 32374184
+SHA256 (electron/electron-electron-v8.1.1_GH0.tar.gz) = 6a4486ae4e88ea895f589dd87692e00d288f89cd56ed01d3acaacc414009b4c5
+SIZE (electron/electron-electron-v8.1.1_GH0.tar.gz) = 5426414
 SHA256 (electron/nodejs-node-v12.13.0_GH0.tar.gz) = 91518dc2506e33d3ac919ed781661082c620b888fa79c2483f4f902584d0e1d9
 SIZE (electron/nodejs-node-v12.13.0_GH0.tar.gz) = 72661495
 SHA256 (electron/nodejs-nan-2ee313aaca52e2b478965ac50eb5082520380d1b_GH0.tar.gz) = e6d0727f2f33d6c0fdbee3182543cb23679551dc15318cc8a2489901eabe9915

devel/electron8/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "8.0.3",
+  "version": "8.1.1",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

devel/electron8/files/patch-base_BUILD.gn

@@ -1,28 +1,6 @@
---- base/BUILD.gn.orig	2020-03-03 07:02:14 UTC
+--- base/BUILD.gn.orig	2020-03-11 11:34:46 UTC
 +++ base/BUILD.gn
-@@ -908,7 +908,7 @@ jumbo_component("base") {
-       "timer/hi_res_timer_manager_posix.cc",
-     ]
- 
--    if (!is_nacl && !is_mac && !is_ios) {
-+    if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
-       sources += [
-         "profiler/stack_copier_signal.cc",
-         "profiler/stack_copier_signal.h",
-@@ -917,6 +917,12 @@ jumbo_component("base") {
-         "profiler/thread_delegate_posix.h",
-       ]
-     }
-+
-+    if (is_bsd) {
-+      sources += [
-+        "profiler/stack_sampler_posix.cc",
-+      ]
-+    }
-   }
- 
-   if (is_win) {
-@@ -1302,7 +1308,7 @@ jumbo_component("base") {
+@@ -1302,7 +1302,7 @@ jumbo_component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -31,7 +9,7 @@
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
-@@ -1328,7 +1334,7 @@ jumbo_component("base") {
+@@ -1328,7 +1328,7 @@ jumbo_component("base") {
          "allocator/allocator_shim_override_glibc_weak_symbols.h",
        ]
        deps += [ "//base/allocator:tcmalloc" ]
@@ -40,7 +18,7 @@
        sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
      } else if (is_android && use_allocator == "none") {
        sources += [
-@@ -1919,6 +1925,33 @@ jumbo_component("base") {
+@@ -1919,6 +1919,33 @@ jumbo_component("base") {
      }
    }
 
@@ -74,16 +52,7 @@
    # iOS
    if (is_ios) {
      sources -= [
-@@ -2885,7 +2918,7 @@ test("base_unittests") {
-       "posix/unix_domain_socket_unittest.cc",
-       "task/thread_pool/task_tracker_posix_unittest.cc",
-     ]
--    if (!is_nacl && !is_mac && !is_ios) {
-+    if (!is_nacl && !is_mac && !is_ios && !is_bsd) {
-       sources += [ "profiler/stack_copier_signal_unittest.cc" ]
-     }
-   }
-@@ -3069,6 +3102,12 @@ test("base_unittests") {
+@@ -3069,6 +3096,12 @@ test("base_unittests") {
 
      manifest = "//build/config/fuchsia/tests.cmx"
    }

devel/electron8/files/patch-base_debug_elf__reader.cc

@@ -1,24 +1,14 @@
---- base/debug/elf_reader.cc.orig	2020-03-03 07:02:14 UTC
+--- base/debug/elf_reader.cc.orig	2020-03-11 11:34:46 UTC
 +++ base/debug/elf_reader.cc
-@@ -35,7 +35,9 @@ using Nhdr = Elf64_Nhdr;
- using Word = Elf64_Word;
- #endif
- 
-+#if !defined(OS_BSD)
- constexpr char kGnuNoteName[] = "GNU";
-+#endif
- 
- // Returns a pointer to the header of the ELF binary mapped into memory,
- // or a null pointer if the header is invalid.
-@@ -98,6 +100,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
      bool found = false;
      while (current_section < section_end) {
        current_note = reinterpret_cast<const Nhdr*>(current_section);
 +#if !defined(OS_BSD)
        if (current_note->n_type == NT_GNU_BUILD_ID) {
          StringPiece note_name(current_section + sizeof(Nhdr),
                                current_note->n_namesz);
-@@ -107,6 +110,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
            break;
          }
        }

devel/electron8/files/patch-base_memory_discardable__memory.cc

@@ -1,4 +1,4 @@
---- base/profiler/register_context.h.orig	2020-03-03 07:02:14 UTC
+--- base/profiler/register_context.h.orig	2020-03-11 11:34:46 UTC
 +++ base/profiler/register_context.h
 @@ -17,7 +17,7 @@
  #include <windows.h>
@@ -9,60 +9,52 @@
  #include <sys/ucontext.h>
  #endif
 
-@@ -136,6 +136,56 @@ inline uintptr_t& RegisterContextInstructionPointer(mc
+@@ -152,6 +152,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc
  }
 
- #else  // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
+ #endif  // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
 +
-+// Placeholders for other POSIX platforms that just return the first
-+// three register slots in the context.
++#elif defined(OS_FREEBSD)
++
++using RegisterContext = mcontext_t;
++
++#if defined(ARCH_CPU_X86_64)
 +inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
-+  return *reinterpret_cast<uintptr_t*>(context);
++  return AsUintPtr(&context->mc_rsp);
 +}
 +
 +inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
-+  return *(reinterpret_cast<uintptr_t*>(context) + 1);
++  return AsUintPtr(&context->mc_rbp);
 +}
 +
 +inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
-+  return *(reinterpret_cast<uintptr_t*>(context) + 2);
++  return AsUintPtr(&context->mc_rip);
 +}
-+
-+#endif  // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
-+
-+#elif defined(OS_BSD) // #if defined(OS_WIN)
-+
-+using RegisterContext = mcontext_t;
-+
-+#if defined(ARCH_CPU_ARM_FAMILY)
-+
++#elif defined(ARCH_CPU_X86)
 +inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
-+  return AsUintPtr(&context->__gregs[_REG_SP]);
++  return AsUintPtr(&context->mc_esp);
 +}
 +
 +inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
-+  return AsUintPtr(&context->__gregs[_REG_FP]);
++  return AsUintPtr(&context->mc_ebp);
 +}
 +
 +inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
-+  return AsUintPtr(&context->__gregs[_REG_PC]);
++  return AsUintPtr(&context->mc_eip);
 +}
-+
-+#elif defined(ARCH_CPU_X86_64)  // #if defined(ARCH_CPU_ARM_FAMILY)
-+
++#elif defined(ARCH_CPU_ARM64)
 +inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
-+  return AsUintPtr(&context->mc_rsp);
++  return AsUintPtr(&context->mc_gpregs.gp_sp);
 +}
 +
 +inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
-+  return AsUintPtr(&context->mc_rbp);
++  return AsUintPtr(&context->mc_gpregs.gp_x[29]);
 +}
 +
 +inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
-+  return AsUintPtr(&context->mc_rip);
++  return AsUintPtr(&context->mc_gpregs.gp_elr);
 +}
-+
-+#else  // #if defined(ARCH_CPU_ARM_FAMILY)
++#endif
+ 
+ #else  // #if defined(OS_WIN)
 
- // Placeholders for other POSIX platforms that just return the first
- // three register slots in the context.