firefox-2_0_0_13-1'.
Sprout from master 2008-03-26 14:00:08 UTC hawk <hawk@pld-linux.org> '- updated to 2.0.0.13, fixes CVE-2008-1233, CVE-2008-1234, CVE-2008-1235,'
Cherrypick from master 2007-01-29 23:21:59 UTC Elan Ruusamäe <glen@pld-linux.org> '- updated from AC-branch; AC-branch moved here':
mozilla-firefox.desktop -> 1.5
Cherrypick from unlabeled-1.2.2 2007-11-23 22:24:07 UTC hawk <hawk@pld-linux.org> '- updated for PLD Titanium':
mozilla-firefox-agent.patch -> 1.2.2.1
Delete:
mozilla-firefox-414239.patch
mozilla-firefox-addon-tidy.patch
mozilla-firefox-install.patch
+++ /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/allmakefiles.sh~ 2007-04-03 22:04:34.000000000 +0300
-+++ mozilla/allmakefiles.sh 2007-06-04 14:02:26.641218344 +0300
-@@ -1561,6 +1561,14 @@
- sql ) MAKEFILES_extensions="$MAKEFILES_extensions
- $MAKEFILES_sql"
- ;;
-+
-+ tidy ) MAKEFILES_extensions="$MAKEFILES_extensions
-+ extensions/tidy/Makefile
-+ extensions/tidy/src/Makefile
-+ extensions/tidy/test/Makefile
-+ extensions/tidy/spvalid/Makefile
-+ " ;;
-+
- schema-validation ) MAKEFILES_extensions="$MAKEFILES_extensions
- extensions/schema-validation/Makefile
- extensions/schema-validation/public/Makefile
---- mozilla/configure~ 2007-06-04 14:32:43.192411445 +0300
-+++ mozilla/configure 2007-06-04 17:01:47.504921162 +0300
-@@ -13168,7 +13168,7 @@
- MOZ_PHOENIX=1
- MOZ_SAFE_BROWSING=1
- MOZ_APP_VERSION=$FIREFOX_VERSION
-- MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck"
-+ MOZ_EXTENSIONS_DEFAULT=" tidy cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck"
- cat >> confdefs.h <<\EOF
- #define MOZ_PHOENIX 1
- EOF
---- mozilla/configure.in~ 2007-06-04 14:32:42.892404643 +0300
-+++ mozilla/configure.in 2007-06-04 17:02:06.255346400 +0300
-@@ -4329,7 +4329,7 @@
- MOZ_PHOENIX=1
- MOZ_SAFE_BROWSING=1
- MOZ_APP_VERSION=$FIREFOX_VERSION
-- MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck"
-+ MOZ_EXTENSIONS_DEFAULT=" tidy cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck"
- AC_DEFINE(MOZ_PHOENIX)
- ;;
-
---- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-04 23:38:53.000000000 +0300
-+++ mozilla/extensions/tidy/src/Makefile.in 2007-09-04 23:49:39.434545403 +0300
-@@ -104,7 +104,7 @@
-
- EXTRA_DSO_LDOPTS += \
- $(NSPR_LIBS) \
-- $(LIB_PREFIX)osp.$(LIB_SUFFIX) \
-+ -losp \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
---- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-04 23:49:39.000000000 +0300
-+++ mozilla/extensions/tidy/src/Makefile.in 2007-09-04 23:50:13.205311926 +0300
-@@ -111,6 +111,6 @@
-
- INCLUDES += -I$(srcdir)/../tidy/include
- INCLUDES += -I$(srcdir)/../tidy/src
--INCLUDES += -I$(srcdir)/../opensp/include
-+INCLUDES += -I/usr/include/OpenSP
- INCLUDES += -I$(srcdir)/.
-
---- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-05 01:41:08.000000000 +0300
-+++ mozilla/extensions/tidy/src/Makefile.in 2007-09-05 12:21:13.420348101 +0300
-@@ -103,6 +103,7 @@
- endif
-
- EXTRA_DSO_LDOPTS += \
-+ $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xpcom.so \
- $(NSPR_LIBS) \
- -losp \
- $(NULL)
---- mozilla/extensions/tidy/src/SpValid.cpp~ 2007-08-27 10:38:12.000000000 +0300
-+++ mozilla/extensions/tidy/src/SpValid.cpp 2007-09-04 23:53:25.049666582 +0300
-@@ -9,7 +9,7 @@
- #ifdef WIN32
- #include "../opensp/include/config.h"
- #else
--#include "../opensp/config.h"
-+#include <OpenSP/config.h>
- #endif
-
- #include "nsMemory.h"
-@@ -19,13 +19,13 @@
-
- #include <stdlib.h>
-
--#include "../opensp/include/MessageEventHandler.h"
--#include "NsgmlsMessages.h"
--#include "../opensp/include/sptchar.h"
-+#include <OpenSP/MessageEventHandler.h>
-+#include <OpenSP/nsgmls/NsgmlsMessages.h>
-+#include <OpenSP/sptchar.h>
- #include "SpValid.h"
--#include "../opensp/include/InternalInputSource.h"
-+#include <OpenSP/InternalInputSource.h>
-
--#include "../opensp/include/Parser.h"
-+#include <OpenSP/lib/Parser.h>
-
- #ifdef SP_NAMESPACE
- using namespace SP_NAMESPACE;
--- mozilla-firefox/browser/app/profile/firefox.js.orig 2007-03-21 17:21:55.000000000 +0100
+++ mozilla-firefox/browser/app/profile/firefox.js 2007-03-21 17:23:53.000000000 +0100
-@@ -163,6 +163,9 @@
+@@ -163,6 +163,8 @@
pref("general.useragent.locale", "@AB_CD@");
pref("general.skins.selectedSkin", "classic/1.0");
pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@");
+pref("general.useragent.vendor", "PLD");
-+pref("general.useragent.vendorSub", "3.0");
-+pref("general.useragent.vendorComment", "Th");
++pref("general.useragent.vendorSub", "Titanium");
pref("general.smoothScroll", false);
#ifdef UNIX_BUT_NOT_MAC
+++ /dev/null
---- mozilla/toolkit/mozapps/installer/packager.mk 2006-12-23 03:38:32.302235167 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk 2008-03-05 22:59:55.020447000 +0000
-@@ -328,13 +328,13 @@
- # 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 -p $(DESTDIR)$(MOZ_PKG_APPDIR)
- ifdef MOZ_PKG_MANIFEST
- $(RM) -rf $(DIST)/xpt
- $(call PACKAGER_COPY, "$(DIST)",\
-- "$(DIST)/$(MOZ_PKG_APPNAME)", \
-+ "$(DESTDIR)/$(MOZ_PKG_APPDIR)", \
- "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
-- $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -x "$(XPIDL_LINK)"
-+ $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/components -v -x "$(XPIDL_LINK)"
- else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_PKG_FORMAT),DMG)
- # If UNIVERSAL_BINARY, the package will be made from an already-prepared
-@@ -343,7 +343,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
-@@ -375,7 +375,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)
Terminal=false
Type=Application
Categories=GTK;Network;WebBrowser;
+Encoding=UTF-8
# vi: encoding=utf-8
projects / packages / firefox.git / commitdiff