+++ /dev/null
-Index: gfx/thebes/src/gfxPangoFonts.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/thebes/src/gfxPangoFonts.cpp,v
-retrieving revision 1.128
-diff -u -p -U 8 -r1.128 gfxPangoFonts.cpp
---- gfx/thebes/src/gfxPangoFonts.cpp 27 Jan 2008 10:27:08 -0000 1.128
-+++ gfx/thebes/src/gfxPangoFonts.cpp 1 Feb 2008 20:07:47 -0000
-@@ -371,24 +371,28 @@ NewPangoFontDescription(const nsAString
- /* static */
- already_AddRefed<gfxPangoFont>
- gfxPangoFont::GetOrMakeFont(PangoFont *aPangoFont)
- {
- gfxPangoFont *font = static_cast<gfxPangoFont*>
- (g_object_get_qdata(G_OBJECT(aPangoFont), GetFontQuark()));
-
- if (!font) {
-- PangoFontDescription *desc =
-- pango_font_describe_with_absolute_size(aPangoFont);
-+ // pango_font_describe_with_absolute_size requires Pango-1.14
-+ PangoFontDescription *desc = pango_font_describe(aPangoFont);
-+
-+ PangoFcFont *fcfont = PANGO_FC_FONT(aPangoFont);
-+ double size;
-+ if (FcPatternGetDouble(fcfont->font_pattern, FC_PIXEL_SIZE, 0, &size)
-+ != FcResultMatch)
-+ size = pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
-
- // Shouldn't actually need to take too much care about the correct
- // family or style, as size is the only thing expected to be
- // important.
-- gfxFloat size =
-- pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
- PRUint8 style =
- PangoStyleToThebesStyle(pango_font_description_get_style(desc));
- PRUint16 weight = pango_font_description_get_weight(desc);
- NS_NAMED_LITERAL_CSTRING(langGroup, "x-unicode");
- gfxFontStyle fontStyle(style, weight, size, langGroup, 0.0,
- PR_TRUE, PR_FALSE);
-
- // (The PangoFontDescription owns the family string)
+++ /dev/null
---- mozilla/browser/app/firefox-branding.js~ 2006-09-12 18:50:19.000000000 +0300
-+++ mozilla/browser/app/firefox-branding.js 2008-10-03 11:14:14.032645886 +0300
-@@ -1,5 +1,5 @@
--pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
--pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
-+pref("startup.homepage_override_url","http://www.mozilla.com/%APP%/%VERSION%/releasenotes/");
-+pref("startup.homepage_welcome_url","http://www.mozilla.com/%APP%/%VERSION%/firstrun/");
- // URL user can browse to manually if for some reason all update installation
- // attempts fail.
- pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
-@@ -8,7 +8,7 @@
- pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
-
- // Release notes URL
--pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
-+pref("app.releaseNotesURL", "http://www.mozilla.com/%APP%/%VERSION%/releasenotes/");
-
- // Search codes belong only in builds with official branding
- pref("browser.search.param.yahoo-fr", "");
+++ /dev/null
---- mozilla/toolkit/mozapps/installer/packager.mk~ 2006-12-23 03:31:40.882927000 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk 2006-12-23 03:38:32.302235167 +0200
-@@ -301,7 +301,7 @@
- # 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..."
-- @mkdir $(DIST)/$(MOZ_PKG_APPNAME)
-+ @mkdir $(DESTDIR)$(MOZ_PKG_APPDIR)
- ifdef MOZ_PKG_MANIFEST
- $(RM) -rf $(DIST)/xpt
- $(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
-@@ -316,7 +316,7 @@
- @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_APPNAME)
- endif
- else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif # DMG
- endif # MOZ_PKG_MANIFEST
- ifndef PKG_SKIP_STRIP
-@@ -348,7 +348,7 @@
- endif
- @echo "Removing unpackaged files..."
- ifdef NO_PKG_FILES
-- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH); rm -rf $(NO_PKG_FILES)
-+ cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
- endif
- ifdef MOZ_PKG_REMOVALS
- $(SYSINSTALL) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)