1 files changed, 0 insertions, 130 deletions
diff --git a/www/firefox/files/patch-browser-app-Makefile.in b/www/firefox/files/patch-browser-app-Makefile.in
deleted file mode 100644
index 3a3a449c2fca..000000000000
--- a/www/firefox/files/patch-browser-app-Makefile.in
+++ /dev/null
@@ -1,130 +0,0 @@
---- browser/app/Makefile.in.orig	2012-05-23 20:56:32.000000000 +0200
-+++ browser/app/Makefile.in	2012-05-27 18:12:41.000000000 +0200
-@@ -56,37 +56,46 @@
- # hardcode en-US for the moment
- AB_CD = en-US
- 
--DEFINES += \
--  -DAB_CD=$(AB_CD) \
--  -DAPP_VERSION="$(MOZ_APP_VERSION)" \
--  -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" \
--  -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" \
--  $(NULL)
-+DEFINES += -DAB_CD=$(AB_CD)
-+
-+APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
-+DEFINES += -DAPP_VERSION="$(APP_VERSION)"
- 
- ifdef LIBXUL_SDK
- include $(topsrcdir)/config/rules.mk
- else
- # Build a binary bootstrapping with XRE_main
- 
-+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
- PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-+else
-+PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
-+endif
- 
- CPPSRCS = nsBrowserApp.cpp
- 
--LOCAL_INCLUDES += \
--  -I$(topsrcdir)/toolkit/xre \
--  -I$(topsrcdir)/xpcom/base \
--  -I$(topsrcdir)/xpcom/build \
--  -I$(DEPTH)/build \
--  $(NULL)
-+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
-+LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
-+LOCAL_INCLUDES += -I$(DEPTH)/build
- 
--DEFINES += -DXPCOM_GLUE
--STL_FLAGS=
-+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-+LIBS += $(DIST)/bin/XUL
-+TK_LIBS := $(TK_LIBS)
-+else
-+EXTRA_DSO_LIBS += xul
-+endif
- 
- LIBS += \
-+	$(STATIC_COMPONENTS_LINKER_PATH) \
- 	$(EXTRA_DSO_LIBS) \
--	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+	$(XPCOM_GLUE_LDOPTS) \
-+	$(NSPR_LIBS) \
- 	$(NULL)
- 
-+ifdef MOZ_JPROF
-+LIBS += -ljprof
-+endif
-+
- ifdef MOZ_LINKER
- LIBS += $(ZLIB_LIBS)
- endif
-@@ -118,11 +127,17 @@
- else
- RCFLAGS += -DMOZ_PHOENIX --include-dir $(srcdir)
- endif
-+ifdef DEBUG
-+RCFLAGS += -DDEBUG
-+endif
- endif
- 
- ifeq ($(OS_ARCH),OS2)
- RESFILE=splashos2.res
- RCFLAGS += -DMOZ_PHOENIX
-+ifdef DEBUG
-+RCFLAGS += -DDEBUG
-+endif
- RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\"
- endif
- 
-@@ -150,15 +165,26 @@
- 
- ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
- 
--libs:: 
--	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
-+$(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
-+	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
-+		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
-+	chmod +x $@
- 
-+libs:: $(MOZ_APP_NAME)
-+	$(INSTALL) $< $(DIST)/bin
-+
-+install:: $(MOZ_APP_NAME)
-+	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
-+
-+GARBAGE += $(MOZ_APP_NAME)
- GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
- 
- endif
- 
- endif # LIBXUL_SDK
- 
-+DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
-+
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
- libs::
- 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
-@@ -201,15 +227,17 @@
- 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(MOZ_MACBUNDLE_NAME) --exclude English.lproj
- 	$(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
- 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
--	sed -e "s/%APP_VERSION%/$(MOZ_APP_VERSION)/" -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" -e "s/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
-+	sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" -e "s/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
- 	sed -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj/InfoPlist.strings
- 	rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
-+	$(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign
- ifdef LIBXUL_SDK
- 	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/firefox
- else
- 	$(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
- 	rsync -aL $(PROGRAM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
- endif
-+	-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
- 	cp -RL $(DIST)/branding/firefox.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/firefox.icns
- 	cp -RL $(DIST)/branding/document.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/document.icns
- 	printf APPLMOZB > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/PkgInfo