import Firefox, 3.6.3plugin1

author: Remi Collet <fedora@famillecollet.com> 2010-05-13 14:29:48 +0200
committer: Remi Collet <fedora@famillecollet.com> 2010-05-13 14:29:48 +0200
commit: 139f64c6307428ff5ccc8a6e3fd5fa607f2f95ef (patch)
tree: c9bc8c8ce31f5a864220fc11802db926eb207c0a
16 files changed, 1331 insertions, 0 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1e65467
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../common/Makefile
+
diff --git a/find-external-requires b/find-external-requires
new file mode 100755
index 0000000..d79db1d
--- /dev/null
+++ b/find-external-requires
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Finds requirements provided outside of the current file set
+
+filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
+
+provides=`echo $filelist | /usr/lib/rpm/find-provides`
+
+{
+for f in $filelist ; do
+	echo $f | /usr/lib/rpm/find-requires | while read req ; do
+		found=0
+		for p in $provides ; do
+			if [ "$req" = "$p" ]; then
+				found=1
+			fi
+		done
+		if [ "$found" = "0" ]; then
+			echo $req
+		fi
+	done
+done
+} | sort -u
+\ No newline at end of file
diff --git a/firefox-bookmarks.html b/firefox-bookmarks.html
new file mode 100644
index 0000000..905991c
--- /dev/null
+++ b/firefox-bookmarks.html
@@ -0,0 +1,45 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<!-- This is an automatically generated file.
+     It will be read and overwritten.
+     DO NOT EDIT! -->
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1 LAST_MODIFIED="1130967916">Bookmarks</H1>
+
+<DL><p>
+    <DT><H3 ADD_DATE="961112773" LAST_MODIFIED="1176675480" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
+    <DL><p>
+        <DT><A HREF="http://docs.fedoraproject.org/release-notes/" ADD_DATE="1158286602" LAST_VISIT="1158286627" LAST_MODIFIED="1176675660" LAST_CHARSET="UTF-8" ID="rdf:#$b7+Ar2">Release Notes</A>
+<DD>Fedora Release Notes
+        <DT><H3 ADD_DATE="1130967903" LAST_MODIFIED="1176675263" ID="rdf:#$A80oc3">Fedora Project</H3>
+        <DL><p>
+            <DT><A HREF="http://fedoraproject.org/" ADD_DATE="1158286779" LAST_VISIT="1176675005" LAST_MODIFIED="1176675285" LAST_CHARSET="UTF-8" ID="rdf:#$c7+Ar2">Fedora Project</A>
+<DD>Starting point for the Fedora Project
+            <DT><A HREF="http://forums.fedoraforum.org/" ADD_DATE="1130967896" LAST_VISIT="1158286671" LAST_MODIFIED="1176675301" LAST_CHARSET="ISO-8859-1" ID="rdf:#$z80oc3">Fedora Forum</A>
+<DD>Fedora Community Forums
+            <DT><A HREF="http://fedoraproject.org/wiki/FWN" ADD_DATE="1176675071" LAST_VISIT="1176675075" LAST_MODIFIED="1176675310" LAST_CHARSET="ISO-8859-1" ID="rdf:#$NKnQZ2">Fedora Weekly News</A>
+<DD>Fedora Weekly News
+            <DT><A HREF="http://www.fedoraunity.org/" ADD_DATE="1176675136" LAST_VISIT="1176675760" LAST_MODIFIED="1176675183" LAST_CHARSET="UTF-8" ID="rdf:#$OKnQZ2">Fedora Unity Project</A>
+            <DT><A HREF="http://planet.fedoraproject.org/" ADD_DATE="1176675201" LAST_VISIT="1176675207" LAST_MODIFIED="1176675329" LAST_CHARSET="UTF-8" ID="rdf:#$PKnQZ2">Fedora People</A>
+<DD>Blogs by Fedora Contributors
+            <DT><A HREF="http://fedoraproject.org/wiki/Communicate" ADD_DATE="1141318585" LAST_VISIT="1176674053" LAST_MODIFIED="1141318713" LAST_CHARSET="UTF-8" ID="rdf:#$ojXGd3">More Support &amp; Discussion</A>
+        </DL><p>
+        <DT><H3 ADD_DATE="1176674113" LAST_MODIFIED="1176678438" ID="rdf:#$jKnQZ2">Red Hat</H3>
+        <DL><p>
+            <DT><A HREF="http://www.redhatmagazine.com/" ADD_DATE="1176678438" LAST_VISIT="1176678446" LAST_MODIFIED="1176678459" LAST_CHARSET="UTF-8" ID="rdf:#$+T+iZ2">Red Hat Magazine</A>
+            <DT><A HREF="http://mugshot.org/main" ADD_DATE="1176674240" LAST_VISIT="1176674248" LAST_CHARSET="UTF-8" ID="rdf:#$sKnQZ2">Mugshot</A>
+            <DT><A HREF="http://www.redhat.com/" ADD_DATE="1176674148" LAST_VISIT="1176674165" LAST_MODIFIED="1176674158" LAST_CHARSET="ISO-8859-1" ID="rdf:#$qKnQZ2">Red Hat</A>
+            <DT><A HREF="http://www.jboss.com/" ADD_DATE="1176674189" LAST_VISIT="1176674209" LAST_MODIFIED="1176674200" LAST_CHARSET="UTF-8" ID="rdf:#$rKnQZ2">JBoss</A>
+        </DL><p>
+        <DT><H3 ADD_DATE="1176674388" LAST_MODIFIED="1176674871" ID="rdf:#$tKnQZ2">Free Content</H3>
+        <DL><p>
+            <DT><A HREF="http://www.wikipedia.org/" ADD_DATE="1176674401" LAST_VISIT="1176674649" LAST_MODIFIED="1176675382" LAST_CHARSET="UTF-8" ID="rdf:#$uKnQZ2">Wikipedia</A>
+<DD>Online Encyclopedia
+            <DT><A HREF="http://www.jamendo.com/" ADD_DATE="1176674604" LAST_VISIT="1176674681" LAST_MODIFIED="1176675644" LAST_CHARSET="UTF-8" ID="rdf:#$JKnQZ2">Jamendo</A>
+            <DT><A HREF="http://magnatune.com/" ADD_DATE="1176674748" LAST_VISIT="1176675508" LAST_MODIFIED="1176675639" LAST_CHARSET="ISO-8859-1" ID="rdf:#$KKnQZ2">Magnatune</A>
+            <DT><A HREF="http://freesound.iua.upf.edu/" ADD_DATE="1176674764" LAST_VISIT="1176674804" LAST_MODIFIED="1176674833" LAST_CHARSET="UTF-8" ID="rdf:#$LKnQZ2">The Freesound Project</A>
+            <DT><A HREF="http://creativecommons.org/" ADD_DATE="1176674776" LAST_VISIT="1176675582" LAST_MODIFIED="1176675626" LAST_CHARSET="UTF-8" ID="rdf:#$MKnQZ2">Creative Commons</A>
+<DD>Free Content Licenses
+        </DL><p>
+    </DL><p>
+</DL><p>
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
new file mode 100644
index 0000000..4aab739
--- /dev/null
+++ b/firefox-redhat-default-prefs.js
@@ -0,0 +1,12 @@
+pref("app.update.auto", false);
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("browser.backspace_action",            2);
+pref("browser.display.use_system_colors",   true);
+pref("browser.download.folderList",         1);
+pref("browser.link.open_external",          3);
+pref("browser.shell.checkDefaultBrowser",   false);
+pref("general.smoothScroll",                true);
+pref("general.useragent.vendor", "Fedora");
+pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
+pref("intl.locale.matchOS", true);
diff --git a/firefox-version.patch b/firefox-version.patch
new file mode 100644
index 0000000..892f40c
--- /dev/null
+++ b/firefox-version.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-1.9.2/browser/installer/Makefile.in.version mozilla-1.9.2/browser/installer/Makefile.in
+--- mozilla-1.9.2/browser/installer/Makefile.in.version	2009-11-09 01:33:57.000000000 +0100
++++ mozilla-1.9.2/browser/installer/Makefile.in	2009-11-13 13:48:15.000000000 +0100
+@@ -43,6 +43,8 @@ VPATH		= @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__"
++
+ NO_PKG_FILES = \
+ 	$(MOZ_APP_NAME)-config \
+ 	$(MOZ_APP_NAME)-bin.elf \
diff --git a/firefox.1 b/firefox.1
new file mode 100644
index 0000000..2086325
--- /dev/null
+++ b/firefox.1
@@ -0,0 +1,125 @@
+.TH FIREFOX 1 "August 07, 2001" firefox "Linux User's Manual"
+.SH NAME
+firefox \- a Web browser for X11 derived from the Mozilla browser
+
+.SH SYNOPSIS
+.B firefox
+[\fIOPTIONS\fR] [\fIURL\fR]
+
+.B firefox-bin
+[\fIOPTIONS\fR] [\fIURL\fR]
+
+.SH DESCRIPTION
+\fBMozilla Firefox\fR is an open-source web browser, designed for
+standards compliance, performance and portability.
+
+.SH USAGE
+\fBfirefox\fR is a simple shell script that will set up the
+environment for the actual executable, \fBfirefox-bin\fR.
+
+.SH OPTIONS
+A summary of the options supported by \fBfirefox\fR is included below.
+
+.SS "GTK options"
+\fB\-\-gdk-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to set
+.TP
+\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to unset
+.TP
+\fB\-\-gtk-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to set
+.TP
+\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to unset
+.TP
+\fB\-\-gtk-module=\fR\fIMODULE\fR
+Load an additional Gtk module
+
+.SS "X11 options"
+.TP
+.BI \-\-display= DISPLAY
+X display to use
+.TP
+.B \--sync
+Make X calls synchronous
+.TP
+.B \-\-no-xshm
+Don't use X shared memory extension
+.TP
+.BI \-\-xim-preedit= STYLE
+.TP
+.BI \-\-xim-status= STYLE
+.TP
+.B \-\-g-fatal-warnings
+Make all warnings fatal
+
+.SS "Firefox options"
+.TP
+\fB\-height\fR \fIvalue\fR
+Set height of startup window to \fIvalue\fR.
+.TP
+.B \-h, \-help
+Show summary of options.
+.TP
+.B \-installer
+Start with 4.x migration window.
+.TP
+\fB\-width\fR \fIvalue\fR
+Set width of startup window to \fIvalue\fR.
+.TP
+.B \-v, \-version
+Print \fB/usr/bin/firefox-bin\fR version.
+.TP
+\fB\-CreateProfile\fR \fIprofile\fR
+Create \fIprofile\fR.
+.TP
+\fB\-P\fR \fIprofile\fR
+Start with \fIprofile\fR.
+.TP
+.B \-ProfileWizard
+Start with profile wizard.
+.TP
+.B \-ProfileManager
+Start with profile manager.
+.TP
+.B \-SelectProfile
+Start with profile selection dialog.
+.TP
+\fB\-lang\fR \fIlang-region\fR
+Start with \fIlang-region\fR resources.
+.TP
+\fB\-remote\fR \fIcommand\fR
+Execute \fIcommand\fR in an already running Firefox process.  For more info,
+see: \fIhttp://www.mozilla.org/unix/remote.html\fR
+.TP
+.B \-splash
+Enable splash screen.
+.TP
+.B \-jsconsole
+Start with Javascript Console
+.TP
+\fB\-chrome\fR \fIurl\fR
+Load the specified chrome.
+.TP
+
+.SH FILES
+\fI/usr/bin/firefox\fR - shell script wrapping
+\fBfirefox\fR
+.br
+\fI/usr/lib/mozilla/firefox-bin\fR - \fBfirefox\fR
+executable
+
+.SH VERSION
+1.0
+
+.SH BUGS
+To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR
+
+.SH "SEE ALSO"
+.BR mozilla(1)
+
+.SH AUTHORS
+.TP
+.B The Mozilla Organization
+.I http://www.mozilla.org/about.html
diff --git a/firefox.spec b/firefox.spec
new file mode 100644
index 0000000..cb0bc10
--- /dev/null
+++ b/firefox.spec
@@ -0,0 +1,623 @@
+%define nspr_version 4.8
+%define nss_version 3.12.3
+%define cairo_version 1.8.8
+%define lcms_version 1.18
+%define freetype_version 2.1.9
+%define sqlite_version 3.6.16
+
+%define homepage http://start.fedoraproject.org/
+%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
+%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
+
+%define internal_version 3.6
+
+%define mozappdir            %{_libdir}/firefox-%{internal_version}
+
+#define tarballdir mozilla-1.9.2
+%define tarballdir firefox-lorentz
+
+%define official_branding    1
+%define build_langpacks      1
+
+%if ! %{official_branding}
+%define cvsdate 20080327
+%define nightly .cvs%{cvsdate}
+%endif
+
+%define relcan plugin1
+%define firefox firefox
+
+Summary:        Mozilla Firefox Web browser
+Name:           firefox
+Version:        3.6.3
+Release:        2.plugin1%{?dist}
+URL:            http://www.mozilla.org/projects/firefox/
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
+Group:          Applications/Internet
+%if %{official_branding}
+## hg clone -u FIREFOX_3_6_3_RELEASE http://hg.mozilla.org/releases/mozilla-1.9.2
+## tar cjf firefox-3.6.3.source.tar.bz2 --exclude .hg mozilla-1.9.2
+%define tarball firefox-%{version}%{?relcan}.source.tar.bz2
+%else
+%define tarball firefox-3.1b3-source.tar.bz2
+%endif
+Source0:        %{tarball}
+%if %{build_langpacks}
+Source2:        firefox-langpacks-%{version}%{?relcan}-20100410.tar.bz2
+%endif
+Source12:       firefox-redhat-default-prefs.js
+# firefox3.destop without translation to allow change name
+Source20:       firefox3.desktop
+Source21:       firefox36.sh.in
+Source23:       firefox.1
+Source100:      find-external-requires
+
+Source200:      firefox-bookmarks.html
+
+# build patches
+Patch0:         firefox-version.patch
+Patch1:         mozilla-build.patch
+Patch3:         mozilla-jemalloc.patch
+Patch4:         mozilla-about-firefox-version.patch
+Patch5:         mozilla-jemalloc-526152.patch
+
+# Fedora specific patches
+Patch10:        mozilla-191-pkgconfig.patch
+
+# Upstream patches
+Patch100:       mozilla-ps-pdf-simplify-operators.patch
+
+# Remi
+Patch200:       xulrunner-remi.patch
+
+%if %{official_branding}
+# Required by Mozilla Corporation
+
+
+%else
+# Not yet approved by Mozillla Corporation
+
+
+%endif
+
+# ---------------------------------------------------
+
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+# BR from Firefox
+BuildRequires:  zip
+BuildRequires:  libIDL-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gtk2-devel
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  krb5-devel
+BuildRequires:  pango-devel
+BuildRequires:  freetype-devel >= 2.1.9
+BuildRequires:  libXt-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  startup-notification-devel
+%ifarch %{ix86} x86_64
+BuildRequires:  wireless-tools-devel
+%endif
+
+# BR from Xulrunner
+%if %{fedora} >= 12
+BuildRequires:  sqlite-devel >= %{sqlite_version}
+%endif
+%if %{fedora} >= 11
+BuildRequires:  nspr-devel >= %{nspr_version}
+BuildRequires:  nss-devel >= %{nss_version}
+BuildRequires:  hunspell-devel
+BuildRequires:  cairo-devel >= %{cairo_version}
+%endif
+%if %{fedora} >= 10
+BuildRequires:  libnotify-devel
+%endif
+%if %{fedora} >= 9
+BuildRequires:  lcms-devel >= %{lcms_version}
+%endif
+%if %{fedora} >= 7
+BuildRequires:  system-bookmarks
+%endif
+BuildRequires:  libpng-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  zip
+BuildRequires:  bzip2-devel
+BuildRequires:  zlib-devel
+BuildRequires:  libIDL-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  libgnome-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  krb5-devel
+BuildRequires:  pango-devel
+BuildRequires:  freetype-devel >= %{freetype_version}
+BuildRequires:  libXt-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  startup-notification-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  autoconf213
+
+%if %{fedora} >= 7
+Requires:       system-bookmarks
+%endif
+Obsoletes:      mozilla <= 37:1.7.13
+Obsoletes:      firefox36
+Provides:       webclient
+
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE100}
+
+%description
+Mozilla Firefox is an open-source web browser, designed for standards
+compliance, performance and portability.
+
+#---------------------------------------------------------------------
+
+%prep
+%if %{build_langpacks}
+[ -f %{SOURCE2} ] || exit 1
+%endif
+%setup -q -c
+cd %{tarballdir}
+
+sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \
+    > version.patch
+%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
+
+%patch1  -p1 -b .build
+%patch3  -p1 -b .jemalloc
+%patch4  -p1 -b .about-firefox-version
+%patch5  -p1 -b .jemalloc-526152
+
+#%patch10 -p1 -b .pk
+
+%patch100 -p1 -b .ps-pdf-simplify-operators
+
+%patch200 -p1 -b .remi
+
+%{__rm} -f .mozconfig
+
+cat <<EOF_MOZCONFIG | tee .mozconfig 
+. \$topsrcdir/browser/config/mozconfig
+
+# --with-system-png is disabled because Mozilla requires APNG support in libpng
+#ac_add_options --with-system-png
+ac_add_options --prefix="\$PREFIX"
+ac_add_options --libdir="\$LIBDIR"
+%if %{fedora} >= 12
+ac_add_options --enable-system-sqlite
+%endif
+%if %{fedora} >= 11
+%if "%{relcan}" != "plugin1"
+ac_add_options --with-system-nspr
+%endif
+ac_add_options --with-system-nss
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-cairo
+%endif
+%if %{fedora} >= 10
+ac_add_options --enable-libnotify
+%else
+ac_add_options --disable-libnotify
+%endif
+%if %{fedora} >= 9
+ac_add_options --enable-system-lcms
+%endif
+%ifarch ppc ppc64
+ac_add_options --disable-necko-wifi
+%endif
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-pthreads
+ac_add_options --disable-strip
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-xinerama
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-xprint
+ac_add_options --enable-pango
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+ac_add_options --enable-startup-notification
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-crashreporter
+ac_add_options --enable-safe-browsing
+#ac_add_options --enable-extensions=default,python/xpcom
+%if %{official_branding}
+ac_add_options --enable-official-branding
+%endif
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+EOF_MOZCONFIG
+
+#---------------------------------------------------------------------
+
+%build
+cd %{tarballdir}
+
+# Mozilla builds with -Wall with exception of a few warnings which show up
+# everywhere in the code; so, don't override that.
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//')
+export CFLAGS=$MOZ_OPT_FLAGS
+export CXXFLAGS=$MOZ_OPT_FLAGS
+
+export PREFIX='%{_prefix}'
+export LIBDIR='%{_libdir}'
+
+MOZ_SMP_FLAGS=-j1
+%ifnarch ppc ppc64 s390 s390x
+[ -z "$RPM_BUILD_NCPUS" ] && \
+     RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2
+%endif
+
+INTERNAL_GECKO=%{internal_version}
+MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
+
+export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}"
+make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
+
+#---------------------------------------------------------------------
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+cd %{tarballdir}
+
+DESTDIR=$RPM_BUILD_ROOT make install
+
+%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
+
+sed -e "s/^Name=.*/Name=Firefox %{version}%{?relcan}/" \
+    -e "s/firefox/%{name}/" \
+    %{SOURCE20} | tee %{name}.desktop
+
+desktop-file-install --vendor mozilla \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category WebBrowser \
+  --add-category Network \
+  --delete-original %{name}.desktop 
+
+# set up the firefox start script
+%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
+%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{internal_version},g' > \
+  $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name}
+
+# set up our default preferences
+%{__cat} %{SOURCE12} | %{__sed} \
+	-e 's,FIREFOX_RPM_VR,fc%{fedora},g' \
+	-e 's/Fedora/Remi/' > rh-default-prefs
+
+# resolves bug #461880
+%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/browserconfig.properties << EOF
+browser.startup.homepage=%{homepage}
+EOF
+
+# Export correct locale
+%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js << EOF
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+EOF
+%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js
+
+# place the preferences
+%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
+%{__rm} rh-default-prefs
+
+# set up our default bookmarks
+%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html
+%if %{fedora} >= 7
+ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html
+%else
+%{__cp} %{SOURCE200} $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html
+%endif
+
+%{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
+
+%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/firefox-config
+
+#cd $RPM_BUILD_ROOT/%{mozappdir}/chrome
+#find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
+#cd -
+
+#%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js << EOF
+#pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+#EOF
+#%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/firefox-l10n.js
+
+%{__cp} other-licenses/branding/%{firefox}/default16.png \
+        $RPM_BUILD_ROOT/%{mozappdir}/icons/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
+%{__cp} other-licenses/branding/%{firefox}/default16.png \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps
+%{__cp} other-licenses/branding/%{firefox}/default22.png \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
+%{__cp} other-licenses/branding/%{firefox}/default24.png \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+%{__cp} other-licenses/branding/%{firefox}/default32.png \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+%{__cp} other-licenses/branding/%{firefox}/default48.png \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps
+%{__cp} other-licenses/branding/%{firefox}/default256.png \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+
+echo > ../%{name}.lang
+%if %{build_langpacks}
+# Install langpacks
+%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/extensions
+%{__tar} xjf %{SOURCE2}
+for langpack in `ls firefox-langpacks/*.xpi`; do
+  language=`basename $langpack .xpi`
+  extensiondir=$RPM_BUILD_ROOT/%{mozappdir}/extensions/langpack-$language@firefox.mozilla.org
+  %{__mkdir_p} $extensiondir
+  unzip $langpack -d $extensiondir
+  find $extensiondir -type f | xargs chmod 644
+
+  tmpdir=`mktemp -d %{name}.XXXXXXXX`
+  langtmp=$tmpdir/%{name}/langpack-$language
+  %{__mkdir_p} $langtmp
+  jarfile=$extensiondir/chrome/$language.jar
+  unzip $jarfile -d $langtmp
+
+  sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
+         $langtmp/locale/browser-region/region.properties
+
+  find $langtmp -type f | xargs chmod 644
+  %{__rm} -rf $jarfile
+  cd $langtmp
+  zip -r -D $jarfile locale
+  cd -
+  %{__rm} -rf $tmpdir
+
+  language=`echo $language | sed -e 's/-/_/g'`
+  extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"`
+  echo "%%lang($language) $extensiondir" >> ../%{name}.lang
+done
+%{__rm} -rf firefox-langpacks
+%endif # build_langpacks
+
+# System extensions
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}
+
+# Copy over the LICENSE
+%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT/%{mozappdir}
+
+%if %{fedora} >= 7
+# Use the system hunspell dictionaries
+%{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/dictionaries
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries
+%endif
+
+# ghost files
+touch $RPM_BUILD_ROOT/%{mozappdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT/%{mozappdir}/components/xpti.dat
+
+# jemalloc shows up sometimes, but it's not needed here, it's in XR
+#%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/libjemalloc.so
+
+#---------------------------------------------------------------------
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+#---------------------------------------------------------------------
+
+%pre
+echo -e "\nWARNING : This %{name} RPM is not an official Fedora build and it"
+echo -e "overrides the official one. Don't file bugs on Fedora Project.\n"
+echo -e "Use dedicated forums http://forums.famillecollet.com/\n"
+
+%if %{?fedora}%{!?fedora:99} <= 10
+echo -e "WARNING : Fedora %{fedora} is now EOL :"
+echo -e "You should consider upgrading to a supported release.\n"
+%endif
+
+%post
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+update-desktop-database &> /dev/null || :
+
+%preun
+# is it a final removal?
+if [ $1 -eq 0 ]; then
+  %{__rm} -rf %{mozappdir}/components
+  %{__rm} -rf %{mozappdir}/extensions
+  %{__rm} -rf %{mozappdir}/plugins
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_mandir}/man1/*
+%dir %{_datadir}/mozilla/extensions/%{firefox_app_id}
+%dir %{_libdir}/mozilla/extensions/%{firefox_app_id}
+%{_datadir}/applications/mozilla-%{name}.desktop
+%dir %{mozappdir}
+%doc %{mozappdir}/LICENSE
+%doc %{mozappdir}/README.txt
+%{mozappdir}/*.properties
+%{mozappdir}/chrome
+%dir %{mozappdir}/components
+%ghost %{mozappdir}/components/compreg.dat
+%ghost %{mozappdir}/components/xpti.dat
+%{mozappdir}/components/*.so
+%{mozappdir}/components/*.xpt
+%attr(644, root, root) %{mozappdir}/blocklist.xml
+%attr(644, root, root) %{mozappdir}/components/*.js
+%attr(644, root, root) %{mozappdir}/components/components.list
+%{mozappdir}/defaults
+%{mozappdir}/greprefs
+%{mozappdir}/dictionaries
+%dir %{mozappdir}/extensions
+%{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{mozappdir}/icons
+%{mozappdir}/searchplugins
+%{mozappdir}/firefox
+%{mozappdir}/firefox-bin
+%{mozappdir}/modules
+%{mozappdir}/plugins
+%{mozappdir}/res
+%{mozappdir}/*.so
+%if "%{relcan}" == "plugin1"
+%{mozappdir}/mozilla-runtime
+%endif
+%{mozappdir}/mozilla-xremote-client
+%{mozappdir}/platform.ini
+%{mozappdir}/run-mozilla.sh
+%{mozappdir}/application.ini
+%{mozappdir}/.autoreg
+# XXX See if these are needed still
+%{mozappdir}/update*
+%if %{fedora} <= 10
+%{mozappdir}/*.chk
+%endif
+%exclude %{mozappdir}/removed-files
+%exclude %{_includedir}/firefox-%{internal_version}
+%exclude %{_libdir}/firefox-devel-%{internal_version}
+%exclude %{_datadir}/idl/firefox-%{internal_version}
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+#---------------------------------------------------------------------
+
+%changelog
+* Sat Apr 10 2010 Remi Collet <rpms@famillecollet.com> - 3.6.3-2.plugin1
+- update to Firefox "lorentz" 3.6.3plugin1
+
+* Fri Apr 02 2010 Remi Collet <rpms@famillecollet.com> - 3.6.3-1
+- Update to Firefox 3.6.3 (sources from mercurial)
+
+* Tue Mar 23 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-1
+- Update to Firefox 3.6.2
+
+* Thu Mar 18 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-0.3.build3
+- Update to Firefox 3.6.2 Candidate Build 3
+
+* Mon Mar 15 2010 Remi Collet <rpms@famillecollet.com> - 3.6.2-0.1.build1
+- Update to Firefox 3.6.2 Candidate Build 1
+
+* Thu Jan 21 2010 Remi Collet <rpms@famillecollet.com> - 3.6-1
+- Update to Firefox 3.6 Finale
+
+* Sat Jan 09 2010 Remi Collet <rpms@famillecollet.com> - 3.6-0.5.rc1
+- Update to Firefox 3.6 Release Candidate 1
+
+* Thu Dec 17 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.4.beta5
+- Update to Firefox 3.6 Beta 5
+
+* Thu Nov 26 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.4.beta4
+- Update to Firefox 3.6 Beta 4
+
+* Wed Nov 18 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.3.beta3
+- Update to Firefox 3.6 Beta 3
+- switch from firefox36 to firefox
+
+* Tue Nov 10 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.2.beta2
+- Update to Firefox 3.6 Beta 2
+
+* Fri Nov  6 2009 Remi Collet <rpms@famillecollet.com> - 3.6-0.1.beta1
+- Update to Firefox 3.6 Beta 1
+
+* Thu Nov  5 2009 Remi Collet <rpms@famillecollet.com> - 3.5.5-1
+- Update to Firefox 3.5.5 Final Release
+
+* Thu Nov  5 2009 Jan Horak <jhorak@redhat.com> - 3.5.5-1
+- Update to 3.5.5
+
+* Wed Oct 28 2009 Remi Collet <rpms@famillecollet.com> - 3.5.4-1
+- Update to Firefox 3.5.4 Final Release
+
+* Mon Oct 26 2009 Jan Horak <jhorak@redhat.com> - 3.5.4-1
+- Update to 3.5.4
+
+* Wed Sep 9 2009 Remi Collet <rpms@famillecollet.com> - 3.5.3-1
+- Update to Firefox 3.5.3 Final Release
+
+* Mon Sep  7 2009 Jan Horak <jhorak@redhat.com> - 3.5.3-1
+- Updated to 3.5.3.
+
+* Thu Aug 6 2009 Martin Stransky <stransky@redhat.com> - 3.5.2-3
+- Fix for #437596 - Firefox needs to register proper name
+  for session restore.
+
+* Tue Aug 4 2009 Remi Collet <rpms@famillecollet.com> - 3.5.2-1
+- Update to Firefox 3.5.2 Final Release
+
+* Mon Aug 3 2009 Martin Stransky <stransky@redhat.com> - 3.5.2-2
+- Updated to 3.5.2.
+
+* Fri Jul 24 2009 Jan Horak <jhorak@redhat.com> - 3.5.1-3
+- Adjust icons cache update according to template
+
+* Fri Jul 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5.1-1
+- Update to Firefox 3.5.1 Final Release
+
+* Fri Jul 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5.1-0.1.build1
+- Update to Firefox 3.5.1 build1
+
+* Wed Jun 30 2009 Remi Collet <rpms@famillecollet.com> - 3.5-1
+- Update to Firefox 3.5 Final Release
+
+* Wed Jun 27 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.27.rc3
+- Update to Firefox 3.5 RC3
+
+* Wed Jun 24 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.26.rc3.build2
+- Update to Firefox 3.5 RC3 build2
+
+* Fri Jun 19 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.26.rc2
+- Update to Firefox 3.5 RC2
+
+* Thu Jun 18 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.25.rc2.build2
+- Update to Firefox 3.5 RC2 build2
+
+* Wed Jun 17 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.24.rc1
+- Update to Firefox 3.5 RC1
+
+* Tue Jun 16 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.23.rc1.build2
+- Update to Firefox 3.5 RC1 build2
+
+* Sun Jun 14 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.22.rc1.build1
+- Update to Firefox 3.5 RC1 build1
+
+* Thu Jun 11 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.21.beta99
+- Update to Firefox 3.5 Beta 99 (Preview)
+
+* Tue Apr 28 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.2.beta4
+- Update to Firefox 3.5 Beta 4
+
+* Fri Apr 24 2009 Remi Collet <rpms@famillecollet.com> - 3.5-0.1.beta4
+- Update to 3.5b4 build1
+- use system-nss only if Fedora >= 11 (3.12.3)
+
+* Thu Apr 23 2009 Remi Collet <rpms@famillecollet.com> - 3.1-0.1.beta3
+- First Firefox 3.1 build from rawhide xulrunner + firefox spec
+
diff --git a/firefox3.desktop b/firefox3.desktop
new file mode 100644
index 0000000..e785cd1
--- /dev/null
+++ b/firefox3.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Firefox Web Browser
+GenericName=Web Browser
+Comment=Browse the Web
+Exec=firefox %u
+Icon=firefox
+Terminal=false
+Type=Application
+StartupWMClass=Firefox-bin
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
+StartupNotify=true
+
diff --git a/firefox36.sh.in b/firefox36.sh.in
new file mode 100644
index 0000000..ecbdad6
--- /dev/null
+++ b/firefox36.sh.in
@@ -0,0 +1,181 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+## 
+## Usage:
+##
+## $ mozilla
+##
+## This script is meant to run a mozilla program from the mozilla
+## rpm installation.
+##
+## The script will setup all the environment voodoo needed to make
+## mozilla work.
+
+cmdname=`basename $0`
+
+##
+## Variables
+##
+MOZ_ARCH=$(uname -m)
+case $MOZ_ARCH in
+	x86_64 | ia64 | s390 )
+		MOZ_LIB_DIR="/usr/lib64"
+		SECONDARY_LIB_DIR="/usr/lib"
+		;;
+	* )
+		MOZ_LIB_DIR="/usr/lib"
+		SECONDARY_LIB_DIR="/usr/lib64"
+		;;
+esac
+
+if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then
+    if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox ]; then
+	echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found"
+	if [ -d $SECONDARY_LIB_DIR ]; then
+	    echo "       $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox not found"
+	fi
+	exit 1
+    fi
+    MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
+fi
+MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
+MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions"
+MOZ_PROGRAM="$MOZ_DIST_BIN/firefox"
+MOZ_LAUCHER="$MOZ_DIST_BIN/run-mozilla.sh"
+ 
+##
+## Set MOZ_GRE_CONF
+##
+## This build use bundled Xulrunner
+
+##
+## Set MOZILLA_FIVE_HOME
+##
+MOZILLA_FIVE_HOME="$MOZ_DIST_BIN"
+
+export MOZILLA_FIVE_HOME
+
+##
+## Select the propper plugin dir
+## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped
+##
+if [ -x "/usr/bin/mozilla-plugin-config" ]
+then
+  MOZ_PLUGIN_DIR="plugins-wrapped"
+else
+  MOZ_PLUGIN_DIR="plugins"
+fi
+
+##
+## Make sure that we set the plugin path
+##
+if [ "$MOZ_PLUGIN_PATH" ]
+then
+  MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/$MOZ_PLUGIN_DIR
+else
+  MOZ_PLUGIN_PATH=$MOZ_LIB_DIR/mozilla/$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/$MOZ_PLUGIN_DIR
+fi
+export MOZ_PLUGIN_PATH
+
+##
+## If plugins are wrapped, check them
+##
+if [ -x "/usr/bin/mozilla-plugin-config" ]
+then
+  /usr/bin/mozilla-plugin-config
+fi
+
+##
+## Set FONTCONFIG_PATH for Xft/fontconfig
+##
+FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
+export FONTCONFIG_PATH
+
+##
+## In order to better support certain scripts (such as Indic and some CJK 
+## scripts), Fedora builds its Firefox, with permission from the Mozilla 
+## Corporation, with the Pango system as its text renderer.  This change 
+## may negatively impact performance on some pages.  To disable the use of
+## Pango, set MOZ_DISABLE_PANGO=1 in your environment before launching
+## Firefox.
+##
+#
+# MOZ_DISABLE_PANGO=1
+# export MOZ_DISABLE_PANGO
+#
+
+##
+## Disable the GNOME crash dialog, Moz has it's own
+##
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
+# OK, here's where all the real work gets done
+
+# check system locale
+MOZARGS=
+# Try without a local variant first, then with a local variant
+# So that pt-BR doesn't try to use pt for example
+SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"`
+[ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE"
+
+MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"`
+[ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"
+
+# Prepare command line arguments
+script_args=""
+pass_arg_count=0
+while [ $# -gt $pass_arg_count ]
+do
+  case "$1" in
+    -g | --debug)
+      script_args="$script_args -g"
+      debugging=1
+      shift
+      ;;
+    -d | --debugger)
+      if [ $# -gt 1 ]; then
+        script_args="$script_args -d $2"
+        shift 2
+      else
+        shift
+      fi
+      ;;
+    *)
+      # Move the unrecognized argument to the end of the list.
+      arg="$1"
+      shift
+      set -- "$@" "$arg"
+      pass_arg_count=`expr $pass_arg_count + 1`
+      ;;
+  esac
+done
+
+# Run the browser
+debugging=0
+if [ $debugging = 1 ]
+then
+  echo $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@"
+fi
+
+exec $MOZ_LAUCHER $script_args $MOZ_PROGRAM $MOZARGS "$@"
diff --git a/mozilla-191-pkgconfig.patch b/mozilla-191-pkgconfig.patch
new file mode 100644
index 0000000..d894533
--- /dev/null
+++ b/mozilla-191-pkgconfig.patch
@@ -0,0 +1,142 @@
+diff -r f1af606531f5 config/autoconf.mk.in
+--- a/config/autoconf.mk.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/config/autoconf.mk.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -57,14 +57,14 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
+ 
+ installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
+ 
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -r f1af606531f5 xulrunner/installer/Makefile.in
+--- a/xulrunner/installer/Makefile.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/Makefile.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -116,6 +118,7 @@
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
++	-e "s|%libdir%|$(installdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
+diff -r f1af606531f5 xulrunner/installer/libxul-embedding-unstable.pc.in
+--- a/xulrunner/installer/libxul-embedding-unstable.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/libxul-embedding-unstable.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -1,11 +1,12 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/unstable
+ includetype=unstable
+ 
+ Name: libxul-embedding-unstable
+ Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
+diff -r f1af606531f5 xulrunner/installer/libxul-embedding.pc.in
+--- a/xulrunner/installer/libxul-embedding.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/libxul-embedding.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -1,7 +1,7 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/stable
+ includetype=stable
+ 
+ # Note: the default pkg-config cflags will only list include directories
+@@ -11,5 +11,6 @@
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
++Libs: -L${sdkdir}/sdk/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
+diff -r f1af606531f5 xulrunner/installer/libxul-unstable.pc.in
+--- a/xulrunner/installer/libxul-unstable.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/libxul-unstable.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -1,7 +1,8 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/unstable
+ includetype=unstable
+ 
+ Name: libxul
+diff -r f1af606531f5 xulrunner/installer/libxul.pc.in
+--- a/xulrunner/installer/libxul.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/libxul.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -1,7 +1,8 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/stable
+ includetype=stable
+ 
+ # Note: the default pkg-config includes will only list include directories
+@@ -12,5 +13,5 @@
+ Description: The Mozilla Runtime and Embedding Engine
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
++Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom
+ Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
+diff -r f1af606531f5 xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ 
+ Name: mozilla-gtkembedmoz
+diff -r f1af606531f5 xulrunner/installer/mozilla-gtkmozembed.pc.in
+--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ 
+ Name: mozilla-gtkembedmoz
+diff -r f1af606531f5 xulrunner/installer/mozilla-js.pc.in
+--- a/xulrunner/installer/mozilla-js.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/mozilla-js.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -6,5 +6,5 @@
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Libs: -L${sdkdir}/sdk/lib -lmozjs
++Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+diff -r f1af606531f5 xulrunner/installer/mozilla-plugin.pc.in
+--- a/xulrunner/installer/mozilla-plugin.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/mozilla-plugin.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -6,4 +6,4 @@
+ Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
++Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -I${includedir}/java -I${includedir}/plugin
diff --git a/mozilla-about-firefox-version.patch b/mozilla-about-firefox-version.patch
new file mode 100644
index 0000000..115664c
--- /dev/null
+++ b/mozilla-about-firefox-version.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version mozilla-1.9.1/toolkit/content/Makefile.in
+--- mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version	2009-06-29 18:15:23.000000000 +0200
++++ mozilla-1.9.1/toolkit/content/Makefile.in	2009-07-07 13:43:54.000000000 +0200
+@@ -46,7 +46,7 @@ CHROME_DEPS = buildconfig.html
+ include $(DEPTH)/config/autoconf.mk
+ 
+ DEFINES += \
+-  -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
++  -DMOZ_APP_VERSION=$(FIREFOX_VERSION) \
+   -Dtarget="$(target)" \
+   -Dac_configure_args="$(ac_configure_args)" \
+   -DCC="$(CC)" \
diff --git a/mozilla-build.patch b/mozilla-build.patch
new file mode 100644
index 0000000..a956e5f
--- /dev/null
+++ b/mozilla-build.patch
@@ -0,0 +1,23 @@
+diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in
+--- mozilla/security/manager/Makefile.in.old	2007-10-25 00:25:30.000000000 +0200
++++ mozilla/security/manager/Makefile.in	2007-11-06 10:57:39.000000000 +0100
+@@ -153,7 +153,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
+ DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
+ DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
+ DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
+-DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
+ ifdef NSS_DISABLE_DBM 
+ DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
+ endif
+diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in
+--- mozilla/security/manager/ssl/src/Makefile.in.old	2007-10-19 21:16:36.000000000 +0200
++++ mozilla/security/manager/ssl/src/Makefile.in	2007-11-06 10:57:52.000000000 +0100
+@@ -134,8 +134,6 @@ REQUIRES	= nspr \
+ 
+ EXTRA_DEPS = $(NSS_DEP_LIBS)
+ 
+-DEFINES += -DNSS_ENABLE_ECC
+-
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+ LOCAL_INCLUDES += $(NSS_CFLAGS)
diff --git a/mozilla-jemalloc-526152.patch b/mozilla-jemalloc-526152.patch
new file mode 100644
index 0000000..6ffce7a
--- /dev/null
+++ b/mozilla-jemalloc-526152.patch
@@ -0,0 +1,19 @@
+--- mozilla-1.9.2/memory/jemalloc/jemalloc.c.orig	2009-12-17 21:56:35.000000000 +0100
++++ mozilla-1.9.2/memory/jemalloc/jemalloc.c	2009-12-17 21:57:32.000000000 +0100
+@@ -5822,14 +5822,14 @@
+ {
+ 	void *ret;
+ 
+-	assert(((alignment - 1) & alignment) == 0 && alignment >=
+-	    sizeof(void *));
++	assert(((alignment - 1) & alignment) == 0);
+ 
+ 	if (malloc_init()) {
+ 		ret = NULL;
+ 		goto RETURN;
+ 	}
+ 
++	alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
+ 	ret = ipalloc(alignment, size);
+ 
+ RETURN:
diff --git a/mozilla-jemalloc.patch b/mozilla-jemalloc.patch
new file mode 100644
index 0000000..2ef0b97
--- /dev/null
+++ b/mozilla-jemalloc.patch
@@ -0,0 +1,24 @@
+diff -r f1af606531f5 memory/jemalloc/jemalloc.h
+--- mozilla/memory/jemalloc/jemalloc.h	Sat Nov 22 20:22:22 2008 +0100
++++ mozilla/memory/jemalloc/jemalloc.h	Mon Dec 01 16:53:06 2008 -0500
+@@ -45,14 +45,14 @@
+ } jemalloc_stats_t;
+ 
+ #ifndef MOZ_MEMORY_DARWIN
+-void	*malloc(size_t size);
+-void	*valloc(size_t size);
+-void	*calloc(size_t num, size_t size);
+-void	*realloc(void *ptr, size_t size);
+-void	free(void *ptr);
++void	*malloc(size_t size)  __THROW __attribute_malloc__ __wur;
++void	*valloc(size_t size)  __THROW __attribute_malloc__ __wur;
++void	*calloc(size_t num, size_t size)  __THROW __attribute_malloc__ __wur;
++void	*realloc(void *ptr, size_t size)  __THROW __attribute_malloc__ __wur;
++void	free(void *ptr)  __THROW __attribute_malloc__ __wur;
+ #endif
+ 
+-int	posix_memalign(void **memptr, size_t alignment, size_t size);
++int	posix_memalign(void **memptr, size_t alignment, size_t size)  __THROW __attribute_malloc__ __wur;
+ void	*memalign(size_t alignment, size_t size);
+ size_t	malloc_usable_size(const void *ptr);
+ void	jemalloc_stats(jemalloc_stats_t *stats);
diff --git a/mozilla-ps-pdf-simplify-operators.patch b/mozilla-ps-pdf-simplify-operators.patch
new file mode 100644
index 0000000..cab1341
--- /dev/null
+++ b/mozilla-ps-pdf-simplify-operators.patch
@@ -0,0 +1,42 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=435313
+
+Index: mozilla/gfx/thebes/public/gfxPDFSurface.h
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v
+retrieving revision 1.13
+diff -d -u -p -r1.13 gfxPDFSurface.h
+--- mozilla/gfx/thebes/public/gfxPDFSurface.h	19 Mar 2008 20:51:42 -0000	1.13
++++ mozilla/gfx/thebes/public/gfxPDFSurface.h	23 May 2008 00:50:31 -0000
+@@ -63,7 +63,11 @@ public:
+     // this is in points!
+     const gfxSize& GetSize() const { return mSize; }
+ 
+-    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
++    virtual PRInt32 GetDefaultContextFlags() const
++    {
++        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
++               gfxContext::FLAG_DISABLE_SNAPPING;
++    }
+ 
+ private:
+     nsCOMPtr<nsIOutputStream> mStream;
+Index: mozilla/gfx/thebes/public/gfxPSSurface.h
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v
+retrieving revision 1.13
+diff -d -u -p -r1.13 gfxPSSurface.h
+--- mozilla/gfx/thebes/public/gfxPSSurface.h	19 Mar 2008 20:51:42 -0000	1.13
++++ mozilla/gfx/thebes/public/gfxPSSurface.h	23 May 2008 00:50:31 -0000
+@@ -63,7 +63,11 @@ public:
+     // this is in points!
+     const gfxSize& GetSize() const { return mSize; }
+ 
+-    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
++    virtual PRInt32 GetDefaultContextFlags() const
++    {
++        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
++               gfxContext::FLAG_DISABLE_SNAPPING;
++    }
+ 
+ private:
+     nsCOMPtr<nsIOutputStream> mStream;
diff --git a/xulrunner-remi.patch b/xulrunner-remi.patch
new file mode 100644
index 0000000..038058e
--- /dev/null
+++ b/xulrunner-remi.patch
@@ -0,0 +1,30 @@
+--- mozilla-1.9.2/layout/generic/nsFrame.h.orig	2009-11-06 19:29:14.000000000 +0100
++++ mozilla-1.9.2/layout/generic/nsFrame.h	2009-11-06 19:30:54.000000000 +0100
+@@ -153,23 +153,14 @@
+   friend nsIFrame* NS_NewEmptyFrame(nsIPresShell* aShell,
+                                     nsStyleContext* aContext);
+ 
++
++  // Set this public as in 1.9.1 !
++  void operator delete(void* aPtr, size_t sz);
++
+ private:
+   // Left undefined; nsFrame objects are never allocated from the heap.
+   void* operator new(size_t sz) CPP_THROW_NEW;
+ 
+-protected:
+-  // Overridden to prevent the global delete from being called, since
+-  // the memory came out of an arena instead of the heap.
+-  //
+-  // Ideally this would be private and undefined, like the normal
+-  // operator new.  Unfortunately, the C++ standard requires an
+-  // overridden operator delete to be accessible to any subclass that
+-  // defines a virtual destructor, so we can only make it protected;
+-  // worse, some C++ compilers will synthesize calls to this function
+-  // from the "deleting destructors" that they emit in case of
+-  // delete-expressions, so it can't even be undefined.
+-  void operator delete(void* aPtr, size_t sz);
+-
+ public:
+ 
+   // nsQueryFrame
author	Remi Collet <fedora@famillecollet.com>	2010-05-13 14:29:48 +0200
committer	Remi Collet <fedora@famillecollet.com>	2010-05-13 14:29:48 +0200
commit	139f64c6307428ff5ccc8a6e3fd5fa607f2f95ef (patch)
tree	c9bc8c8ce31f5a864220fc11802db926eb207c0a