+++ /dev/null
---- a/mail/app/Makefile.in
-+++ b/mail/app/Makefile.in
-@@ -133,6 +133,7 @@ LIBS += \
- $(APP_XPCOM_LIBS) \
- $(NSPR_LIBS) \
- $(TK_LIBS) \
-+ $(MOZ_HUNSPELL_LIBS) \
- $(NULL)
-
- # Add explicit X11 dependency when building against X11 toolkits
+++ /dev/null
---- mozilla/mozilla/toolkit/mozapps/installer/packager.mk.orig 2012-03-13 03:43:47.000000000 +0100
-+++ mozilla/mozilla/toolkit/mozapps/installer/packager.mk 2012-03-24 21:50:54.171788606 +0100
-@@ -708,41 +708,41 @@
- endif
-
- stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
-- @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
-+ @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
- ifndef MOZ_FAST_PACKAGE
-- @rm -rf $(DIST)/$(MOZ_PKG_DIR)
-+ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR)
- endif
- # NOTE: this must be a tar now that dist links into the tree so that we
- # do not strip the binaries actually in the tree.
- @echo "Creating package directory..."
-- if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \
-- mkdir $(DIST)/$(MOZ_PKG_DIR); \
-+ if ! test -d $(DESTDIR)/$(MOZ_PKG_DIR) ; then \
-+ mkdir $(DESTDIR)/$(MOZ_PKG_DIR); \
- fi
- ifndef UNIVERSAL_BINARY
- # If UNIVERSAL_BINARY, the package will be made from an already-prepared
- # STAGEPATH
- ifdef MOZ_PKG_MANIFEST
- ifndef MOZ_FAST_PACKAGE
- $(RM) -rf $(DIST)/xpt $(DIST)/manifests
- endif
- $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
-- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
-+ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
- "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
-- $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
-+ $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
- $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
-- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
-+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
- $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
- $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
-- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
-+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
- $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
- $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
-- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
-+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
- $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
- ifdef MOZ_WEBAPP_RUNTIME
-- mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
-- sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
-+ mv $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
-+ sed 's/$(AB_CD)/localized/' $(DESTDIR)/bin/webapprt/chrome.manifest > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
- endif
-- printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
-+ printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
- else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- ifndef STAGE_SDK
-@@ -741,10 +741,10 @@
- @$(NSINSTALL) -D $(DIST)/xpt
- @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
- else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
- endif
- else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR)
- @echo "Linking XPT files..."
- @rm -rf $(DIST)/xpt
- @$(NSINSTALL) -D $(DIST)/xpt
-@@ -801,7 +801,7 @@
- endif # DMG
- endif # MOZ_PKG_MANIFEST
- endif # UNIVERSAL_BINARY
-- $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) $(DIST)/bin/chrome $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/chrome
-+ $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) $(DIST)/bin/chrome $(DESTDIR)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/chrome
- ifndef PKG_SKIP_STRIP
- ifeq ($(OS_ARCH),OS2)
- @echo "Stripping package directory..."
-@@ -830,7 +830,7 @@
- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
- endif
- $(NSINSTALL) -D $(DESTDIR)$(installdir)
-- (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
-+ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
- (cd $(DESTDIR)$(installdir) && tar -xf -)
- $(NSINSTALL) -D $(DESTDIR)$(bindir)
- $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
---- comm-1.9.1/mail/app/Makefile.in.orig 2009-12-18 14:49:43.990647725 +0100
-+++ comm-1.9.1/mail/app/Makefile.in 2009-12-18 14:49:53.830739781 +0100
-@@ -48,7 +48,7 @@
- DEFINES += \
- -DAB_CD=$(AB_CD) \
- -DAPP_VERSION="$(MOZ_APP_VERSION)" \
-- -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
-+ -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" \
- -DGRE_MILESTONE=$(GRE_MILESTONE) \
- -DGRE_BUILDID=$(GRE_BUILDID) \
- $(NULL)
+++ /dev/null
-#! /bin/sh
-
-rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u
-rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp
-rm -fv ./mozilla/modules/oji/tests/script/killer.exe
-rm -fv ./mozilla/other-licenses/7zstub/firefox/7zSD.sfx
-rm -fv ./mozilla/toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
-rm -fv ./mozilla/toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
-rm -fv ./mozilla/extensions/universalchardet/doc/UniversalCharsetDetection.doc
-rm -fv ./mozilla/config/bin2rc.exe
-rm -fv ./mozilla/config/makedep.exe
-rm -fv ./mozilla/config/mangle.exe
-rm -fv ./mozilla/embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
-rm -fv ./mozilla/embedding/browser/activex/tests/vbrowse/browser.frx
-rm -fv ./mozilla/embedding/browser/activex/tests/vbrowse/frmToolBar.frx
-rm -fv ./mozilla/embedding/qa/testembed/testembed.aps
-rm -fv ./mozilla/embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
-rm -fv ./mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
-rm -fv ./mozilla/intl/unicharutil/tools/data/case.dat
-rm -fv ./mozilla/intl/unicharutil/tools/data/cmbcl.dat
-rm -fv ./mozilla/intl/unicharutil/tools/data/ctype.dat
-rm -fv ./mozilla/intl/unicharutil/tools/data/decomp.dat
-rm -fv ./mozilla/intl/unicharutil/tools/data/num.dat
-rm -fv ./mozilla/js/src/js.mdp
-rm -fv ./mozilla/js/src/liveconnect/jsj_nodl.c
-rm -fv ./mozilla/memory/jemalloc/ed.exe
-rm -fv ./mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
-rm -fv ./mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
-rm -fv ./mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
-rm -fv ./mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
-rm -fv ./mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/Resources/Strings.rsrc
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/Resources/Version.rsrc
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/MRJPlugin.jar
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/netscape.plugin.jar
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/Source/JMURLConnection
-rm -fv ./mozilla/plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
-rm -fv ./mozilla/plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
-rm -fv ./mozilla/plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
-rm -fv ./mozilla/plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
-rm -fv ./mozilla/plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
-rm -fv ./mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
-rm -fv ./mozilla/plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
-rm -fv ./mozilla/plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
-rm -fv ./mozilla/plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
-rm -fv ./mozilla/xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
-rm -fv ./mozilla/xpcom/tests/StringFactoringTests/StringTest.mcp
-rm -fv ./mozilla/xpinstall/test/pre_checkin.xpi
-rm -fv ./mozilla/layout/doc/SpaceMgr_BlockReflSt_OD.sda
-rm -fv ./mozilla/layout/doc/object_diagram_template.sda
-rm -fv ./mozilla/layout/html/tests/block/bugs/RealSnow.jar
-rm -fv ./mozilla/xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
-rm -fv ./mozilla/toolkit/crashreporter/tools/win32/dump_syms.exe
-rm -fv ./mozilla/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.o
-rm -fv ./mozilla/toolkit/mozapps/installer/windows/nsis/AppAssocReg.dll
-rm -fv ./mozilla/toolkit/mozapps/installer/windows/nsis/ShellLink.dll
-rm -fv ./mozilla/toolkit/mozapps/installer/windows/nsis/UAC.dll
-rm -fv ./mozilla/toolkit/mozapps/installer/windows/nsis/nsProcess.dll
-rm -fv ./suite/branding/icons/gtk/seamonkey.png
-rm -fv ./suite/branding/content/logo.gif
-rm -fv ./calendar/sunbird/base/themes/winstripe/preview.png
-rm -fv ./calendar/sunbird/base/themes/pinstripe/preview.png
-rm -fv ./suite/themes/classic/preview.png
-rm -fv ./mail/themes/qute/mail/preview.png
-rm -fv ./mail/themes/pinstripe/mail/preview.png
-rm -fv ./calendar/sunbird/base/themes/pinstripe/preview.png
-rm -fv ./calendar/sunbird/base/themes/winstripe/preview.png
-rm -fv ./mail/themes/pinstripe/mail/preview.png
-rm -fv ./mail/themes/qute/mail/preview.png
-rm -fv ./suite/branding/content/about.png
-rm -fv ./suite/branding/content/icon64.png
-rm -fv ./suite/branding/icons/gtk/default.png
-rm -fv ./suite/branding/icons/gtk/default16.png
-rm -fv ./suite/branding/icons/gtk/default48.png
-rm -fv ./suite/branding/icons/gtk/main-window.png
-rm -fv ./suite/branding/icons/gtk/main-window16.png
-rm -fv ./suite/branding/icons/gtk/main-window48.png
-rm -fv ./suite/branding/icons/mac/seamonkey.icns
-rm -fv ./suite/branding/icons/os2/main-window.ico
-rm -fv ./suite/branding/icons/os2/seamonkey.ico
-rm -fv ./suite/branding/icons/windows/main-window.ico
-rm -fv ./suite/branding/icons/windows/seamonkey.ico
-rm -fv ./suite/themes/classic/preview.png
-rm -fv ./suite/themes/classic/communicator/brand/throbber-anim.png
-rm -fv ./suite/themes/classic/communicator/brand/throbber-single.png
-rm -fv ./suite/themes/classic/communicator/brand/throbber16-anim.png
-rm -fv ./suite/themes/classic/communicator/brand/throbber16-single.png
-rm -fv ./suite/themes/modern/communicator/brand/throbber-anim.png
-rm -fv ./suite/themes/modern/communicator/brand/throbber-single.png
-rm -fv ./suite/themes/modern/communicator/brand/throbber16-anim.png
-rm -fv ./suite/themes/modern/communicator/brand/throbber16-single.png
-rm -fvr ./other-licenses/
-rm -fvr ./mozilla/other-licenses/7zstub
-rm -fvr ./mozilla/other-licenses/branding
-rm -fvr ./mozilla/other-licenses/bsdiff
-rm -fvr ./mozilla/other-licenses/ia2
-rm -fvr ./mozilla/other-licenses/nsis
-rm -fv ./mozilla/netwerk/protocol/ftp/doc/rfc959.txt
-rm -fv calendar/sunbird/app/sunbird.ico
-rm -fv calendar/sunbird/app/default.xpm
-find . -type d -name CVS | xargs rm -rf
-find . -type f -name .cvsignore | xargs rm -f
+++ /dev/null
-diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
---- a/mozilla/gfx/thebes/gfxPlatform.cpp Sun Mar 04 00:38:41 2012 +0000
-+++ b/mozilla/gfx/thebes/gfxPlatform.cpp Wed May 16 17:37:10 2012 +0200
-@@ -448,21 +448,19 @@ gfxPlatform::CreateDrawTargetForSurface(
-
- cairo_user_data_key_t kSourceSurface;
-
- void SourceBufferDestroy(void *srcBuffer)
- {
- static_cast<SourceSurface*>(srcBuffer)->Release();
- }
-
--void SourceSnapshotDetached(cairo_surface_t *nullSurf)
-+void SourceSnapshotDetached(void *nullSurf)
- {
-- gfxImageSurface* origSurf =
-- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
--
-+ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
- {
- void *userData = aSurface->GetData(&kSourceSurface);
-
-@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
-
- }
-
-- cairo_surface_t *nullSurf =
-- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
-- cairo_surface_set_user_data(nullSurf,
-- &kSourceSurface,
-- imgSurface,
-- NULL);
-- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
-- cairo_surface_destroy(nullSurf);
-+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
-+ (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
- }
-
- srcBuffer->AddRef();
projects / packages / thunderbird.git / commitdiff