Browse Source

remove patch for bug 1659298

Bill Gianopoulos 3 years ago
parent
commit
39bdffb690

+ 0 - 32
mozilla-central/patches/1659298-extensions-moz-v1_1-mc.patch

@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Dmitry Butskoy <dmitry@butskoy.name>
-# Date 1608991044 0
-# Parent  67d5bc077f464d338544ad6f27c6ddca858fb286
-Bug 1659298 - Get rid of distribution extensions in favor of application global - mozilla patch. r=frg
-
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -887,19 +887,19 @@ endif
- 
- # See comment above about moving this out of the tools tier.
- ifdef INSTALL_EXTENSION_ID
- ifndef XPI_NAME
- $(error XPI_NAME must be set for INSTALL_EXTENSION_ID)
- endif
- 
- tools::
--	$(RM) -r '$(DIST)/bin/distribution$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)'
--	$(NSINSTALL) -D '$(DIST)/bin/distribution$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)'
--	$(call copy_dir,$(FINAL_TARGET),$(DIST)/bin/distribution$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID))
-+	$(RM) -r '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)'
-+	$(NSINSTALL) -D '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID)'
-+	$(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(INSTALL_EXTENSION_ID))
- 
- endif
- 
- #############################################################################
- # MDDEPDIR is the subdirectory where all the dependency files are placed.
- #   This uses a make rule (instead of a macro) to support parallel
- #   builds (-jN). If this were done in the LOOP_OVER_DIRS macro, two
- #   processes could simultaneously try to create the same directory.

+ 0 - 1
mozilla-central/patches/series

@@ -1,4 +1,3 @@
 1624546-vs2019-runtime-mc.patch
 1624546-vs2019-runtime-mc.patch
-1659298-extensions-moz-v1_1-mc.patch
 9999999-with-vs2019.patch
 9999999-with-vs2019.patch
 9999999-NSSgetentropy.patch
 9999999-NSSgetentropy.patch