diff options
Diffstat (limited to 'mail/thunderbird/files/patch-mail-app-Makefile.in')
| -rw-r--r-- | mail/thunderbird/files/patch-mail-app-Makefile.in | 254 |
1 files changed, 0 insertions, 254 deletions
diff --git a/mail/thunderbird/files/patch-mail-app-Makefile.in b/mail/thunderbird/files/patch-mail-app-Makefile.in deleted file mode 100644 index 237c8147bd27..000000000000 --- a/mail/thunderbird/files/patch-mail-app-Makefile.in +++ /dev/null @@ -1,254 +0,0 @@ ---- mail/app/Makefile.in 2012-06-01 19:11:49.000000000 +0200 -+++ /usr/ports/mail/thunderbird/work/comm-release/mail/app/Makefile.in 2012-04-28 21:31:30.000000000 +0200 -@@ -47,6 +47,13 @@ - GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone) - GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID) - -+DEFINES += \ -+ -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \ -+ -DAB_CD=$(AB_CD) \ -+ -DGRE_MILESTONE=$(GRE_MILESTONE) \ -+ -DGRE_BUILDID=$(GRE_BUILDID) \ -+ $(NULL) -+ - MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) - ifdef MOZ_SOURCE_STAMP - DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" -@@ -58,30 +65,26 @@ - endif - - ifdef MOZILLA_OFFICIAL --DEFINES += -DMOZILLA_OFFICIAL -+DEFINES += -DOFFICIAL_BUILD=1 - endif - - DIRS = profile - -+GARBAGE += \ -+ $(FINAL_TARGET)/license.html \ -+ $(NULL) -+ - PREF_JS_EXPORTS = \ - $(srcdir)/profile/all-thunderbird.js \ - $(srcdir)/profile/channel-prefs.js \ - $(NULL) - --DEFINES += \ -- -DAB_CD=$(AB_CD) \ -- -DAPP_VERSION="$(MOZ_APP_VERSION)" \ -- -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \ -- -DGRE_MILESTONE=$(GRE_MILESTONE) \ -- -DGRE_BUILDID=$(GRE_BUILDID) \ -- $(NULL) -- --ifdef LIBXUL_SDK --include $(topsrcdir)/config/rules.mk -+ifneq (,$(filter OS2 Darwin WINNT,$(OS_ARCH))) -+PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) - else --# Build a binary bootstrapping with XRE_main -+PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX) -+endif - --PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) - - CPPSRCS = nsMailApp.cpp - -@@ -96,13 +99,21 @@ - DEFINES += -DXPCOM_GLUE - STL_FLAGS= - -+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -+TK_LIBS := -framework Cocoa $(TK_LIBS) -+endif -+ - LIBS += \ - $(EXTRA_DSO_LIBS) \ - $(XPCOM_STANDALONE_GLUE_LDOPTS) \ - $(NULL) - --ifdef MOZ_LINKER --LIBS += $(ZLIB_LIBS) -+ifdef MOZ_JPROF -+LIBS += -ljprof -+endif -+ -+ifdef MOZ_ENABLE_DBUS -+LIBS += $(MOZ_DBUS_GLIB_LIBS) - endif - - ifndef MOZ_WINCONSOLE -@@ -136,6 +147,8 @@ - - GARBAGE += write-message.ico address-book.ico - -+OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool) -+OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32) - RCINCLUDE = splash.rc - ifndef GNU_CC - RCFLAGS += -DMOZ_THUNDERBIRD -I$(srcdir) -@@ -147,11 +160,25 @@ - ifeq ($(OS_ARCH),OS2) - RESFILE=splashos2.res - RCFLAGS += -DMOZ_THUNDERBIRD -+ifdef DEBUG -+RCFLAGS += -DDEBUG -+endif - RCFLAGS += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" - endif - - include $(topsrcdir)/config/rules.mk - -+ifdef MOZILLA_OFFICIAL -+DEFINES += -DMOZILLA_OFFICIAL -+endif -+ -+APP_UA_NAME = $(shell echo $(MOZ_APP_DISPLAYNAME) | sed -e's/[^A-Za-z]//g') -+DEFINES += -DAPP_VERSION="$(MOZ_APP_VERSION)" -DAPP_UA_NAME="$(APP_UA_NAME)" -+ -+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -+LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -+endif -+ - ifeq ($(OS_ARCH),WINNT) - # - # Control the default heap size. -@@ -165,22 +192,9 @@ - # - ifndef GNU_CC - LDFLAGS += /HEAP:0x40000 --ifeq ($(OS_TEST),x86_64) --# set stack to 2MB on x64 build. See bug 582910 --LDFLAGS += -STACK:2097152 --endif - endif - endif - --ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) --libs:: -- cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) -- --GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js) --endif # ! OS 2 or WinNT -- --endif # LIBXUL_SDK -- - ifneq (,$(filter windows os2,$(MOZ_WIDGET_TOOLKIT))) - ICON_SUFFIX=.ico - -@@ -219,10 +233,36 @@ - $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default - endif - -+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) -+ifneq (,$(filter-out Darwin,$(OS_ARCH))) -+$(MOZ_APP_NAME):: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk -+ 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) -+else -+libs:: -+ cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) -+ -+endif # ! Mac -+GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js) -+endif # ! OS 2 or WinNT -+ -+ifeq ($(MOZ_WIDGET_TOOLKIT),photon) -+LIBS += -lphexlib -+endif -+ - libs:: $(srcdir)/profile/prefs.js - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile - --libs:: $(srcdir)/blocklist.xml -+libs:: blocklist.xml - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin - - ifdef ENABLE_TESTS -@@ -239,6 +279,8 @@ - - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - -+AB := $(firstword $(subst -, ,$(AB_CD))) -+ - MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME) - - ifdef MOZ_DEBUG -@@ -247,55 +289,26 @@ - - LOWER_MAC_APP_NAME = $(shell echo $(MAC_APP_NAME) | tr '[A-Z]' '[a-z]') - --AB_CD = $(MOZ_UI_LOCALE) -- --AB := $(firstword $(subst -, ,$(AB_CD))) -- --clean clobber repackage:: -- $(RM) -r $(DIST)/$(MOZ_MACBUNDLE_NAME) -- --ifdef LIBXUL_SDK --APPFILES = Resources --else --APPFILES = MacOS --endif -- --libs repackage:: $(PROGRAM) -- $(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS -- 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 -+libs:: $(PROGRAM) -+ mkdir -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS -+ rsync -a --exclude CVS --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 CVS --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/%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) --ifdef LIBXUL_SDK -- cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/thunderbird --else -- $(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM) -+ rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS -+ rm -f $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM) - rsync -aL $(PROGRAM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS --endif -- $(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight -+ mkdir -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight - rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight - cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/thunderbird.icns - printf APPLMOZM > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/PkgInfo --else --ifdef LIBXUL_SDK --libs:: -- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/thunderbird$(BIN_SUFFIX) --endif --endif -+# remove CVS dirs from packaged app -+ find $(DIST)/$(MOZ_MACBUNDLE_NAME) -type d -name "CVS" -prune -exec rm -rf {} \; - --ifdef LIBXUL_SDK --ifndef SKIP_COPY_XULRUNNER --libs:: --ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -- rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Frameworks --else -- $(NSINSTALL) -D $(DIST)/bin/xulrunner -- (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -) --endif # cocoa --endif # SKIP_COPY_XULRUNNER --endif # LIBXUL_SDK -+clean clobber:: -+ rm -rf $(DIST)/$(MOZ_MACBUNDLE_NAME) -+endif - - # Note that anything you do to dist/ down here isn't going to make it into the - # Mac build, since it's already been copied over to the .app, above. |