Browse Source

forgot the chatzilla patch

Bill Gianopoulos 3 years ago
parent
commit
f67a28960c
1 changed files with 37 additions and 0 deletions
  1. 37 0
      bug1240930-253/comm/1650631-port-1240930-suite-277.patch

+ 37 - 0
bug1240930-253/comm/1650631-port-1240930-suite-277.patch

@@ -6,6 +6,43 @@
 Bug 1650631 - Rename the libs-% targets for l10n repacks to l10n-%. r=frg
 Port bug 1240930 - Move jar_maker to the misc tier.
 
+diff --git a/suite/extensions/irc/locales/Makefile.in b/suite/extensions/irc/locales/Makefile.in
+--- a/suite/extensions/irc/locales/Makefile.in
++++ b/suite/extensions/irc/locales/Makefile.in
+@@ -50,29 +50,29 @@ APP_DEFINES = $(firstword $(wildcard $(L
+ 
+ TK_DEFINES = $(firstword \
+              $(wildcard $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc) \
+              $(MOZILLA_DIR)/toolkit/locales/en-US/defines.inc)
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ ifneq (en-US,$(AB_CD))
+-libs realchrome::
++misc realchrome::
+ 	@echo "Comparing $(AB_CD) to en-US"
+ 	@$(PERL) $(topsrcdir)/toolkit/locales/compare-locales.pl $(srcdir)/en-US $(LOCALE_SRCDIR)
+ 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
+ 	  -DTK_DEFINES=$(TK_DEFINES) -DAPP_DEFINES=$(APP_DEFINES) \
+ 	  $(srcdir)/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
+ endif
+ 
+-libs-%: AB_CD=$*
+-libs-%:
++l10n-%: AB_CD=$*
++l10n-%:
+ 	# XXX: it would be nice if we could just do nothing if no langpack is being done
+ 	#  currently, we just go and (re)build en-US if called with a non-supported locale
+-	$(MAKE) libs AB_CD=$*
++	$(MAKE) l10n AB_CD=$*
+ 
+ repackage-zip: $(STAGEDIST)
+ ifneq (en-US,$(AB_CD))
+ 	$(RM) -rf $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
+ 	mkdir $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
+ 	if test -d "$(DIST)/xpi-stage/$(XPI_NAME)/chrome/chatzilla.jar"; then \
+ 	  $(RM) -r $(DIST)/xpi-stage/$(XPI_NAME)/chrome/chatzilla;\
+ 	fi
 diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
 --- a/suite/locales/Makefile.in
 +++ b/suite/locales/Makefile.in