rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

- update to Firefox 8 (bnc#728520)

Browse Source 
* MFSA 2011-47/CVE-2011-3648 (bmo#690225)
    Potential XSS against sites using Shift-JIS
  * MFSA 2011-48/CVE-2011-3651/CVE-2011-3652/CVE-2011-3654
    Miscellaneous memory safety hazards
  * MFSA 2011-49/CVE-2011-3650 (bmo#674776)
    Memory corruption while profiling using Firebug
  * MFSA 2011-52/CVE-2011-3655 (bmo#672182)
    Code execution via NoWaiverWrapper
- rebased patches

- enable telemetry prompt
- set intl.locale.matchOS=true in the base package as it causes
  too much confusion when it's only available with branding-openSUSE

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=237
This commit is contained in:
Wolfgang Rosenauer 2011-11-09 12:04:11 +00:00 committed by Git OBS Bridge
parent 52ba560f1c
commit 8834f8ff8e
17 changed files with 198 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MozillaFirefox.changes
View File

@ -1,8 +1,29 @@
-------------------------------------------------------------------
Sun Nov 6 08:20:59 UTC 2011 - wr@rosenauer.org
- update to Firefox 8 (bnc#728520)
* MFSA 2011-47/CVE-2011-3648 (bmo#690225)
Potential XSS against sites using Shift-JIS
* MFSA 2011-48/CVE-2011-3651/CVE-2011-3652/CVE-2011-3654
Miscellaneous memory safety hazards
* MFSA 2011-49/CVE-2011-3650 (bmo#674776)
Memory corruption while profiling using Firebug
* MFSA 2011-52/CVE-2011-3655 (bmo#672182)
Code execution via NoWaiverWrapper
- rebased patches
-------------------------------------------------------------------
Thu Oct 20 12:34:47 UTC 2011 - wr@rosenauer.org
- enable telemetry prompt
-------------------------------------------------------------------
Fri Sep 30 10:52:36 UTC 2011 - wr@rosenauer.org
- update to minor release 7.0.1
* fixed staged addon updates
- set intl.locale.matchOS=true in the base package as it causes
too much confusion when it's only available with branding-openSUSE
-------------------------------------------------------------------
Fri Sep 23 11:22:22 UTC 2011 - wr@rosenauer.org

41
MozillaFirefox.spec
View File

@ -18,7 +18,7 @@
# norootforbuild
%define major 7
%define major 8
%define mainver %major.0
Name: MozillaFirefox
@ -33,9 +33,9 @@ BuildRequires: mozilla-nspr-devel >= 4.8.8
BuildRequires: mozilla-nss-devel >= 3.12.10
BuildRequires: nss-shared-helper-devel
License: MPLv1.1 or GPLv2+ or LGPLv2+
Version: %{mainver}.1
Version: %{mainver}
Release: 1
%define releasedate 2011092900
%define releasedate 2011110500
Provides: web_browser
Provides: firefox = %{version}-%{release}
Provides: firefox = %{mainver}
@ -66,14 +66,13 @@ Patch2: mozilla-nongnome-proxies.patch
Patch3: mozilla-prefer_plugin_pref.patch
Patch4: mozilla-shared-nss-db.patch
Patch5: mozilla-kde.patch
Patch6: mozilla-preferences.patch
Patch7: mozilla-language.patch
Patch9: mozilla-cairo-return.patch
Patch10: mozilla-ntlm-full-path.patch
Patch12: mozilla-repo.patch
Patch13: mozilla-dump_syms-static.patch
Patch14: mozilla-sle11.patch
Patch15: mozilla-linux3.patch
Patch16: mozilla-curl.patch
Patch8: mozilla-ntlm-full-path.patch
Patch9: mozilla-repo.patch
Patch10: mozilla-dump_syms-static.patch
Patch11: mozilla-sle11.patch
Patch12: mozilla-linux3.patch
# Firefox/browser
Patch31: firefox-browser-css.patch
Patch32: firefox-cross-desktop.patch
@ -196,16 +195,15 @@ cd $RPM_BUILD_DIR/mozilla
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch12 -p1
%patch13 -p1
%if %suse_version < 1120
%patch14 -p1
%patch11 -p1
%endif
%patch15 -p1
%patch16 -p1
%patch12 -p1
#
%patch31 -p1
%patch32 -p1
@ -238,6 +236,7 @@ export MOZ_SOURCE_REPO=$REPO
export MOZ_BUILD_DATE=%{releasedate}
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
%ifarch ppc64
export CFLAGS="$CFLAGS -mminimal-toc"
@ -303,9 +302,6 @@ make -C browser/installer STRIP=/bin/true
mkdir -p $RPM_BUILD_ROOT/%{progdir}
cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir}
mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions
# remove some executable permissions
find $RPM_BUILD_ROOT%{progdir} \
-name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x
mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins
# install kde.js
%if %suse_version >= 1110
@ -331,7 +327,7 @@ for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales);
popd
LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \
make -C browser/locales langpack-$locale
cp -r dist/xpi-stage/locale-$locale \
cp -rL dist/xpi-stage/locale-$locale \
$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org
# remove prefs and profile defaults from langpack
rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults
@ -346,6 +342,13 @@ for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales);
esac
done
%endif
# remove some executable permissions
find $RPM_BUILD_ROOT%{progdir} \
-name "*.js" -o \
-name "*.jsm" -o \
-name "*.rdf" -o \
-name "*.properties" -o \
-name "*.dtd" | xargs chmod a-x
# overwrite the mozilla start-script and link it to /usr/bin
mkdir --parents $RPM_BUILD_ROOT/usr/bin
sed "s:%%PREFIX:%{_prefix}:g

4
compare-locales.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:873db0259c66f9bab193470cb2b407b7c33080638efc0c98dbf08a0f3cf21156
size 25677
oid sha256:3ca29edc09eda06374e682f7976d07d79ce7af4878a48cf277b20970f07d6995
size 25675

9
create-tar.sh
View File

@ -1,8 +1,9 @@
#!/bin/bash
BRANCH="releases/mozilla-release"
RELEASE_TAG="FIREFOX_7_0_1_RELEASE"
VERSION="7.0.1"
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
RELEASE_TAG="FIREFOX_8_0_RELEASE"
VERSION="8.0"
# mozilla
hg clone http://hg.mozilla.org/$BRANCH mozilla
@ -23,7 +24,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do
ja-JP-mac|en-US)
;;
*)
hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale
hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale
[ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
;;
esac

3
firefox-7.0.1-source.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47bd239a09caa0f8f866030f1190b1db81376022083e065fb8e4420aadfc8a4e
size 68815916

3
firefox-8.0-source.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:52ec651f4a7a0a22f317b5d3cf45e6b7817deea686178715ec8d87cf45732257
size 70118504

20
firefox-branded-icons.patch
View File

@ -1,10 +1,10 @@
# HG changeset patch
# Parent 6948d58326d5c2e46936e186079421e7d76445e2
# Parent 87462739809ad0f41fd335f9a68203fd70f9883c
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -199,16 +199,21 @@ DEFINES += -DMOZILLA_OFFICIAL
@@ -194,16 +194,21 @@ DEFINES += -DMOZILLA_OFFICIAL
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@ -20,16 +20,16 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
+endif
endif
ifdef MOZ_SPLASHSCREEN
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
libs::
$(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin
endif
endif
libs:: $(srcdir)/profile/prefs.js
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
libs:: $(srcdir)/blocklist.xml
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
@@ -69,18 +69,21 @@ OSX_BRANDING_FILES = \
@@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \
firefox.icns \
disk.icns \
document.icns \
@ -54,7 +54,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -421,18 +421,21 @@
@@ -415,18 +415,21 @@
#ifdef SHIP_FEEDBACK
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
#endif

65
firefox-kde.patch
View File

@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1038 @@
@@ -0,0 +1,1055 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@ -239,14 +239,6 @@ new file mode 100644
+ close="true"
+ onpopuphiding="InspectorUI.closeInspectorUI();"
+ label="&inspectPanelTitle.label;">
+ <toolbar id="inspector-toolbar"
+ nowindowdrag="true">
+ <toolbarbutton id="inspector-inspect-toolbutton"
+ label="&inspectButton.label;"
+ accesskey="&inspectButton.accesskey;"
+ class="toolbarbutton-text"
+ command="Inspector:Inspect"/>
+ </toolbar>
+ <hbox id="tree-panel-resizer-box" align="end">
+ <spacer flex="1" />
+ <resizer dir="bottomend" />
@ -286,10 +278,10 @@ new file mode 100644
+ oncommand="BrowserFullScreen();"/>
+ </menupopup>
+
+ <menupopup id="contentAreaContextMenu"
+ <menupopup id="contentAreaContextMenu" pagemenu="start"
+ onpopupshowing="if (event.target != this)
+ return true;
+ gContextMenu = new nsContextMenu(this, gBrowser);
+ gContextMenu = new nsContextMenu(this, gBrowser, event.shiftKey);
+ if (gContextMenu.shouldDisplay)
+ updateEditUIVisibility();
+ return gContextMenu.shouldDisplay;"
@ -404,6 +396,24 @@ new file mode 100644
+ </panel>
+
+ <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
+
+ <tooltip id="back-button-tooltip">
+ <label value="&backButton.tooltip;"/>
+#ifdef XP_MACOSX
+ <label value="&backForwardButtonMenuMac.tooltip;"/>
+#else
+ <label value="&backForwardButtonMenu.tooltip;"/>
+#endif
+ </tooltip>
+
+ <tooltip id="forward-button-tooltip">
+ <label value="&forwardButton.tooltip;"/>
+#ifdef XP_MACOSX
+ <label value="&backForwardButtonMenuMac.tooltip;"/>
+#else
+ <label value="&backForwardButtonMenu.tooltip;"/>
+#endif
+ </tooltip>
+ </popupset>
+
+#ifdef CAN_DRAW_IN_TITLEBAR
@ -473,12 +483,12 @@ new file mode 100644
+ label="&backCmd.label;"
+ command="Browser:BackOrBackDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&backButton.tooltip;"/>
+ tooltip="back-button-tooltip"/>
+ <toolbarbutton id="forward-button" class="toolbarbutton-1"
+ label="&forwardCmd.label;"
+ command="Browser:ForwardOrForwardDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&forwardButton.tooltip;"/>
+ tooltip="forward-button-tooltip"/>
+ </toolbaritem>
+
+ <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
@ -958,6 +968,19 @@ new file mode 100644
+ </hbox>
+
+ <vbox id="browser-bottombox" layer="true">
+ <toolbar id="inspector-toolbar"
+ nowindowdrag="true"
+ hidden="true">
+ <toolbarbutton id="inspector-inspect-toolbutton"
+ label="&inspectButton.label;"
+ accesskey="&inspectButton.accesskey;"
+ class="toolbarbutton-text"
+ command="Inspector:Inspect"/>
+ <toolbarseparator />
+ <hbox id="inspector-tools">
+ <!-- registered tools go here -->
+ </hbox>
+ </toolbar>
+ <toolbar id="addon-bar"
+ toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
+ collapsed="true"
@ -991,7 +1014,7 @@ new file mode 100644
+ <svg:svg height="0">
+ <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
+ <svg:circle cx="-0.46" cy="0.48" r="0.65"/>
+ <svg:circle cx="-0.41" cy="0.5" r="0.65"/>
+ </svg:mask>
+ <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
+ <svg:circle cx="9" cy="3" r="3" fill="white"/>
@ -1029,12 +1052,6 @@ new file mode 100644
+#endif
+
+</vbox>
+# <iframe id="highlighter-frame"
+# transparent="true"
+# type="content"
+# src="chrome://content/base/highlighter.html"/> is dynamically appended as
+# the last child of #tab-view-deck, only when it is needed, for minimal
+# performance impact.
+# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
+# Introducing the iframe dynamically, as needed, was found to be better than
+# starting with an empty iframe here in browser.xul from a Ts standpoint.
@ -1056,13 +1073,13 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+* content/browser/browser-kde.xul (content/browser-kde.xul)
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/content.js (content/content.js)
* content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml)
content/browser/highlighter.xhtml (content/highlighter.xhtml)
* content/browser/inspector.html (content/inspector.html)
* content/browser/scratchpad.xul (content/scratchpad.xul)
* content/browser/scratchpad.js (content/scratchpad.js)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
* content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js)
* content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css)
* content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@ -1565,7 +1582,7 @@ new file mode 100644
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -440,16 +440,17 @@
@@ -434,16 +434,17 @@
#endif
#endif

3
l10n-7.0.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:373695147d9e0ab2113a39acbf12d3346967c5a6bc209aa83aba6b2b26e3e35e
size 44018341

3
l10n-8.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92ddf4da3dcdcf5882a2f90aabb013217dc958007ba6babf6ab13ffe5c64fc4a
size 44202509

21
mozilla-cairo-return.patch
View File

@ -1,21 +0,0 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 43cb27a012f2532add0e9791c1b5a7d0c3b03f9b
Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush'
diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
--- a/gfx/cairo/cairo/src/cairo-surface-wrapper.c
+++ b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
@@ -526,9 +526,12 @@ _cairo_surface_wrapper_fini (cairo_surfa
}
cairo_status_t
_cairo_surface_wrapper_flush (cairo_surface_wrapper_t *wrapper)
{
if (wrapper->target->backend->flush) {
return wrapper->target->backend->flush(wrapper->target);
}
+
+ // this is preliminary to cool down gcc and build checks
+ return CAIRO_STATUS_SUCCESS;
}

89
mozilla-curl.patch
View File

@ -1,89 +0,0 @@
# HG changeset patch
# User Evan Shaw <edsrzf@gmail.com>
# Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4
bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. r=ted
diff --git a/config/system-headers b/config/system-headers
--- a/config/system-headers
+++ b/config/system-headers
@@ -199,17 +199,16 @@ crypt.h
cstddef
cstdio
cstdlib
cstring
ctime
ctype.h
curl/curl.h
curl/easy.h
-curl/types.h
curses.h
cxxabi.h
DateTimeUtils.h
dbus/dbus.h
dbus/dbus-glib.h
dbus/dbus-glib-lowlevel.h
ddeml.h
Debug.h
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -199,17 +199,16 @@ crypt.h
cstddef
cstdio
cstdlib
cstring
ctime
ctype.h
curl/curl.h
curl/easy.h
-curl/types.h
curses.h
cxxabi.h
DateTimeUtils.h
dbus/dbus.h
dbus/dbus-glib.h
dbus/dbus-glib-lowlevel.h
ddeml.h
Debug.h
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
@@ -28,17 +28,16 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "common/linux/http_upload.h"
#include <assert.h>
#include <dlfcn.h>
#include <curl/curl.h>
#include <curl/easy.h>
-#include <curl/types.h>
namespace {
// Callback to get the response data from server.
static size_t WriteCallback(void *ptr, size_t size,
size_t nmemb, void *userp) {
if (!userp)
return 0;
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
@@ -24,17 +24,16 @@
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <curl/curl.h>
#include <curl/easy.h>
-#include <curl/types.h>
#include <dlfcn.h>
#include <iostream>
#include <string>
#include "common/linux/libcurl_wrapper.h"
using std::string;

56
mozilla-kde.patch
View File

@ -39,7 +39,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
#include "prefapi.h"
#include "prefread.h"
#include "prefapi_private_data.h"
@@ -966,30 +967,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
@@ -956,30 +957,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
}
static nsresult pref_LoadPrefsInDirList(const char *listId)
@ -89,7 +89,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
}
static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
@@ -1082,28 +1101,40 @@ static nsresult pref_InitInitialObjects(
@@ -1072,28 +1091,40 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@ -125,15 +125,15 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
if (NS_FAILED(rv))
NS_WARNING("Error parsing application default preferences.");
}
// Load jar:$app/omni.jar!/defaults/preferences/*.js
nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
if (appJarReader) {
rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr);
diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -77,8 +77,10 @@ EXTRA_COMPONENTS = \
@@ -75,8 +75,10 @@ EXTRA_COMPONENTS = \
$(NULL)
endif
@ -2178,7 +2178,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -98,17 +98,18 @@ EXPORTS = nsWindowsDllInterceptor.h
@@ -94,17 +94,18 @@ EXPORTS = nsWindowsDllInterceptor.h
else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
CMMSRCS = nsNativeAppSupportCocoa.mm
@ -3192,13 +3192,13 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -134,11 +134,14 @@ endif
DEFINES += -DCAIRO_GFX
@@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX
INCLUDES += \
-I$(srcdir)/../xpwidgets \
-I$(srcdir)/../shared \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/xul/base/src \
-I$(topsrcdir)/other-licenses/atk-1.0 \
$(NULL)
+
@ -3228,7 +3228,8 @@ diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
#include "nsIStringBundle.h"
#include "nsArrayEnumerator.h"
@@ -50,16 +51,17 @@
@@ -49,16 +50,17 @@
#include "nsNetUtil.h"
#include "nsReadableUtils.h"
#include "mozcontainer.h"
@ -3236,7 +3237,6 @@ diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
#include "prlink.h"
#include "nsFilePicker.h"
#include "nsAccessibilityHelper.h"
+#include "nsKDEUtils.h"
#if (MOZ_PLATFORM_MAEMO == 5)
@ -3246,7 +3246,7 @@ diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
#define MAX_PREVIEW_SIZE 180
nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull;
@@ -282,17 +284,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
@@ -281,17 +283,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@ -3267,7 +3267,7 @@ diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
@@ -430,16 +434,19 @@ confirm_overwrite_file(GtkWidget *parent
@@ -429,16 +433,19 @@ confirm_overwrite_file(GtkWidget *parent
gtk_widget_destroy(dialog);
return result;
@ -3287,7 +3287,7 @@ diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
@@ -580,8 +587,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
@@ -579,8 +586,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
*aReturn = nsIFilePicker::returnCancel;
break;
}
@ -3561,7 +3561,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -59,16 +59,17 @@
@@ -60,16 +60,17 @@
#include "nsTextFormatter.h"
#include "nsVersionComparator.h"
#include "nsXPCOMCIDInternal.h"
@ -3579,12 +3579,12 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
// Some directives should only be delivered for NS_COMPONENT_LOCATION
// manifests.
@@ -426,16 +427,17 @@ ParseManifestCommon(NSLocationType aType
@@ -430,16 +431,17 @@ ParseManifestCommon(NSLocationType aType
NS_NAMED_LITERAL_STRING(kPlatform, "platform");
NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
NS_NAMED_LITERAL_STRING(kApplication, "application");
NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
NS_NAMED_LITERAL_STRING(kOs, "os");
NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
NS_NAMED_LITERAL_STRING(kABI, "abi");
@ -3595,9 +3595,9 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
nsAutoString appID;
nsAutoString appVersion;
nsAutoString geckoVersion;
nsAutoString osTarget;
nsAutoString abi;
@@ -465,39 +467,44 @@ ParseManifestCommon(NSLocationType aType
@@ -474,39 +476,44 @@ ParseManifestCommon(NSLocationType aType
CopyUTF8toUTF16(s, abi);
abi.Insert(PRUnichar('_'), 0);
abi.Insert(osTarget, 0);
@ -3642,9 +3642,9 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
char *token;
char *newline = buf;
@@ -566,24 +573,26 @@ ParseManifestCommon(NSLocationType aType
bool ok = true;
@@ -585,24 +592,26 @@ ParseManifestCommon(NSLocationType aType
TriState stAppVersion = eUnspecified;
TriState stGeckoVersion = eUnspecified;
TriState stApp = eUnspecified;
TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified;
@ -3662,20 +3662,20 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
CheckStringFlag(kABI, wtoken, abi, stABI) ||
+ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||
CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion))
CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion))
continue;
if (directive->contentflags &&
(CheckFlag(kPlatform, wtoken, platform) ||
CheckFlag(kContentAccessible, wtoken, contentAccessible)))
continue;
@@ -602,16 +611,17 @@ ParseManifestCommon(NSLocationType aType
ok = false;
@@ -623,16 +632,17 @@ ParseManifestCommon(NSLocationType aType
}
if (!ok ||
stApp == eBad ||
stAppVersion == eBad ||
stGeckoVersion == eBad ||
stOs == eBad ||
stOsVersion == eBad ||
+ stDesktop == eBad ||
@ -3712,11 +3712,11 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -88,16 +88,17 @@
@@ -87,16 +87,17 @@
#include "nsXPIDLString.h"
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
#include "nsITimelineService.h"
#ifdef MOZ_WIDGET_GTK2
#include "nsIGIOService.h"
@ -3730,7 +3730,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
#include "prmem.h"
#include "plbase64.h"
@@ -1769,44 +1770,50 @@ nsLocalFile::SetPersistentDescriptor(con
@@ -1785,44 +1786,50 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@ -3795,7 +3795,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
return rv;
}
return NS_ERROR_FAILURE;
@@ -1832,16 +1839,23 @@ nsLocalFile::Launch()
@@ -1848,16 +1855,23 @@ nsLocalFile::Launch()
if (nsnull == connection)
return NS_ERROR_FAILURE;

30
mozilla-preferences.patch Normal file
View File

@ -0,0 +1,30 @@
From: Wolfgang Rosenauer <wr@rosenauer.org>
Subject: use system locale if available
This setting used to live in the branding-openSUSE package but this is causing too much
confusion and therefore is currently the only setting we switch in the unbranded
package unconditionally.
# HG changeset patch
# Parent 020571ebc3766a68f1e50780b910c51d1bb76087
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1085,17 +1085,17 @@ pref("intl.charsetmenu.browser.unicode",
pref("intl.charsetmenu.mailedit", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.cache", "");
pref("intl.charsetmenu.mailview.cache", "");
pref("intl.charsetmenu.composer.cache", "");
pref("intl.charsetmenu.browser.cache.size", 5);
pref("intl.charset.detector", "chrome://global/locale/intl.properties");
pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties");
-pref("intl.locale.matchOS", false);
+pref("intl.locale.matchOS", true);
// fallback charset list for Unicode conversion (converting from Unicode)
// currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
// for ISO-8859-1
pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
pref("font.language.group", "chrome://global/locale/intl.properties");
// these locales have right-to-left UI
pref("intl.uidirection.ar", "rtl");

10
mozilla-repo.patch
View File

@ -1,5 +1,5 @@
# HG changeset patch
# Parent 732243388ea9cc592d30e1951f29a94a0ce5a035
# Parent 07dc7ea11c92368cb7c137a403feaaa6861abb3c
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
@ -26,9 +26,9 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops
ifdef MOZ_SOURCE_STAMP
DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)"
@@ -65,17 +65,17 @@ endif
ifeq (Android,$(OS_TARGET))
DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME)
endif
# strip a trailing slash from the repo URL because it's not always present,
@ -74,7 +74,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/install
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -231,17 +231,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
@@ -227,17 +227,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
endif
endif

8
mozilla-shared-nss-db.patch
View File

@ -7,7 +7,7 @@ References:
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS
@@ -577,16 +577,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
@ -31,7 +31,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS)
@@ -8680,16 +8680,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@ -109,7 +109,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
@@ -1748,18 +1755,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@ -167,4 +167,4 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
-framework SystemConfiguration \
-framework QuickTime \
-framework IOKit \
-lcrypto \
-F/System/Library/PrivateFrameworks -framework CoreUI \

2
source-stamp.txt
View File

@ -1,2 +1,2 @@
REV=a6c276265898
REV=d03b51a9b2bd
REPO=http://hg.mozilla.org/releases/mozilla-release