rpms/firefox/devel firefox-2.0-link-layout.patch, NONE, 1.1 firefox-2.0-pango-printing.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 firefox-1.1-default-applications.patch, 1.1, 1.2 firefox-1.1-nss-system-nspr.patch, 1.1, 1.2 firefox-1.5-visibility.patch, 1.1, 1.2 firefox-redhat-default-prefs.js, 1.6, 1.7 firefox.sh.in, 1.14, 1.15 firefox.spec, 1.158, 1.159 sources, 1.33, 1.34
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Oct 24 18:57:45 UTC 2006
- Previous message (by thread): rpms/system-config-kickstart/devel sources, 1.40, 1.41 system-config-kickstart.spec, 1.45, 1.46
- Next message (by thread): rpms/audit/FC-5 .cvsignore, 1.60, 1.61 audit.spec, 1.93, 1.94 sources, 1.70, 1.71 audit-1.2.8-defines.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caillon
Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6306
Modified Files:
.cvsignore firefox-1.1-default-applications.patch
firefox-1.1-nss-system-nspr.patch firefox-1.5-visibility.patch
firefox-redhat-default-prefs.js firefox.sh.in firefox.spec
sources
Added Files:
firefox-2.0-link-layout.patch firefox-2.0-pango-printing.patch
Log Message:
* Tue Oct 24 2006 Christopher Aillon <caillon at redhat.com> 2.0-1
- Update to 2.0
- Add patch from Behdad to fix pango printing.
firefox-2.0-link-layout.patch:
Makefile.in | 5 +++++
1 files changed, 5 insertions(+)
--- NEW FILE firefox-2.0-link-layout.patch ---
Index: mozilla/layout/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/layout/build/Makefile.in,v
retrieving revision 1.127.8.7
diff -d -u -p -r1.127.8.7 Makefile.in
--- mozilla/layout/build/Makefile.in 17 Jul 2006 19:05:13 -0000 1.127.8.7
+++ mozilla/layout/build/Makefile.in 10 Oct 2006 04:29:16 -0000
@@ -240,6 +240,11 @@ EXTRA_DSO_LDOPTS += \
$(NULL)
endif
+# Add explicit X11 dependency when building against X11 toolkits
+ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT)))
+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) -lXrender
+endif
+
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += -I$(srcdir)/../base \
firefox-2.0-pango-printing.patch:
freetype/nsFreeType.cpp | 18
freetype/nsFreeType.h | 7
ps/Makefile.in | 11
ps/mozilla-ps-decoder.cpp | 376 +++++++
ps/mozilla-ps-decoder.h | 72 +
ps/nsDeviceContextPS.cpp | 56 +
ps/nsFontMetricsPS.cpp | 302 +++++-
ps/nsFontMetricsPS.h | 68 +
ps/nsFontMetricsPSPango.cpp | 2107 ++++++++++++++++++++++++++++++++++++++++++++
ps/nsFontMetricsPSPango.h | 305 ++++++
ps/nsPostScriptObj.cpp | 91 +
ps/nsPostScriptObj.h | 32
ps/nsRenderingContextPS.cpp | 206 ----
ps/nsRenderingContextPS.h | 11
ps/nsType1.cpp | 261 +++--
ps/nsType1.h | 3
16 files changed, 3608 insertions(+), 318 deletions(-)
--- NEW FILE firefox-2.0-pango-printing.patch ---
Patch for Firefox 1.5.0.7 to add support for printing via Pango.
This also implements printing MathML via Pango, and prints bitmap
fonts too.
Authors:
Behdad Esfahbod
Chris Blizzard
Akira TAGOH
Index: gfx/src/freetype/nsFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
retrieving revision 1.28
diff -u -p -d -r1.28 nsFreeType.cpp
--- gfx/src/freetype/nsFreeType.cpp 13 Jul 2005 18:21:10 -0000 1.28
+++ gfx/src/freetype/nsFreeType.cpp 23 Oct 2006 17:37:09 -0000
@@ -123,6 +123,8 @@ FtFuncList nsFreeType2::FtFuncs [] = {
// #endif
{"FT_Get_First_Char", NS_FT2_OFFSET(nsFT_Get_First_Char), PR_FALSE},
{"FT_Get_Next_Char", NS_FT2_OFFSET(nsFT_Get_Next_Char), PR_FALSE},
+ {"FT_Has_PS_Glyph_Names", NS_FT2_OFFSET(nsFT_Has_PS_Glyph_Names), PR_FALSE},
+ {"FT_Get_Glyph_Name", NS_FT2_OFFSET(nsFT_Get_Glyph_Name), PR_TRUE},
{nsnull, 0, 0}
};
@@ -388,6 +390,22 @@ nsFreeType2::GetNextChar(FT_Face face, F
}
NS_IMETHODIMP
+nsFreeType2::HasPSGlyphNames(FT_Face face, FT_Int *result)
+{
+ // call the FreeType2 function via the function pointer
+ *result = nsFT_Has_PS_Glyph_Names(face);
+ return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFreeType2::GetGlyphName(FT_Face face, FT_UInt glyph_index, FT_Pointer buffer, FT_UInt buffer_max)
+{
+ // call the FreeType2 function via the function pointer
+ FT_Error error = nsFT_Get_Glyph_Name(face, glyph_index, buffer, buffer_max);
+ return error ? NS_ERROR_FAILURE : NS_OK;
+}
+
+NS_IMETHODIMP
nsFreeType2::SupportsExtFunc(PRBool *res)
{
*res = gHasExtFunc;
Index: gfx/src/freetype/nsFreeType.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
retrieving revision 1.18
diff -u -p -d -r1.18 nsFreeType.h
--- gfx/src/freetype/nsFreeType.h 1 May 2005 17:36:19 -0000 1.18
+++ gfx/src/freetype/nsFreeType.h 23 Oct 2006 17:37:09 -0000
@@ -52,6 +52,7 @@
#include FT_CACHE_H
#include FT_CACHE_IMAGE_H
#include FT_TRUETYPE_TABLES_H
+#include FT_TYPE1_TABLES_H
#include "nsIFreeType2.h"
typedef struct FT_FaceRec_* FT_Face;
@@ -138,6 +139,8 @@ typedef FT_Error (*FT_Glyph_To_Bitmap_t)
typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*);
typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*);
+typedef FT_Int (*FT_Has_PS_Glyph_Names_t)(FT_Face);
+typedef FT_Error (*FT_Get_Glyph_Name_t)(FT_Face, FT_UInt, FT_Pointer, FT_UInt);
class nsFreeTypeFace;
@@ -193,11 +196,13 @@ protected:
// #endif
FT_Get_First_Char_t nsFT_Get_First_Char;
FT_Get_Next_Char_t nsFT_Get_Next_Char;
+ FT_Has_PS_Glyph_Names_t nsFT_Has_PS_Glyph_Names;
+ FT_Get_Glyph_Name_t nsFT_Get_Glyph_Name;
// this array needs to be big enough to hold all the function pointers
// plus one extra for the null at the end
// #ifdef MOZ_SVG
- static FtFuncList FtFuncs[24];
+ static FtFuncList FtFuncs[28];
// #else
// static FtFuncList FtFuncs[20];
// #endif
Index: gfx/src/ps/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/Makefile.in,v
retrieving revision 1.57.8.1
diff -d -u -p -r1.57.8.1 Makefile.in
--- gfx/src/ps/Makefile.in 17 Jun 2006 15:16:14 -0000 1.57.8.1
+++ gfx/src/ps/Makefile.in 24 Oct 2006 18:36:45 -0000
@@ -98,6 +98,15 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
+ifdef MOZ_ENABLE_PANGO
+CPPSRCS += \
+ nsFontMetricsPSPango.cpp \
+ mozilla-ps-decoder.cpp
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
+CXXFLAGS += $(MOZ_PANGO_CFLAGS)
+CFLAGS += $(MOZ_PANGO_CFLAGS)
+endif
+
ifdef MOZ_ENABLE_XFT
EXTRA_DSO_LDOPTS += \
$(MOZ_XFT_LIBS) \
@@ -105,7 +114,7 @@ EXTRA_DSO_LDOPTS += \
$(NULL)
endif
-ifneq (,$(MOZ_ENABLE_FREETYPE2)$(MOZ_ENABLE_XFT))
+ifneq (,$(MOZ_ENABLE_FREETYPE2)$(MOZ_ENABLE_XFT)$(MOZ_ENABLE_PANGO))
CPPSRCS += \
nsType1.cpp \
$(NULL)
Index: gfx/src/ps/mozilla-ps-decoder.cpp
===================================================================
RCS file: gfx/src/ps/mozilla-ps-decoder.cpp
diff -N gfx/src/ps/mozilla-ps-decoder.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gfx/src/ps/mozilla-ps-decoder.cpp 23 Oct 2006 17:37:10 -0000
@@ -0,0 +1,376 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Christopher Blizzard
+ * <blizzard at mozilla.org>. Portions created by the Initial Developer
+ * are Copyright (C) 2004 the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#define PANGO_ENABLE_BACKEND
+#define PANGO_ENABLE_ENGINE
+
+#include "mozilla-ps-decoder.h"
+#include <pango/pangofc-fontmap.h>
+#include <pango/pangofc-font.h>
+
+#include "nsString.h"
+#include "nsIPersistentProperties2.h"
+#include "nsNetUtil.h"
+#include "nsReadableUtils.h"
+#include "nsICharsetConverterManager.h"
+#include "nsICharRepresentable.h"
+#include "nsCompressedCharMap.h"
+
+#undef DEBUG_CUSTOM_ENCODER
+
+G_DEFINE_TYPE (MozillaPSDecoder, mozilla_ps_decoder, PANGO_TYPE_FC_DECODER)
+
+MozillaPSDecoder *mozilla_ps_decoder_new (void);
+
+static FcCharSet *mozilla_ps_decoder_get_charset (PangoFcDecoder *decoder,
+ PangoFcFont *fcfont);
+static PangoGlyph mozilla_ps_decoder_get_glyph (PangoFcDecoder *decoder,
+ PangoFcFont *fcfont,
+ guint32 wc);
+
+static PangoFcDecoder *mozilla_find_ps_decoder (FcPattern *pattern,
+ gpointer user_data);
+
+typedef struct _MozillaPSDecoderPrivate MozillaPSDecoderPrivate;
+
+#define MOZILLA_PS_DECODER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOZILLA_TYPE_DECODER, MozillaPSDecoderPrivate))
+
+struct _MozillaPSDecoderPrivate {
[...4177 lines suppressed...]
static PRBool
-#ifdef MOZ_ENABLE_XFT
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
outputType1SubFont(FT_Face aFace,
#else
outputType1SubFont(nsIFreeType2 *aFt2, FT_Face aFace,
#endif
- const nsAString& aCharIDs, const char *aFontName,
- int aWmode, int aLenIV, FILE *aFile)
+ nsValueArray *aGlyphs,
+ PRUint32 aOffset, PRUint32 aLen,
+ const char *aFontName,
+ int aWmode, int aLenIV, FILE *aFile)
{
- FT_UShort upm = aFace->units_per_EM;
+ FT_UShort upm = get_upm (aFace);
fprintf(aFile, "%%%%BeginResource: font %s\n"
"%%!PS-AdobeFont-1.0-3.0 %s 1.0\n"
@@ -573,9 +667,13 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
toCS(upm, aFace->bbox.xMax),
toCS(upm, aFace->bbox.yMax));
- nsString charIDstr(aCharIDs);
- PRUint32 len = aCharIDs.Length();
-
+ nsValueArray glyphs(PR_UINT16_MAX);
+ nsCStringArray glyphnames(PR_UINT16_MAX);
+ glyphs = *aGlyphs;
+
+ PRUint32 len = aLen;
+ PRUint32 i;
+
if (len < 10) {
// Add a small set of characters to the subset of the user
// defined font to produce to make sure the font ends up
@@ -584,25 +682,47 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
// XXX : need to check if this is true of type 1 fonts as well.
// I suspect it's only the case of CID-keyed fonts (type 9) we used to
// generate.
- charIDstr.AppendLiteral("1234567890");
+ for (i = 1; i <= 10; i++) {
+ glyphs.AppendValue(i);
+ }
len += 10;
}
- const PRUnichar *charIDs = charIDstr.get();
-
- PRUint32 i;
+ FT_Int has_glyph_name;
+#if defined (MOZ_ENABLE_XFT) || defined (MOZ_ENABLE_PANGO)
+ has_glyph_name = FT_Has_PS_Glyph_Names(aFace);
+#else
+ has_glyph_name = aFt2->hasPSGlyphNames(aFace);
+#endif
// construct an Encoding vector : the 0th element
// is /.notdef
- fputs("/Encoding [\n/.notdef\n", aFile);
- for (i = 0; i < len; ++i) {
- fprintf(aFile, "/uni%04X", charIDs[i]);
- if (i % 8 == 7) fputc('\n', aFile);
+ fputs("/Encoding [\n/.notdef", aFile);
+ for (i = aOffset; i < aOffset + aLen; ++i) {
+ nsCString name;
+ char buffer[256];
+
+ if (glyphs.ValueAt(i) == 0) {
+ name = "/.notdef";
+ } else if (!has_glyph_name ||
+#if defined (MOZ_ENABLE_XFT) || defined (MOZ_ENABLE_PANGO)
+ FT_Get_Glyph_Name(aFace, glyphs.ValueAt(i), buffer, 255) != FT_Err_Ok
+#else
+ NS_FAILED(aFt2->getGlyphName(aFace, glyphs.ValueAt(i), buffer, 255))
+#endif
+ ) {
+ name = nsPrintfCString(256, "/idx%04X", glyphs.ValueAt(i));
+ } else {
+ name = nsPrintfCString(256, "/%s", buffer);
+ }
+ glyphnames.AppendCString(name);
+ fprintf(aFile, name.get());
+ if ((i-aOffset) % 8 == 6) fputc('\n', aFile);
}
- for (i = len; i < 255; ++i) {
+ for (i = PR_MAX (0, 255 - int(aLen)); i; --i) {
fputs("/.notdef", aFile);
- if (i % 8 == 7) fputc('\n', aFile);
+ if (i % 8 == 1) fputc('\n', aFile);
}
fputs("] def\n", aFile);
@@ -630,23 +750,21 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
// get the maximum charstring length without actually filling up the buffer
PRInt32 charStringLen;
PRInt32 maxCharStringLen =
-#ifdef MOZ_ENABLE_XFT
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
FT2GlyphToType1CharString(aFace, 0, aWmode, aLenIV, nsnull);
#else
FT2GlyphToType1CharString(aFt2, aFace, 0, aWmode, aLenIV, nsnull);
#endif
- PRUint32 glyphID;
-
- for (i = 0; i < len; i++) {
-#ifdef MOZ_ENABLE_XFT
- glyphID = FT_Get_Char_Index(aFace, charIDs[i]);
+ for (i = aOffset; i < aOffset + aLen; i++) {
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
charStringLen =
- FT2GlyphToType1CharString(aFace, glyphID, aWmode, aLenIV, nsnull);
+ FT2GlyphToType1CharString(aFace, glyphs.ValueAt(i), aWmode, aLenIV,
+ nsnull);
#else
- aFt2->GetCharIndex(aFace, charIDs[i], &glyphID);
charStringLen =
- FT2GlyphToType1CharString(aFt2, aFace, glyphID, aWmode, aLenIV, nsnull);
+ FT2GlyphToType1CharString(aFt2, aFace, glyphs.ValueAt(i), aWmode, aLenIV,
+ nsnull);
#endif
if (charStringLen > maxCharStringLen)
@@ -666,7 +784,7 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
len + 1).get());
// output the notdef glyph
-#ifdef MOZ_ENABLE_XFT
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
charStringLen = FT2GlyphToType1CharString(aFace, 0, aWmode, aLenIV,
charString.get());
#else
@@ -676,22 +794,20 @@ outputType1SubFont(nsIFreeType2 *aFt2, F
// enclose charString with "/.notdef RD ..... ND"
charStringOut(aFile, &pos, &key, NS_REINTERPRET_CAST(const char*, charString.get()),
- charStringLen, 0);
+ charStringLen, "/.notdef");
// output the charstrings for each glyph in this sub font
- for (i = 0; i < len; i++) {
-#ifdef MOZ_ENABLE_XFT
- glyphID = FT_Get_Char_Index(aFace, charIDs[i]);
- charStringLen = FT2GlyphToType1CharString(aFace, glyphID, aWmode,
+ for (i = aOffset; i < aOffset + aLen; i++) {
+#if defined(MOZ_ENABLE_XFT) || defined(MOZ_ENABLE_PANGO)
+ charStringLen = FT2GlyphToType1CharString(aFace, glyphs.ValueAt(i), aWmode,
aLenIV, charString.get());
#else
- aFt2->GetCharIndex(aFace, charIDs[i], &glyphID);
- charStringLen = FT2GlyphToType1CharString(aFt2, aFace, glyphID, aWmode,
- aLenIV, charString.get());
+ charStringLen = FT2GlyphToType1CharString(aFt2, aFace, glyphs.ValueAt(i),
+ aWmode, aLenIV, charString.get());
#endif
charStringOut(aFile, &pos, &key, NS_REINTERPRET_CAST(const char*, charString.get()),
- charStringLen, charIDs[i]);
+ charStringLen, glyphnames.CStringAt(i - aOffset)->get());
}
// wrap up the encrypted part of the font definition
@@ -753,15 +869,12 @@ void encryptAndHexOut(FILE *aFile, PRUin
/* static */
void charStringOut(FILE* aFile, PRUint32* aPos, PRUint16* aKey,
- const char *aStr, PRUint32 aLen, PRUnichar aId)
+ const char *aStr, PRUint32 aLen, const char *aGlyphName)
{
// use a local buffer instead of nsPrintfCString to avoid alloc.
char buf[30];
int oLen;
- if (aId == 0)
- oLen = PR_snprintf(buf, 30, "/.notdef %d RD ", aLen);
- else
- oLen = PR_snprintf(buf, 30, "/uni%04X %d RD ", aId, aLen);
+ oLen = PR_snprintf(buf, 30, "%s %d RD ", aGlyphName, aLen);
if (oLen >= 30) {
NS_WARNING("buffer size exceeded. charstring will be truncated");
Index: gfx/src/ps/nsType1.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/ps/nsType1.h,v
retrieving revision 1.5
diff -u -p -d -r1.5 nsType1.h
--- gfx/src/ps/nsType1.h 4 Mar 2005 07:39:27 -0000 1.5
+++ gfx/src/ps/nsType1.h 23 Oct 2006 17:37:39 -0000
@@ -122,8 +122,9 @@ FT_Error FT2GlyphToType1CharString(nsIFr
class nsString;
class nsCString;
+class nsValueArray;
-PRBool FT2SubsetToType1FontSet(FT_Face aFace, const nsString& aSubset,
+PRBool FT2SubsetToType1FontSet(FT_Face aFace, nsValueArray *aGlyphSubset,
int aWmode, FILE *aFile);
nsresult FT2ToType1FontName(FT_Face aFace, int aWmode,
nsCString& aFontName);
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore 11 Oct 2006 20:54:47 -0000 1.30
+++ .cvsignore 24 Oct 2006 18:57:43 -0000 1.31
@@ -1,3 +1,2 @@
-firefox-1.5.0.6-source.tar.bz2
-firefox-langpacks-1.5.0.6-20060803.tar.bz2
-add-gecko-provides
+firefox-2.0-source.tar.bz2
+firefox-langpacks-2.0-20061024.tar.bz2
firefox-1.1-default-applications.patch:
preferences/main.xul | 2 +-
shell/src/nsGNOMEShellService.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: firefox-1.1-default-applications.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.1-default-applications.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.1-default-applications.patch 18 Jul 2005 20:27:41 -0000 1.1
+++ firefox-1.1-default-applications.patch 24 Oct 2006 18:57:43 -0000 1.2
@@ -14,19 +14,19 @@
NS_DECL_ISUPPORTS
NS_DECL_NSISHELLSERVICE
-Index: browser/components/preferences/general.xul
+Index: browser/components/preferences/main.xul
===================================================================
-RCS file: /cvsroot/mozilla/browser/components/preferences/general.xul,v
-retrieving revision 1.5
-diff -d -u -p -r1.5 general.xul
---- browser/components/preferences/general.xul 10 Mar 2005 18:43:57 -0000 1.5
-+++ browser/components/preferences/general.xul 17 Jun 2005 14:25:12 -0000
-@@ -62,7 +62,7 @@
- </hbox>
+RCS file: /cvsroot/mozilla/browser/components/preferences/main.xul,v
+retrieving revision 1.3.2.6
+diff -d -u -p -r1.3.2.6 main.xul
+--- browser/components/preferences/main.xul 13 Sep 2006 03:01:38 -0000 1.3.2.6
++++ browser/components/preferences/main.xul 7 Oct 2006 19:58:16 -0000
+@@ -193,7 +193,7 @@
+ </radiogroup>
</groupbox>
-#ifdef HAVE_SHELL_SERVICE
+#if 0
- <groupbox orient="horizontal">
- <caption label="&defaultBrowserGroup.label;"/>
- <hbox align="center" flex="1">
+ <!-- System Defaults -->
+ <groupbox id="systemDefaultsGroup" orient="horizontal">
+ <caption label="&systemDefaults.label;"/>
firefox-1.1-nss-system-nspr.patch:
0 files changed
Index: firefox-1.1-nss-system-nspr.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.1-nss-system-nspr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.1-nss-system-nspr.patch 18 Jul 2005 20:27:41 -0000 1.1
+++ firefox-1.1-nss-system-nspr.patch 24 Oct 2006 18:57:43 -0000 1.2
@@ -1,124 +0,0 @@
-Index: mozilla/security/coreconf/location.mk
-===================================================================
-RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v
-retrieving revision 1.9
-diff -u -r1.9 location.mk
---- mozilla/security/coreconf/location.mk 25 Apr 2004 15:02:17 -0000 1.9
-+++ mozilla/security/coreconf/location.mk 11 Apr 2005 20:21:57 -0000
-@@ -61,6 +61,8 @@
-
- DIST = $(SOURCE_PREFIX)/$(PLATFORM)
-
-+NSPR_LIBDIR = $(DIST)/lib
-+
- ifdef BUILD_DEBUG_GC
- DEFINES += -DDEBUG_GC
- endif
-Index: mozilla/security/manager/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
-retrieving revision 1.56
-diff -u -r1.56 Makefile.in
---- mozilla/security/manager/Makefile.in 14 Mar 2005 10:00:58 -0000 1.56
-+++ mozilla/security/manager/Makefile.in 11 Apr 2005 20:21:57 -0000
-@@ -76,12 +76,23 @@
- endif
- endif
-
-+ABS_DIST := $(shell cd $(DIST) && pwd)
-+ifeq ($(OS_ARCH),WINNT)
-+ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
-+endif
-+NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
-+ifneq (,$(strip $(NSPR_LIBDIR)))
-+NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR)))
-+else
-+NSPR_LIBDIR = $(ABS_DIST)/lib
-+endif
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
- DEFAULT_GMAKE_FLAGS += CC="$(CC)"
--DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
--DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
--DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
-+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)"
-+DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
-+DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
-+DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR)
- DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
- DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
- ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
-Index: mozilla/security/nss/lib/ckfw/builtins/Makefile
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v
-retrieving revision 1.14
-diff -u -r1.14 Makefile
---- mozilla/security/nss/lib/ckfw/builtins/Makefile 20 Jan 2005 02:25:46 -0000 1.14
-+++ mozilla/security/nss/lib/ckfw/builtins/Makefile 11 Apr 2005 20:21:57 -0000
-@@ -53,23 +53,23 @@
- # This is merely an expedient hack and not the right solution.
- ifdef NS_USE_GCC
- EXTRA_LIBS += \
-- -L$(DIST)/lib \
-+ -L$(NSPR_LIBDIR) \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
- $(NULL)
- else
- EXTRA_LIBS += \
-- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
-+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
- $(NULL)
- endif
-
- else
-
- EXTRA_LIBS += \
-- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+ $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-+ $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NULL)
-
- endif
-Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v
-retrieving revision 1.18
-diff -u -r1.18 Makefile
---- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 25 Apr 2004 15:03:08 -0000 1.18
-+++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 11 Apr 2005 20:21:57 -0000
-@@ -63,7 +63,7 @@
- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
- $(CRYPTO_LIB) \
- $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-- -L$(DIST)/lib \
-+ -L$(NSPR_LIBDIR) \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
-@@ -76,8 +76,8 @@
- $(DIST)/lib/softokn.lib \
- $(CRYPTO_LIB) \
- $(DIST)/lib/secutil.lib \
-- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
-+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
- wsock32.lib \
- winmm.lib \
- $(NULL)
-@@ -98,8 +98,8 @@
- $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
- $(CRYPTO_LIB) \
- $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+ $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-+ $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
- $(NULL)
-
- endif
firefox-1.5-visibility.patch:
config/system-headers | 11 ++++++++++-
modules/oji/src/nsJVMManager.cpp | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
Index: firefox-1.5-visibility.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.5-visibility.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5-visibility.patch 3 Sep 2006 22:24:52 -0000 1.1
+++ firefox-1.5-visibility.patch 24 Oct 2006 18:57:43 -0000 1.2
@@ -1,517 +1,3 @@
---- mozilla/xpcom/base/nscore.h.visibility 2006-02-21 22:19:38.000000000 -0500
-+++ mozilla/xpcom/base/nscore.h 2006-08-30 11:49:01.000000000 -0400
-@@ -105,7 +105,7 @@
- #define NS_VISIBILITY_HIDDEN
- #endif
-
--#if defined(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) && defined(HAVE_VISIBILITY_PRAGMA)
-+#if defined(HAVE_VISIBILITY_ATTRIBUTE)
- #define NS_VISIBILITY_DEFAULT __attribute__ ((visibility ("default")))
- #else
- #define NS_VISIBILITY_DEFAULT
---- mozilla/configure.visibility 2006-08-30 11:49:01.000000000 -0400
-+++ mozilla/configure 2006-08-30 11:49:01.000000000 -0400
-@@ -5331,9 +5331,9 @@
- OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
-
- if test "$GNU_CC"; then
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-- DSO_LDOPTS='-shared -Wl,-h -Wl,$@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
-+ DSO_LDOPTS='-shared'
- DSO_CFLAGS=''
- DSO_PIC_CFLAGS='-fPIC'
- _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti
-@@ -5357,9 +5357,9 @@
- _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
- _USE_CPP_INCLUDE_FLAG=1
- else
-- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-- DSO_LDOPTS='-shared -h $@'
-+ MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-+ DSO_LDOPTS='-shared'
- DSO_CFLAGS=''
- DSO_PIC_CFLAGS='-KPIC'
- _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
-@@ -5703,9 +5703,9 @@
-
- *-beos*)
- no_x=yes
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
- _PLATFORM_DEFAULT_TOOLKIT="beos"
-- DSO_LDOPTS='-nostart -Wl,-h -Wl,$@'
-+ DSO_LDOPTS='-nostart'
- TK_LIBS='-lbe -lroot'
- LIBS="$LIBS -lbe"
- if test "$COMPILE_ENVIRONMENT"; then
-@@ -5871,16 +5871,16 @@
- *-hpux*)
- DLL_SUFFIX=".sl"
- if test ! "$GNU_CC"; then
-- DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
-+ DSO_LDOPTS='-b -Wl,+s'
- DSO_CFLAGS=""
- DSO_PIC_CFLAGS="+Z"
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -L$(DIST)/bin -o $@'
- MKCSHLIB='$(LD) -b +s -L$(DIST)/bin -o $@'
- CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on"
- else
-- DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib'
-- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-+ DSO_LDOPTS='-b -E +s'
-+ MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
-+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
- fi
- MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
- cat >> confdefs.h <<\EOF
-@@ -5895,11 +5895,16 @@
- EOF
-
- DSO_LDOPTS='-elf -shared'
-+
- if test "$GNU_CC"; then
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
- MKSHLIB_FORCE_ALL='-Wl,-all'
- MKSHLIB_UNFORCE_ALL='-Wl,-none'
- CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
- else
-+ MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- MKSHLIB_FORCE_ALL='-all'
- MKSHLIB_UNFORCE_ALL='-none'
- fi
-@@ -6338,7 +6343,7 @@
- if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then
- DLL_SUFFIX=".so"
- DSO_PIC_CFLAGS='-fPIC -DPIC'
-- DSO_LDOPTS='-shared -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX)'
-+ DSO_LDOPTS='-shared'
- BIN_FLAGS='-Wl,--export-dynamic'
- else
- DSO_PIC_CFLAGS='-fPIC -DPIC'
-@@ -6351,6 +6356,8 @@
- if test "$LIBRUNPATH"; then
- DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
- fi
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
- ;;
-
- *-nto*)
-@@ -6571,17 +6578,19 @@
-
- alpha*-*-osf*)
- if test "$GNU_CC"; then
-- DSO_LDOPTS='-shared -Wl,-soname -Wl,$@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
-+
- else
- MOZ_DEBUG_FLAGS='-g'
- ASFLAGS='-I$(topsrcdir)/xpcom/reflect/xptcall/public -g'
- CFLAGS="$CFLAGS -ieee"
- CXXFLAGS="$CXXFLAGS "'-noexceptions -ieee -ptr $(DIST)/cxx_repository'
-- DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@ -update_registry $(DIST)/so_locations'
-+ DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations'
- DSO_CFLAGS=
- DSO_PIC_CFLAGS=
-- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
- MKSHLIB_FORCE_ALL='-all'
- MKSHLIB_UNFORCE_ALL='-none'
- cat >> confdefs.h <<\EOF
-@@ -6634,7 +6643,7 @@
-
- CXXFLAGS="$CXXFLAGS -I/usr/include/CC"
- if test ! "$GNU_CC"; then
-- DSO_LDOPTS='-G -h $@'
-+ DSO_LDOPTS='-G'
- fi
- ;;
-
-@@ -6655,11 +6664,11 @@
- CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife"
- LDFLAGS="-xildoff -zlazyload -zcombreloc $LDFLAGS"
- MOZ_OPTIMIZE_FLAGS="-xO4"
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@'
-- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
-+ KCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
- MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
- MKSHLIB_UNFORCE_ALL=''
-- DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
-+ DSO_LDOPTS='-G -Qoption ld -z,muldefs'
- AR_LIST="$AR t"
- AR_EXTRACT="$AR x"
- AR_DELETE="$AR d"
-@@ -6717,7 +6726,7 @@
-
- else
- ASFLAGS="$ASFLAGS -fPIC"
-- DSO_LDOPTS='-G -h $@'
-+ DSO_LDOPTS='-G'
- _WARNINGS_CFLAGS=''
- _WARNINGS_CXXFLAGS=''
- if test "$OS_RELEASE" = "5.3"; then
-@@ -7708,13 +7717,39 @@
- fi
-
- echo "$ac_t""$ac_cv_visibility_hidden" 1>&6
-- if test "$ac_cv_visibility_hidden" = "yes"; then
-- cat >> confdefs.h <<\EOF
-+ if test "$ac_cv_visibility_hidden" = "yes"; then
-+ cat >> confdefs.h <<\EOF
- #define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
- EOF
-
-+
-+ echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
-+echo "configure:7728: checking for visibility(default) attribute" >&5
-+if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.c <<EOF
-+ int foo __attribute__ ((visibility ("default"))) = 1;
-+EOF
-+ ac_cv_visibility_default=no
-+ if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-+ if ! grep '\.hidden.*foo' conftest.s >/dev/null; then
-+ ac_cv_visibility_default=yes
-+ fi
-+ fi
-+ rm -f conftest.cs
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_visibility_default" 1>&6
-+ if test "$ac_cv_visibility_default" = "yes"; then
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_VISIBILITY_ATTRIBUTE 1
-+EOF
-+
-+
- echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
--echo "configure:7710: checking for visibility pragma support" >&5
-+echo "configure:7753: checking for visibility pragma support" >&5
- if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7738,15 +7773,41 @@
-
- echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
- if test "$ac_cv_visibility_pragma" = "yes"; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_VISIBILITY_PRAGMA 1
-+ echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
-+echo "configure:7778: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
-+if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.c <<EOF
-+#pragma GCC visibility push(hidden)
-+#pragma GCC visibility push(default)
-+#include <string.h>
-+#pragma GCC visibility pop
-+
-+__attribute__ ((visibility ("default"))) void Func() {
-+ char c[100];
-+ memset(c, 0, sizeof(c));
-+}
- EOF
-+ ac_cv_have_visibility_builtin_bug=no
-+ if ! ${CC-cc} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o conftest.so conftest.c >/dev/null 2>&1; then
-+ ac_cv_have_visibility_builtin_bug=yes
-+ fi
-+ rm -f conftest.{c,so}
-+
-+fi
-
-- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-- WRAP_SYSTEM_INCLUDES=1
-- fi
-- fi
--fi # GNU_CC
-+echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
-+ if test "$ac_cv_have_visibility_builtin_bug" = "no"; then
-+ VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-+ WRAP_SYSTEM_INCLUDES=1
-+ else
-+ VISIBILITY_FLAGS='-fvisibility=hidden'
-+ fi # have visibility pragma bug
-+ fi # have visibility pragma
-+ fi # have visibility(default) attribute
-+ fi # have visibility(hidden) attribute
-+fi # GNU_CC
-
-
-
---- mozilla/configure.in.visibility 2006-08-30 11:49:01.000000000 -0400
-+++ mozilla/configure.in 2006-08-30 11:49:01.000000000 -0400
-@@ -1103,9 +1103,9 @@
- dnl GNU specific defaults
- dnl ========================================================
- if test "$GNU_CC"; then
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-- DSO_LDOPTS='-shared -Wl,-h -Wl,$@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
-+ DSO_LDOPTS='-shared'
- DSO_CFLAGS=''
- DSO_PIC_CFLAGS='-fPIC'
- _MOZ_RTTI_FLAGS_ON=${_COMPILER_PREFIX}-frtti
-@@ -1130,9 +1130,9 @@
- _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
- _USE_CPP_INCLUDE_FLAG=1
- else
-- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-- DSO_LDOPTS='-shared -h $@'
-+ MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-+ DSO_LDOPTS='-shared'
- DSO_CFLAGS=''
- DSO_PIC_CFLAGS='-KPIC'
- _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
-@@ -1360,9 +1360,9 @@
-
- *-beos*)
- no_x=yes
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
- _PLATFORM_DEFAULT_TOOLKIT="beos"
-- DSO_LDOPTS='-nostart -Wl,-h -Wl,$@'
-+ DSO_LDOPTS='-nostart'
- TK_LIBS='-lbe -lroot'
- LIBS="$LIBS -lbe"
- if test "$COMPILE_ENVIRONMENT"; then
-@@ -1442,16 +1442,16 @@
- *-hpux*)
- DLL_SUFFIX=".sl"
- if test ! "$GNU_CC"; then
-- DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
-+ DSO_LDOPTS='-b -Wl,+s'
- DSO_CFLAGS=""
- DSO_PIC_CFLAGS="+Z"
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -L$(DIST)/bin -o $@'
- MKCSHLIB='$(LD) -b +s -L$(DIST)/bin -o $@'
- CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on"
- else
-- DSO_LDOPTS='-b -E +s -L$(DIST)/bin -L$(DIST)/lib'
-- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-+ DSO_LDOPTS='-b -E +s'
-+ MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
-+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
- fi
- MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
-@@ -1460,11 +1460,16 @@
- *-irix5*)
- AC_DEFINE(IRIX)
- DSO_LDOPTS='-elf -shared'
-+
- if test "$GNU_CC"; then
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
- MKSHLIB_FORCE_ALL='-Wl,-all'
- MKSHLIB_UNFORCE_ALL='-Wl,-none'
- CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
- else
-+ MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-+ MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- MKSHLIB_FORCE_ALL='-all'
- MKSHLIB_UNFORCE_ALL='-none'
- fi
-@@ -1818,7 +1823,7 @@
- if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then
- DLL_SUFFIX=".so"
- DSO_PIC_CFLAGS='-fPIC -DPIC'
-- DSO_LDOPTS='-shared -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX)'
-+ DSO_LDOPTS='-shared'
- BIN_FLAGS='-Wl,--export-dynamic'
- else
- DSO_PIC_CFLAGS='-fPIC -DPIC'
-@@ -1831,6 +1836,8 @@
- if test "$LIBRUNPATH"; then
- DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
- fi
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
- ;;
-
- *-nto*)
-@@ -1994,17 +2001,19 @@
-
- alpha*-*-osf*)
- if test "$GNU_CC"; then
-- DSO_LDOPTS='-shared -Wl,-soname -Wl,$@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
-+
- else
- MOZ_DEBUG_FLAGS='-g'
- ASFLAGS='-I$(topsrcdir)/xpcom/reflect/xptcall/public -g'
- CFLAGS="$CFLAGS -ieee"
- CXXFLAGS="$CXXFLAGS "'-noexceptions -ieee -ptr $(DIST)/cxx_repository'
-- DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@ -update_registry $(DIST)/so_locations'
-+ DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations'
- DSO_CFLAGS=
- DSO_PIC_CFLAGS=
-- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
- MKSHLIB_FORCE_ALL='-all'
- MKSHLIB_UNFORCE_ALL='-none'
- dnl Might fix the libxpcom.so breakage on this platform as well....
-@@ -2036,7 +2045,7 @@
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- CXXFLAGS="$CXXFLAGS -I/usr/include/CC"
- if test ! "$GNU_CC"; then
-- DSO_LDOPTS='-G -h $@'
-+ DSO_LDOPTS='-G'
- fi
- ;;
-
-@@ -2052,11 +2061,11 @@
- CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife"
- LDFLAGS="-xildoff -zlazyload -zcombreloc $LDFLAGS"
- MOZ_OPTIMIZE_FLAGS="-xO4"
-- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@'
-- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
-+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
-+ KCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
- MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
- MKSHLIB_UNFORCE_ALL=''
-- DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
-+ DSO_LDOPTS='-G -Qoption ld -z,muldefs'
- AR_LIST="$AR t"
- AR_EXTRACT="$AR x"
- AR_DELETE="$AR d"
-@@ -2086,7 +2095,7 @@
- AC_LANG_RESTORE
- else
- ASFLAGS="$ASFLAGS -fPIC"
-- DSO_LDOPTS='-G -h $@'
-+ DSO_LDOPTS='-G'
- _WARNINGS_CFLAGS=''
- _WARNINGS_CXXFLAGS=''
- if test "$OS_RELEASE" = "5.3"; then
-@@ -2444,8 +2453,25 @@
- fi
- rm -f conftest.[cs]
- ])
-- if test "$ac_cv_visibility_hidden" = "yes"; then
-- AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-+ if test "$ac_cv_visibility_hidden" = "yes"; then
-+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-+
-+ AC_CACHE_CHECK(for visibility(default) attribute,
-+ ac_cv_visibility_default,
-+ [cat > conftest.c <<EOF
-+ int foo __attribute__ ((visibility ("default"))) = 1;
-+EOF
-+ ac_cv_visibility_default=no
-+ if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-+ if ! grep '\.hidden.*foo' conftest.s >/dev/null; then
-+ ac_cv_visibility_default=yes
-+ fi
-+ fi
-+ rm -f conftest.[cs]
-+ ])
-+ if test "$ac_cv_visibility_default" = "yes"; then
-+ AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
-+
- AC_CACHE_CHECK(for visibility pragma support,
- ac_cv_visibility_pragma,
- [cat > conftest.c <<EOF
-@@ -2465,12 +2491,35 @@
- rm -f conftest.[cs]
- ])
- if test "$ac_cv_visibility_pragma" = "yes"; then
-- AC_DEFINE(HAVE_VISIBILITY_PRAGMA)
-- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-- WRAP_SYSTEM_INCLUDES=1
-- fi
-- fi
--fi # GNU_CC
-+ AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
-+ ac_cv_have_visibility_builtin_bug,
-+ [cat > conftest.c <<EOF
-+#pragma GCC visibility push(hidden)
-+#pragma GCC visibility push(default)
-+#include <string.h>
-+#pragma GCC visibility pop
-+
-+__attribute__ ((visibility ("default"))) void Func() {
-+ char c[[100]];
-+ memset(c, 0, sizeof(c));
-+}
-+EOF
-+ ac_cv_have_visibility_builtin_bug=no
-+ if ! ${CC-cc} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o conftest.so conftest.c >/dev/null 2>&1; then
-+ ac_cv_have_visibility_builtin_bug=yes
-+ fi
-+ rm -f conftest.{c,so}
-+ ])
-+ if test "$ac_cv_have_visibility_builtin_bug" = "no"; then
-+ VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-+ WRAP_SYSTEM_INCLUDES=1
-+ else
-+ VISIBILITY_FLAGS='-fvisibility=hidden'
-+ fi # have visibility pragma bug
-+ fi # have visibility pragma
-+ fi # have visibility(default) attribute
-+ fi # have visibility(hidden) attribute
-+fi # GNU_CC
-
- AC_SUBST(WRAP_SYSTEM_INCLUDES)
- AC_SUBST(VISIBILITY_FLAGS)
---- mozilla/js/src/jstypes.h.visibility 2005-09-18 00:35:05.000000000 -0400
-+++ mozilla/js/src/jstypes.h 2006-08-30 11:49:01.000000000 -0400
-@@ -109,7 +109,7 @@
-
- #else /* Unix */
-
--#ifdef HAVE_VISIBILITY_PRAGMA
-+#ifdef HAVE_VISIBILITY_ATTRIBUTE
- #define JS_EXTERNAL_VIS __attribute__((visibility ("default")))
- #else
- #define JS_EXTERNAL_VIS
---- mozilla/modules/zlib/src/mozzconf.h.visibility 2005-08-04 15:14:14.000000000 -0400
-+++ mozilla/modules/zlib/src/mozzconf.h 2006-08-30 11:49:01.000000000 -0400
-@@ -41,7 +41,7 @@
- #undef ZLIB_DLL
- #endif
-
--#ifdef HAVE_VISIBILITY_PRAGMA
-+#ifdef HAVE_VISIBILITY_ATTRIBUTE
- #define ZEXTERN __attribute__((visibility ("default"))) extern
- #endif
-
---- mozilla/modules/libreg/include/NSReg.h.visibility 2004-12-15 00:52:38.000000000 -0500
-+++ mozilla/modules/libreg/include/NSReg.h 2006-08-30 11:49:01.000000000 -0400
-@@ -129,7 +129,7 @@
- #endif
- #elif defined XP_MAC
- #define VR_INTERFACE(__x) __declspec(export) __x
--#elif defined (HAVE_VISIBILITY_PRAGMA)
-+#elif defined (HAVE_VISIBILITY_ATTRIBUTE)
- #define VR_INTERFACE(type) __attribute__ ((visibility ("default"))) type
- #else
- #define VR_INTERFACE(type) type
--- mozilla/config/system-headers.visibility 2005-06-17 17:03:42.000000000 -0400
+++ mozilla/config/system-headers 2006-08-30 17:57:48.000000000 -0400
@@ -66,6 +66,7 @@
Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- firefox-redhat-default-prefs.js 27 Jan 2006 03:35:21 -0000 1.6
+++ firefox-redhat-default-prefs.js 24 Oct 2006 18:57:43 -0000 1.7
@@ -2,7 +2,9 @@
pref("app.update.autoInstallEnabled", false);
pref("browser.display.use_system_colors", true);
pref("browser.link.open_external", 3);
-pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties");
+pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html");
+pref("startup.homepage_override_url", "file:///usr/share/doc/HTML/index.html");
+pref("startup.homepage_welcome_url, "file:///usr/share/doc/HTML/index.html");
pref("general.smoothScroll", true);
pref("general.useragent.vendor", "Fedora");
pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- firefox.sh.in 3 Sep 2006 22:24:52 -0000 1.14
+++ firefox.sh.in 24 Oct 2006 18:57:43 -0000 1.15
@@ -42,7 +42,7 @@
MOZ_LIB_DIR="/usr/lib64"
fi
MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
-MOZ_PROGRAM="$MOZ_DIST_BIN/firefox"
+MOZ_PROGRAM="$MOZ_DIST_BIN/firefox-bin"
MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client"
MOZ_CLIENT_PROGRAM_PARAM="-a firefox"
Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- firefox.spec 11 Oct 2006 20:54:47 -0000 1.158
+++ firefox.spec 24 Oct 2006 18:57:43 -0000 1.159
@@ -10,18 +10,18 @@
Summary: Mozilla Firefox Web browser.
Name: firefox
-Version: 1.5.0.7
-Release: 7%{?dist}
+Version: 2.0
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL
Group: Applications/Internet
%if %{official_branding}
%define tarball firefox-%{version}-source.tar.bz2
%else
-%define tarball firefox-1.5rc3-source.tar.bz2
+%define tarball firefox-2.0rc3-source.tar.bz2
%endif
Source0: %{tarball}
-Source2: firefox-langpacks-%{version}-20060911.tar.bz2
+Source2: firefox-langpacks-%{version}-20061024.tar.bz2
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
Source12: firefox-redhat-default-bookmarks.html
@@ -35,6 +35,7 @@
Source101: add-gecko-provides.in
# build patches
+Patch1: firefox-2.0-link-layout.patch
Patch3: firefox-1.1-nss-system-nspr.patch
Patch4: firefox-1.5-with-system-nss.patch
Patch5: firefox-1.5-visibility.patch
@@ -57,6 +58,7 @@
Patch81: firefox-1.5-nopangoxft.patch
Patch82: firefox-1.5-pango-mathml.patch
Patch83: firefox-1.5-pango-cursor-position.patch
+Patch84: firefox-2.0-pango-printing.patch
# Other
Patch100: firefox-1.5-gtk-key-theme-crash.patch
@@ -132,11 +134,12 @@
%prep
%setup -q -n mozilla
-%patch3 -p1
-%patch4 -p1
+%patch1 -p1 -b .link-layout
+#%patch3 -p1
+#%patch4 -p1
%patch5 -p1 -b .visibility
-%patch20 -p0
+#%patch20 -p0
%patch21 -p1
%patch22 -p0
#%patch23 -p0
@@ -147,10 +150,11 @@
%patch40 -p1
%patch42 -p0
%patch81 -p1
-%patch82 -p1
+#%patch82 -p1
%patch83 -p1
+%patch84 -p0
-%patch100 -p0 -b .gtk-key-theme-crash
+#%patch100 -p0 -b .gtk-key-theme-crash
%patch101 -p0 -b .embedwindow-visibility
%patch102 -p0 -b .theme-change
@@ -199,17 +203,10 @@
%install
%{__rm} -rf $RPM_BUILD_ROOT
-cd browser/installer
-%{__make} STRIP=/bin/true
-cd -
+DESTDIR=$RPM_BUILD_ROOT make install
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
-%{__tar} -C $RPM_BUILD_ROOT%{_libdir}/ -xzf dist/%{name}-*linux*.tar.gz
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{mozappdir}
-
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}-*linux*.tar
-
%{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor mozilla \
@@ -317,7 +314,10 @@
GECKO_VERSION=$(./config/milestone.pl --topsrcdir='.')
%{__cat} %{SOURCE101} | %{__sed} -e "s/@GECKO_VERSION@/$GECKO_VERSION/g" > \
%{_builddir}/add-gecko-provides
-chmod +x %{_builddir}/add-gecko-provides
+chmod 700 %{_builddir}/add-gecko-provides
+
+# Copy over the LICENSE
+install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
# ghost files
touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
@@ -346,6 +346,7 @@
%files
%defattr(-,root,root,-)
%{_bindir}/firefox
+%exclude %{_bindir}/firefox-config
%{_mandir}/man1/*
%{_datadir}/applications/mozilla-%{name}.desktop
%{_datadir}/pixmaps/firefox.png
@@ -355,9 +356,10 @@
%dir %{mozappdir}
%{mozappdir}/LICENSE
-%{mozappdir}/README.txt
%{mozappdir}/*.properties
%{mozappdir}/chrome
+%{mozappdir}/chrome.manifest
+%{mozappdir}/dictionaries
%dir %{mozappdir}/components
%ghost %{mozappdir}/components/compreg.dat
%ghost %{mozappdir}/components/xpti.dat
@@ -373,21 +375,20 @@
%{mozappdir}/res
%{mozappdir}/searchplugins
%{mozappdir}/*.so
-%{mozappdir}/firefox
%{mozappdir}/firefox-bin
%{mozappdir}/firefox-xremote-client
%{mozappdir}/mozilla-xremote-client
%{mozappdir}/run-mozilla.sh
+%{mozappdir}/regxpcom
# XXX See if these are needed still
-%{mozappdir}/dependentlibs.list
%{mozappdir}/updater*
-%{mozappdir}/removed-files
%if %{build_devel_package}
%files devel
%defattr(-,root,root)
%{_datadir}/idl/firefox-%{version}
%{_includedir}/firefox-%{version}
+%{mozappdir}/TestGtkEmbed
%{mozappdir}/xpcshell
%{mozappdir}/xpicleanup
%{mozappdir}/xpidl
@@ -404,6 +405,10 @@
#---------------------------------------------------------------------
%changelog
+* Tue Oct 24 2006 Christopher Aillon <caillon at redhat.com> 2.0-1
+- Update to 2.0
+- Add patch from Behdad to fix pango printing.
+
* Wed Oct 11 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.7-7
- Add virtual provides for gecko applications.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 15 Sep 2006 01:42:31 -0000 1.33
+++ sources 24 Oct 2006 18:57:43 -0000 1.34
@@ -1,2 +1,2 @@
-e013df5f64d05cc968555a731cf2b63e firefox-1.5.0.7-source.tar.bz2
-207acc3c039519c774177b07422909f1 firefox-langpacks-1.5.0.7-20060911.tar.bz2
+03709c15cba0e0375ff5336d538f77e7 firefox-2.0-source.tar.bz2
+b64f5d03177f15613bdd113a3fa8be91 firefox-langpacks-2.0-20061024.tar.bz2
- Previous message (by thread): rpms/system-config-kickstart/devel sources, 1.40, 1.41 system-config-kickstart.spec, 1.45, 1.46
- Next message (by thread): rpms/audit/FC-5 .cvsignore, 1.60, 1.61 audit.spec, 1.93, 1.94 sources, 1.70, 1.71 audit-1.2.8-defines.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list