#6 93.0
Closed 2 years ago by billauger. Opened 2 years ago by grizzlyuser.

file modified
+1 -1
@@ -3,7 +3,7 @@ 

  set -eu

  

  pkgname=iceweasel

- brandingver=87.0

+ brandingver=93.0

  brandingrel=1

  

  srcdir=src

@@ -8,10 +8,6 @@ 

  

  include $(DEPTH)/config/autoconf.mk

  

- UNOFFICIAL_BRANDING_FILES = \

- 	identity-icons-brand.svg \

- 	$(NULL)

- 

  misc:: about-logo.png about-logo@2x.png about-wordmark.svg firefox-wordmark.svg about.png icon16.png icon48.png icon64.png $(UNOFFICIAL_BRANDING_FILES)

  GARBAGE += $(CHROME_DEPS)

  
@@ -41,6 +37,3 @@ 

  

  ../%.png:

  	$(MAKE) -C .. $(notdir $@)

- 

- $(UNOFFICIAL_BRANDING_FILES): %: $(topsrcdir)/browser/branding/unofficial/content/%

- 	cp -f $^ $@

@@ -14,13 +14,13 @@ 

   #else

     pref("urlclassifier.phishTable", "googpub-phish-proto,moztest-phish-simple");

  diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build

- index d3eb77d9b6..aea8056cef 100644

+ index d9c9384e97..ef67ae371e 100644

  --- a/modules/libpref/moz.build

  +++ b/modules/libpref/moz.build

- @@ -171,3 +171,6 @@ else:

-  

-  if CONFIG["MOZ_BACKGROUNDTASKS"]:

+ @@ -174,3 +174,6 @@ if CONFIG["MOZ_BACKGROUNDTASKS"]:

       DEFINES["MOZ_BACKGROUNDTASKS"] = True

+  

+  REQUIRES_UNIFIED_BUILD = True

  +

  +if CONFIG['MOZ_OFFICIAL_BRANDING']:

  +    DEFINES['MOZ_OFFICIAL_BRANDING'] = True

@@ -3,9 +3,9 @@ 

  --- a/browser/installer/package-manifest.in

  +++ b/browser/installer/package-manifest.in

  @@ -249,13 +249,6 @@

+  @RESPATH@/chrome/pdfjs/*

+  @RESPATH@/chrome/toolkit@JAREXT@

   @RESPATH@/chrome/toolkit.manifest

-  @RESPATH@/chrome/recording.manifest

-  @RESPATH@/chrome/recording/*

  -#ifdef MOZ_GTK

  -@RESPATH@/browser/chrome/icons/default/default16.png

  -@RESPATH@/browser/chrome/icons/default/default32.png