Browse Source

add bug 1682030 bustage fix

Bill Gianopoulos 3 years ago
parent
commit
5398e1f744
2 changed files with 46 additions and 0 deletions
  1. 45 0
      comm-central/patches/1682030-packaging-suite.patch
  2. 1 0
      comm-central/patches/series

+ 45 - 0
comm-central/patches/1682030-packaging-suite.patch

@@ -0,0 +1,45 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1617790764 14400
+#      Wed Apr 07 06:19:24 2021 -0400
+Bug 1682030 - suite packaging adjustments for bug 1682030.
+
+diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
+--- a/suite/installer/package-manifest.in
++++ b/suite/installer/package-manifest.in
+@@ -83,17 +83,16 @@
+ #endif
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+ #else
+ @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
+ #endif
+ #ifdef XP_MACOSX
+ @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+-@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
+ #else
+ @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
+ #endif
+ ; ANGLE GLES-on-D3D rendering library
+ #ifdef MOZ_ANGLE_RENDERER
+ @BINPATH@/libEGL.dll
+ @BINPATH@/libGLESv2.dll
+ #ifdef MOZ_D3DCOMPILER_VISTA_DLL
+@@ -101,17 +100,16 @@
+ #endif
+ #endif # MOZ_ANGLE_RENDERER
+ 
+ #if defined(XP_WIN) && defined(MOZ_ENABLE_SKIA_PDF)
+ @BINPATH@/pdfium.dll
+ #endif
+ 
+ #ifdef XP_WIN
+-@BINPATH@/plugin-hang-ui@BIN_SUFFIX@
+ #if MOZ_PACKAGE_MSVC_DLLS
+ @BINPATH@/@MSVC_C_RUNTIME_DLL@
+ @BINPATH@/@MSVC_CXX_RUNTIME_DLL@
+ @BINPATH@/api-ms-win-*.dll
+ @BINPATH@/ucrtbase.dll
+ #endif
+ #endif
+ 

+ 1 - 0
comm-central/patches/series

@@ -6,3 +6,4 @@ TOP-1611647-1-rename-xul-suite.patch
 TOP-1611647-2-fix-xul-references-suite.patch
 WIP-1650630-2-port-1603712-suite.patch
 1650631-2-port-1240930-suite-followup.patch
+1682030-packaging-suite.patch