pool/MozillaFirefox
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 400713 from mozilla:Factory

Browse Source 
- update to Firefox 47.0 (boo#983549)
  * Enable VP9 video codec for users with fast machines
  * Embedded YouTube videos now play with HTML5 video if Flash is
    not installed
  * View and search open tabs from your smartphone or another
    computer in a sidebar
  * Allow no-cache on back/forward navigations for https resources
  security fixes:
  * MFSA 2016-49/CVE-2016-2815/CVE-2016-2818
    (boo#983638)
    (bmo#1241896, bmo#1242798, bmo#1243466, bmo#1245743,
     bmo#1264300, bmo#1271037, bmo#1234147, bmo#1256493,
     bmo#1256739, bmo#1256968, bmo#1261230, bmo#1261752,
     bmo#1263384, bmo#1264575, bmo#1265577, bmo#1267130,
     bmo#1269729, bmo#1273202, bmo#1273701)
    Miscellaneous memory safety hazards (rv:47.0 / rv:45.2)
  * MFSA 2016-50/CVE-2016-2819 (boo#983655) (bmo#1270381)
    Buffer overflow parsing HTML5 fragments
  * MFSA 2016-51/CVE-2016-2821 (bsc#983653) (bmo#1271460)
    Use-after-free deleting tables from a contenteditable document
  * MFSA 2016-52/CVE-2016-2822 (boo#983652) (bmo#1273129)
    Addressbar spoofing though the SELECT element
  * MFSA 2016-53/CVE-2016-2824 (boo#983651) (bmo#1248580)
    Out-of-bounds write with WebGL shader
  * MFSA 2016-54/CVE-2016-2825 (boo#983649) (bmo#1193093)
    Partial same-origin-policy through setting location.host
    through data URI
  * MFSA 2016-56/CVE-2016-2828 (boo#983646) (bmo#1223810)
    Use-after-free when textures are used in WebGL operations
    after recycle pool destruction

OBS-URL: https://build.opensuse.org/request/show/400713
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=237
This commit is contained in:
Dominique Leuenberger 2016-06-12 16:51:47 +00:00 committed by Git OBS Bridge
commit 011d6fac17
15 changed files with 356 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
MozillaFirefox.changes
View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Tue Jun 7 19:47:25 UTC 2016 - wr@rosenauer.org
- update to Firefox 47.0 (boo#983549)
* Enable VP9 video codec for users with fast machines
* Embedded YouTube videos now play with HTML5 video if Flash is
not installed
* View and search open tabs from your smartphone or another
computer in a sidebar
* Allow no-cache on back/forward navigations for https resources
security fixes:
* MFSA 2016-49/CVE-2016-2815/CVE-2016-2818
(boo#983638)
(bmo#1241896, bmo#1242798, bmo#1243466, bmo#1245743,
bmo#1264300, bmo#1271037, bmo#1234147, bmo#1256493,
bmo#1256739, bmo#1256968, bmo#1261230, bmo#1261752,
bmo#1263384, bmo#1264575, bmo#1265577, bmo#1267130,
bmo#1269729, bmo#1273202, bmo#1273701)
Miscellaneous memory safety hazards (rv:47.0 / rv:45.2)
* MFSA 2016-50/CVE-2016-2819 (boo#983655) (bmo#1270381)
Buffer overflow parsing HTML5 fragments
* MFSA 2016-51/CVE-2016-2821 (bsc#983653) (bmo#1271460)
Use-after-free deleting tables from a contenteditable document
* MFSA 2016-52/CVE-2016-2822 (boo#983652) (bmo#1273129)
Addressbar spoofing though the SELECT element
* MFSA 2016-53/CVE-2016-2824 (boo#983651) (bmo#1248580)
Out-of-bounds write with WebGL shader
* MFSA 2016-54/CVE-2016-2825 (boo#983649) (bmo#1193093)
Partial same-origin-policy through setting location.host
through data URI
* MFSA 2016-56/CVE-2016-2828 (boo#983646) (bmo#1223810)
Use-after-free when textures are used in WebGL operations
after recycle pool destruction
* MFSA 2016-57/CVE-2016-2829 (boo#983644) (bmo#1248329)
Incorrect icon displayed on permissions notifications
* MFSA 2016-58/CVE-2016-2831 (boo#983643) (bmo#1261933)
Entering fullscreen and persistent pointerlock without user
permission
* MFSA 2016-59/CVE-2016-2832 (boo#983632) (bmo#1025267)
Information disclosure of disabled plugins through CSS
pseudo-classes
* MFSA 2016-60/CVE-2016-2833 (boo#983640) (bmo#908933)
Java applets bypass CSP protections
* MFSA 2016-62/CVE-2016-2834 (boo#983639) (bmo#1206283,
bmo#1221620, bmo#1241034, bmo#1241037)
Network Security Services (NSS) vulnerabilities
fixed by requiring NSS 3.23
packaging changes:
* cleanup configure options (boo#981695):
- notably remove GStreamer support which is gone from FF
* remove obsolete patches
- mozilla-libproxy.patch
- mozilla-repo.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 25 16:36:23 UTC 2016 - badshah400@gmail.com Wed May 25 16:36:23 UTC 2016 - badshah400@gmail.com

73
MozillaFirefox.spec
View File

@ -18,10 +18,10 @@
# changed with every update # changed with every update
%define major 46 %define major 47
%define mainver %major.0.1 %define mainver %major.0
%define update_channel release %define update_channel release
%define releasedate 2016050300 %define releasedate 20160606000000
# PIE, full relro (x86_64 for now) # PIE, full relro (x86_64 for now)
%define build_hardened 1 %define build_hardened 1
@ -44,12 +44,6 @@
%define __find_requires sh %{SOURCE4} %define __find_requires sh %{SOURCE4}
%global provfind sh -c "grep -v '.so' | %__find_provides" %global provfind sh -c "grep -v '.so' | %__find_provides"
%global __find_provides %provfind %global __find_provides %provfind
%if 0%{?suse_version} > 1310
%define gstreamer_ver 1.0
%define gstreamer 1
%else
%define gstreamer_ver 0.10
%endif
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
# Note: these are for the openSUSE Firefox builds ONLY. For your own distribution, # Note: these are for the openSUSE Firefox builds ONLY. For your own distribution,
# please get your own set of keys. # please get your own set of keys.
@ -81,7 +75,7 @@ BuildRequires: libnotify-devel
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
BuildRequires: makeinfo BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.12 BuildRequires: mozilla-nspr-devel >= 4.12
BuildRequires: mozilla-nss-devel >= 3.22.3 BuildRequires: mozilla-nss-devel >= 3.23
BuildRequires: nss-shared-helper-devel BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
@ -90,9 +84,6 @@ BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXt-devel BuildRequires: xorg-x11-libXt-devel
BuildRequires: yasm BuildRequires: yasm
BuildRequires: zip BuildRequires: zip
BuildRequires: pkgconfig(gstreamer-%gstreamer_ver)
BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver)
BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver)
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse)
%if 0%{?firefox_use_gtk3} %if 0%{?firefox_use_gtk3}
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
@ -100,26 +91,11 @@ BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0
BuildRequires: pkgconfig(gtk+-unix-print-3.0) BuildRequires: pkgconfig(gtk+-unix-print-3.0)
%endif %endif
# libavcodec is already used if available for H.264 but # libavcodec is required for H.264 support but the
# explicitely loaded by FF. For proper H.264 support the # openSUSE version is currently not able to play H.264
# openSUSE delivered version is not sufficient but currently # therefore the Packman version is required
# prevents even the use of the GStreamer method # minimum version of libavcodec is 53
# https://bugzilla.mozilla.org/show_bug.cgi?id=1234157 Recommends: libavcodec-full >= 0.10.16
# to get H.264 working correctly libavcodec from packman
# is required. As of today the following recommends will
# pull in libavcodec52 from packman since it's the only
# package providing libavcodec but it's not loaded from
# Firefox as the minimal version is 53
#Recommends: libavcodec
%if 0%{?gstreamer} == 1
Requires: libgstreamer-1_0-0
Recommends: gstreamer-fluendo-mp3
Recommends: gstreamer-plugins-libav
%else
Requires: libgstreamer-0_10-0
Recommends: gstreamer-0_10-fluendo-mp3
Recommends: gstreamer-0_10-plugins-ffmpeg
%endif
Version: %{mainver} Version: %{mainver}
Release: 0 Release: 0
%if "%{name}" == "MozillaFirefox" %if "%{name}" == "MozillaFirefox"
@ -165,15 +141,13 @@ Patch3: mozilla-kde.patch
Patch4: mozilla-preferences.patch Patch4: mozilla-preferences.patch
Patch5: mozilla-language.patch Patch5: mozilla-language.patch
Patch6: mozilla-ntlm-full-path.patch Patch6: mozilla-ntlm-full-path.patch
Patch7: mozilla-repo.patch
Patch8: mozilla-openaes-decl.patch Patch8: mozilla-openaes-decl.patch
Patch10: mozilla-no-stdcxx-check.patch Patch10: mozilla-no-stdcxx-check.patch
Patch11: mozilla-libproxy.patch Patch11: mozilla-reduce-files-per-UnifiedBindings.patch
Patch12: mozilla-reduce-files-per-UnifiedBindings.patch Patch12: mozilla-gtk3_20.patch
Patch13: mozilla-gtk3_20.patch Patch13: mozilla-check_return.patch
Patch14: mozilla-check_return.patch Patch14: mozilla-gcc6.patch
Patch15: mozilla-gcc6.patch Patch15: mozilla-exclude-nametablecpp.patch
Patch16: mozilla-exclude-nametablecpp.patch
# Firefox/browser # Firefox/browser
Patch101: firefox-kde.patch Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch Patch102: firefox-no-default-ualocale.patch
@ -279,17 +253,15 @@ cd $RPM_BUILD_DIR/mozilla
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1
%patch8 -p1 %patch8 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1
%if 0%{?firefox_use_gtk3} %if 0%{?firefox_use_gtk3}
%patch13 -p1 %patch12 -p1
%endif %endif
%patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1
# Firefox # Firefox
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
@ -308,7 +280,7 @@ if test "$kdehelperversion" != %{kde_helper_version}; then
exit 1 exit 1
fi fi
source %{SOURCE5} source %{SOURCE5}
export MOZ_SOURCE_STAMP=$REV export MOZ_SOURCE_CHANGESET=$REV
export SOURCE_REPO=$REPO export SOURCE_REPO=$REPO
export source_repo=$REPO export source_repo=$REPO
export MOZ_SOURCE_REPO=$REPO export MOZ_SOURCE_REPO=$REPO
@ -325,13 +297,11 @@ export CFLAGS="${CFLAGS/-g / }"
# Limit RAM usage during link # Limit RAM usage during link
export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
%endif %endif
%if 0%{?build_hardened} %if 0%{?build_hardened}
%ifarch x86_64 %ifarch x86_64
export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now" export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now"
%endif %endif
%endif %endif
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
export CFLAGS="$CFLAGS -mminimal-toc" export CFLAGS="$CFLAGS -mminimal-toc"
%endif %endif
@ -362,8 +332,8 @@ ac_add_options --enable-pie
ac_add_options --disable-optimize ac_add_options --disable-optimize
%endif %endif
%endif %endif
%ifnarch ppc ppc64 ppc64le aarch64 %ifarch ppc ppc64 ppc64le aarch64 %arm
ac_add_options --enable-elf-hack ac_add_options --disable-elf-hack
%endif %endif
ac_add_options --with-system-nspr ac_add_options --with-system-nspr
ac_add_options --with-system-nss ac_add_options --with-system-nss
@ -373,16 +343,12 @@ ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
#ac_add_options --with-system-jpeg # libjpeg-turbo is used internally #ac_add_options --with-system-jpeg # libjpeg-turbo is used internally
#ac_add_options --with-system-png # doesn't work because of missing APNG support #ac_add_options --with-system-png # doesn't work because of missing APNG support
ac_add_options --with-system-zlib ac_add_options --with-system-zlib
ac_add_options --disable-installer
ac_add_options --disable-updater ac_add_options --disable-updater
ac_add_options --disable-tests ac_add_options --disable-tests
ac_add_options --disable-debug ac_add_options --disable-debug
ac_add_options --enable-startup-notification ac_add_options --enable-startup-notification
#ac_add_options --enable-chrome-format=jar #ac_add_options --enable-chrome-format=jar
ac_add_options --enable-update-channel=%{update_channel} ac_add_options --enable-update-channel=%{update_channel}
%if 0%{?gstreamer} == 1
ac_add_options --enable-gstreamer=1.0
%endif
%if %branding %if %branding
ac_add_options --enable-official-branding ac_add_options --enable-official-branding
%endif %endif
@ -391,7 +357,6 @@ ac_add_options --enable-libproxy
ac_add_options --disable-crashreporter ac_add_options --disable-crashreporter
%endif %endif
%ifarch %arm %ifarch %arm
ac_add_options --disable-elf-hack
ac_add_options --with-fpu=vfpv3-d16 ac_add_options --with-fpu=vfpv3-d16
ac_add_options --with-float-abi=hard ac_add_options --with-float-abi=hard
ac_add_options --with-arch=armv7-a ac_add_options --with-arch=armv7-a

4
compare-locales.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2d9566f78b25b2af9028e7cfd2ada63ce5685ac8f80686751335dc2f5ddb7875 oid sha256:c4152df4a9b9c731975f3805a2be896f2a5f5652f817564938867ee0aba6fbdc
size 28388 size 28352

4
create-tar.sh
View File

@ -7,8 +7,8 @@
CHANNEL="release" CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL" BRANCH="releases/mozilla-$CHANNEL"
RELEASE_TAG="FIREFOX_46_0_1_RELEASE" RELEASE_TAG="FIREFOX_47_0_RELEASE"
VERSION="46.0.1" VERSION="47.0"
# mozilla # mozilla
if [ -d mozilla ]; then if [ -d mozilla ]; then

3
firefox-46.0.1-source.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:560ace25ca79f96377b4f0e3f52ca75d151555952051d7984442297391515ba9
size 196701304

3
firefox-47.0-source.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ccff7ad45fbce062caec6861ccdec4a819ce0491ffb49079cd11d3c774f5a5e
size 197750616

131
firefox-kde.patch
View File

@ -1,11 +1,11 @@
# HG changeset patch # HG changeset patch
# Parent fd5629206dcf3f64d85ab177be6bc6076f0f1619 # Parent 4311c6bdf61ac317bc60b25cd89ff67662a75049
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/base/content/browser-kde.xul +++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1175 @@ @@ -0,0 +1,1160 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -77,6 +77,8 @@ new file mode 100644
+ +
+<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+ +
+<script type="application/javascript" src="chrome://browser/content/downloads/downloads.js"/>
+<script type="application/javascript" src="chrome://browser/content/downloads/indicator.js"/>
+<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/> +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
+ +
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
@ -188,12 +190,6 @@ new file mode 100644
+ <vbox> + <vbox>
+ <label id="editBookmarkPanelTitle"/> + <label id="editBookmarkPanelTitle"/>
+ <description id="editBookmarkPanelDescription"/> + <description id="editBookmarkPanelDescription"/>
+ <hbox>
+ <button id="editBookmarkPanelRemoveButton"
+ class="editBookmarkPanelHeaderButton"
+ oncommand="StarUI.removeBookmarkButtonCommand();"
+ accesskey="&editBookmark.removeBookmark.accessKey;"/>
+ </hbox>
+ </vbox> + </vbox>
+ </row> + </row>
+ <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> + <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
@ -204,15 +200,15 @@ new file mode 100644
+ label="&editBookmark.done.label;" + label="&editBookmark.done.label;"
+ default="true" + default="true"
+ oncommand="StarUI.panel.hidePopup();"/> + oncommand="StarUI.panel.hidePopup();"/>
+ <button id="editBookmarkPanelDeleteButton" + <button id="editBookmarkPanelRemoveButton"
+ class="editBookmarkPanelBottomButton" + class="editBookmarkPanelBottomButton"
+ label="&editBookmark.cancel.label;" + oncommand="StarUI.removeBookmarkButtonCommand();"
+ oncommand="StarUI.cancelButtonOnCommand();"/> + accesskey="&editBookmark.removeBookmark.accessKey;"/>
+#else +#else
+ <button id="editBookmarkPanelDeleteButton" + <button id="editBookmarkPanelRemoveButton"
+ class="editBookmarkPanelBottomButton" + class="editBookmarkPanelBottomButton"
+ label="&editBookmark.cancel.label;" + oncommand="StarUI.removeBookmarkButtonCommand();"
+ oncommand="StarUI.cancelButtonOnCommand();"/> + accesskey="&editBookmark.removeBookmark.accessKey;"/>
+ <button id="editBookmarkPanelDoneButton" + <button id="editBookmarkPanelDoneButton"
+ class="editBookmarkPanelBottomButton" + class="editBookmarkPanelBottomButton"
+ label="&editBookmark.done.label;" + label="&editBookmark.done.label;"
@ -471,6 +467,46 @@ new file mode 100644
+ +
+ <tooltip id="dynamic-shortcut-tooltip" + <tooltip id="dynamic-shortcut-tooltip"
+ onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
+
+ <menupopup id="SyncedTabsSidebarContext">
+ <menuitem label="&syncedTabs.context.openTab.label;"
+ accesskey="&syncedTabs.context.openTab.accesskey;"
+ id="syncedTabsOpenSelected"/>
+ <menuitem label="&syncedTabs.context.bookmarkSingleTab.label;"
+ accesskey="&syncedTabs.context.bookmarkSingleTab.accesskey;"
+ id="syncedTabsBookmarkSelected"/>
+ <menuseparator/>
+ <menuitem label="&syncSyncNowItem.label;"
+ accesskey="&syncSyncNowItem.accesskey;"
+ id="syncedTabsRefresh"/>
+ </menupopup>
+ <menupopup id="SyncedTabsSidebarTabsFilterContext"
+ class="textbox-contextmenu">
+ <menuitem label="&undoCmd.label;"
+ accesskey="&undoCmd.accesskey;"
+ cmd="cmd_undo"/>
+ <menuseparator/>
+ <menuitem label="&cutCmd.label;"
+ accesskey="&cutCmd.accesskey;"
+ cmd="cmd_cut"/>
+ <menuitem label="&copyCmd.label;"
+ accesskey="&copyCmd.accesskey;"
+ cmd="cmd_copy"/>
+ <menuitem label="&pasteCmd.label;"
+ accesskey="&pasteCmd.accesskey;"
+ cmd="cmd_paste"/>
+ <menuitem label="&deleteCmd.label;"
+ accesskey="&deleteCmd.accesskey;"
+ cmd="cmd_delete"/>
+ <menuseparator/>
+ <menuitem label="&selectAllCmd.label;"
+ accesskey="&selectAllCmd.accesskey;"
+ cmd="cmd_selectAll"/>
+ <menuseparator/>
+ <menuitem label="&syncSyncNowItem.label;"
+ accesskey="&syncSyncNowItem.accesskey;"
+ id="syncedTabsRefreshFilter"/>
+ </menupopup>
+ </popupset> + </popupset>
+ +
+#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef CAN_DRAW_IN_TITLEBAR
@ -667,10 +703,6 @@ new file mode 100644
+ <box id="notification-popup-box" hidden="true" align="center"> + <box id="notification-popup-box" hidden="true" align="center">
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button" + <image id="default-notification-icon" class="notification-anchor-icon" role="button"
+ aria-label="&urlbar.defaultNotificationAnchor.label;"/> + aria-label="&urlbar.defaultNotificationAnchor.label;"/>
+ <!-- NB: the identity-notification-icon is used for persona-based auth and preffed
+ off by default. It hasn't been updated for some time and liable to being
+ removed.-->
+ <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="geo-notification-icon" class="notification-anchor-icon" role="button" + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"
+ aria-label="&urlbar.geolocationNotificationAnchor.label;"/> + aria-label="&urlbar.geolocationNotificationAnchor.label;"/>
+ <image id="addons-notification-icon" class="notification-anchor-icon" role="button" + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"
@ -811,30 +843,6 @@ new file mode 100644
+ command="Browser:ShowAllBookmarks" + command="Browser:ShowAllBookmarks"
+ key="manBookmarkKb"/> + key="manBookmarkKb"/>
+ <menuseparator/> + <menuseparator/>
+ <menuitem id="BMB_subscribeToPageMenuitem"
+#ifndef XP_MACOSX
+ class="menuitem-iconic subviewbutton"
+#else
+ class="subviewbutton"
+#endif
+ label="&subscribeToPageMenuitem.label;"
+ oncommand="return FeedHandler.subscribeToFeed(null, event);"
+ onclick="checkForMiddleClick(this, event);"
+ observes="singleFeedMenuitemState"/>
+ <menu id="BMB_subscribeToPageMenupopup"
+#ifndef XP_MACOSX
+ class="menu-iconic subviewbutton"
+#else
+ class="subviewbutton"
+#endif
+ label="&subscribeToPageMenupopup.label;"
+ observes="multipleFeedsMenuState">
+ <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
+ onpopupshowing="return FeedHandler.buildFeedList(event.target);"
+ oncommand="return FeedHandler.subscribeToFeed(null, event);"
+ onclick="checkForMiddleClick(this, event);"/>
+ </menu>
+ <menuseparator/>
+ <menu id="BMB_bookmarksToolbar" + <menu id="BMB_bookmarksToolbar"
+ class="menu-iconic bookmark-item subviewbutton" + class="menu-iconic bookmark-item subviewbutton"
+ label="&personalbarCmd.label;" + label="&personalbarCmd.label;"
@ -1133,29 +1141,6 @@ new file mode 100644
+ +
+ <vbox id="browser-bottombox" layer="true"> + <vbox id="browser-bottombox" layer="true">
+ <notificationbox id="global-notificationbox" notificationside="bottom"/> + <notificationbox id="global-notificationbox" notificationside="bottom"/>
+ <toolbar id="developer-toolbar"
+ hidden="true">
+#ifdef XP_MACOSX
+ <toolbarbutton id="developer-toolbar-closebutton"
+ class="devtools-closebutton"
+ oncommand="DeveloperToolbar.hide();"
+ tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
+#endif
+ <stack class="gclitoolbar-stack-node" flex="1">
+ <textbox class="gclitoolbar-input-node" rows="1"/>
+ <hbox class="gclitoolbar-complete-node"/>
+ </stack>
+ <toolbarbutton id="developer-toolbar-toolbox-button"
+ class="developer-toolbar-button"
+ observes="devtoolsMenuBroadcaster_DevToolbox"
+ tooltiptext="&devToolbarToolsButton.tooltip;"/>
+#ifndef XP_MACOSX
+ <toolbarbutton id="developer-toolbar-closebutton"
+ class="devtools-closebutton"
+ oncommand="DeveloperToolbar.hide();"
+ tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
+#endif
+ </toolbar>
+ </vbox> + </vbox>
+ +
+ <svg:svg height="0"> + <svg:svg height="0">
@ -1266,7 +1251,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js --- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js +++ b/browser/components/preferences/in-content/main.js
@@ -19,16 +19,22 @@ var gMainPane = { @@ -23,16 +23,22 @@ var gMainPane = {
init: function () init: function ()
{ {
function setEventListener(aId, aEventType, aCallback) function setEventListener(aId, aEventType, aCallback)
@ -1289,10 +1274,10 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
// when the user will select the default. We refresh here periodically // when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also // in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open. // be set while the prefs are open.
@@ -704,16 +710,27 @@ var gMainPane = { @@ -736,16 +742,27 @@ var gMainPane = {
*/ let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser");
setDefaultBrowser: function() alwaysCheckPref.value = true;
{
let shellSvc = getShellService(); let shellSvc = getShellService();
if (!shellSvc) if (!shellSvc)
return; return;
@ -1313,8 +1298,8 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
Cu.reportError(ex); Cu.reportError(ex);
return; return;
} }
let selectedIndex =
shellSvc.isDefaultBrowser(false, true) ? 1 : 0; let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
document.getElementById("setDefaultPane").selectedIndex = selectedIndex; document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
} }
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
@ -1632,7 +1617,7 @@ new file mode 100644
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in
@@ -703,16 +703,17 @@ @@ -697,16 +697,17 @@
@RESPATH@/greprefs.js @RESPATH@/greprefs.js
@RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions @RESPATH@/browser/defaults/permissions

3
l10n-46.0.1.tar.xz
View File

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

3
l10n-47.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:19442f74115dfe49335c27ba6c52a0fdc6017349f836e776db3862d2a97b54c8
size 43605724

122
l10n_changesets.txt
View File

@ -1,90 +1,92 @@
ach 658769a76613 ach 9a0c8e338b70
af 431e02c10881 af 431e02c10881
an fe436c75f71d an fe436c75f71d
ar bbcf06888dc5 ar bbcf06888dc5
as 8313f975ae77 as 8313f975ae77
ast 0300b60cd340 ast 0300b60cd340
az fd96727d2a26 az db362112cd4d
be b72077740aac be b72077740aac
bg 9f7507dd2b92 bg 9f7507dd2b92
bn-BD fe0a6bb82a2d bn-BD 1dac94619464
bn-IN a2ea6b87d80d bn-IN a2ea6b87d80d
br 95b028350e29 br e4c45f737a88
bs cfee6f5b1e50 bs cfee6f5b1e50
ca e8ca2d46b4a8 ca 55814ed0a2ee
cs ed6004b91b51 cak 244b8a568146
cy 5bbcbba9b054 cs a98b5d34950d
da 324fe068c0b9 cy 02a8a09a2a24
de 217ff3f0054a da 1976f45a00fb
dsb 7cdfb5d9dc5d de 69c491b3e8dd
dsb 60185ee5350d
el 22b959c9a739 el 22b959c9a739
en-GB 36012ab486ad en-GB ac4d309f11aa
en-ZA 1c91f05aae5a en-ZA 52a936eeeea1
eo 049c1b065f4c eo 9402e7dc1816
es-AR b3647b1d5927 es-AR d3e6fdb0980e
es-CL e45186f983b9 es-CL 247114b95260
es-ES 6fe131a8b07f es-ES 05251e5fad44
es-MX 4cd511663283 es-MX 198b582408f2
et ecae9df9c92a et ecae9df9c92a
eu 1a65e2c03dda eu 5b00fd411da4
fa e5993d9fb76e fa c64ea222eb3a
ff 8373353b43c4 ff 8373353b43c4
fi b743718650bc fi 485cd6730972
fr 7d0bb8edc149 fr 262385fe83a0
fy-NL 02ee99ad3f83 fy-NL d133532b4a76
ga-IE 713ecb614f77 ga-IE 2217b283ff59
gd e5b86736a5f9 gd 664cfe62d15b
gl c869caff337a gl c869caff337a
gn 65b2894520b6 gn 65b2894520b6
gu-IN 6245b4309461 gu-IN 6245b4309461
he ee92b661d299 he 2d122d643e0b
hi-IN bba2a926e4f8 hi-IN bba2a926e4f8
hr 8502beb4ee68 hr 5e68406d5630
hsb c91a11523487 hsb ed7044697b0a
hu 09bbddfef7ee hu ea25586b7644
hy-AM 3d7a9324fb25 hy-AM 723627d1c0a4
id cb8f841d30d2 id d84757c01f40
is 46c99105eb3b is 0b19292ab8a3
it 6063a6d94e13 it 9ada32a4f24b
ja 5ff86cadfe9a ja 6374f9dd3854
ja-JP-mac ab760b3dcdd1 ja-JP-mac 28d0060377c0
kk 5a7bd05bf942 kk 58b2a6152124
km 339790840ac1 km 339790840ac1
kn b23d8fbcf41a kn a7e2c93d27ad
ko 5f303ed16778 ko 4c2bafb385f3
lij e9113fac3a93 lij e9113fac3a93
lt 628e96e62e44 lt 64c104a758bf
lv 063998fdecf8 lv 918ea0cd0aca
mai ce010a305377 mai ce010a305377
mk ffdf2a789185 mk ffdf2a789185
ml 1b85d75836cd ml 1b85d75836cd
mr 553ff31f4edd mr 943d62e6e06d
ms 41bbf86ac0d9 ms 41bbf86ac0d9
nb-NO 5e6e5710fac9 nb-NO bee48c9ea2d4
nl ac486141ab40 nl 3bdea753600d
nn-NO be9e3eeb75fb nn-NO 1deb8231f357
or febd1b04dbfc or febd1b04dbfc
pa-IN 6c5ed1be55fb pa-IN 6c5ed1be55fb
pl 49e141118acb pl c9e8c3b4977c
pt-BR cd1aef7b5045 pt-BR ba6e3510ab03
pt-PT 2e4fd2a1f98f pt-PT 89d85625e259
rm 0a52db6a6117 rm 5c20929daf23
ro c6ac34be77b1 ro b1baa279bda4
ru 3f0b3c8e19a4 ru 2248b98b11c2
si 03a3b09a2203 si 03a3b09a2203
sk 3505a5f99bff sk b1a81bf66ed4
sl 1e098ab8c27a sl 6079300745a1
son 3ae9a4ff0453 son 3ae9a4ff0453
sq c24e570a4207 sq bc47aefcea37
sr 896d72a0fa21 sr 93d5749016bd
sv-SE ea1de38fe731 sv-SE 711ed419239c
ta f9dbc2cca1fb ta f9dbc2cca1fb
te 286ff9885ea2 te 286ff9885ea2
th d630f05d665f th d630f05d665f
tr b751d2d9b6ee tr 4c05084f5ef2
uk c5cdb9068667 uk 6b23f6bb9dcb
uz dc28cf99c5cf uz 1209fe62df1c
vi 68ce305343a3 vi 68ce305343a3
xh f3eb8f92afe8 xh 8466fb6c8797
zh-CN d73d448f89d6 zh-CN bedbf795f45e
zh-TW 44c9950bb3e6 zh-TW 8a8fcc28bce0

32
mozilla-kde.patch
View File

@ -1,5 +1,5 @@
# HG changeset patch # HG changeset patch
# Parent 61cdc9af8ceaf75083e751e0d6497feddc26f7ba # Parent f2726ebfae7cdded8e7ca6030829b0a3fae4e438
Description: Add KDE integration to Firefox (toolkit parts) Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com> Author: Lubos Lunak <lunak@suse.com>
@ -27,7 +27,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#include "prefread.h" #include "prefread.h"
#include "prefapi_private_data.h" #include "prefapi_private_data.h"
@@ -1135,16 +1136,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char @@ -1138,16 +1139,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId) static nsresult pref_LoadPrefsInDirList(const char *listId)
{ {
@ -62,7 +62,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
return NS_OK; return NS_OK;
bool hasMore; bool hasMore;
@@ -1160,17 +1179,17 @@ static nsresult pref_LoadPrefsInDirList( @@ -1163,17 +1182,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf; nsAutoCString leaf;
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
{ {
nsZipItemPtr<char> manifest(jarReader, name, true); nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
@@ -1264,24 +1283,36 @@ static nsresult pref_InitInitialObjects( @@ -1267,24 +1286,36 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = { static const char* specialFiles[] = {
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
@ -337,7 +337,7 @@ new file mode 100644
+ +
+ <xul:hbox class="dialog-button-box" anonid="buttons" + <xul:hbox class="dialog-button-box" anonid="buttons"
+ xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient" + xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient"
+#ifdef XP_UNIX_GNOME +#ifdef XP_UNIX
+ > + >
+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> + <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
@ -782,7 +782,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml +++ b/toolkit/content/widgets/preferences-kde.xml
@@ -0,0 +1,1406 @@ @@ -0,0 +1,1408 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+ +
+<!DOCTYPE bindings [ +<!DOCTYPE bindings [
@ -1228,7 +1228,9 @@ new file mode 100644
+ Components.utils.reportError(e); + Components.utils.reportError(e);
+ } + }
+ } + }
+ var val = rv !== undefined ? rv : (this.instantApply ? this.valueFromPreferences : this.value); + var val = rv;
+ if (val === undefined)
+ val = this.instantApply ? this.valueFromPreferences : this.value;
+ // if the preference is marked for reset, show default value in UI + // if the preference is marked for reset, show default value in UI
+ if (val === undefined) + if (val === undefined)
+ val = this.defaultValue; + val = this.defaultValue;
@ -1856,12 +1858,12 @@ new file mode 100644
+ .getService(Components.interfaces.nsIScriptSecurityManager); + .getService(Components.interfaces.nsIScriptSecurityManager);
+ if (this.type == "child" && window.opener && + if (this.type == "child" && window.opener &&
+ secMan.isSystemPrincipal(window.opener.document.nodePrincipal)) { + secMan.isSystemPrincipal(window.opener.document.nodePrincipal)) {
+ var psvc = Components.classes["@mozilla.org/preferences-service;1"] + let psvc = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch); + .getService(Components.interfaces.nsIPrefBranch);
+ var pdocEl = window.opener.document.documentElement; + var pdocEl = window.opener.document.documentElement;
+ if (pdocEl.instantApply) { + if (pdocEl.instantApply) {
+ var panes = this.preferencePanes; + let panes = this.preferencePanes;
+ for (var i = 0; i < panes.length; ++i) + for (let i = 0; i < panes.length; ++i)
+ panes[i].writePreferences(true); + panes[i].writePreferences(true);
+ } + }
+ else { + else {
@ -1873,12 +1875,12 @@ new file mode 100644
+ var id = window.location.href + "#childprefs"; + var id = window.location.href + "#childprefs";
+ var childPrefs = pdoc.getElementById(id); + var childPrefs = pdoc.getElementById(id);
+ if (!childPrefs) { + if (!childPrefs) {
+ var childPrefs = pdoc.createElement("preferences"); + childPrefs = pdoc.createElement("preferences");
+ currentPane.appendChild(childPrefs); + currentPane.appendChild(childPrefs);
+ childPrefs.id = id; + childPrefs.id = id;
+ } + }
+ var panes = this.preferencePanes; + let panes = this.preferencePanes;
+ for (var i = 0; i < panes.length; ++i) { + for (let i = 0; i < panes.length; ++i) {
+ var preferences = panes[i].preferences; + var preferences = panes[i].preferences;
+ for (var j = 0; j < preferences.length; ++j) { + for (var j = 0; j < preferences.length; ++j) {
+ // Try to find a preference element for the same preference. + // Try to find a preference element for the same preference.
@ -1909,11 +1911,11 @@ new file mode 100644
+ } + }
+ } + }
+ else { + else {
+ var panes = this.preferencePanes; + let panes = this.preferencePanes;
+ for (var i = 0; i < panes.length; ++i) + for (var i = 0; i < panes.length; ++i)
+ panes[i].writePreferences(false); + panes[i].writePreferences(false);
+ +
+ var psvc = Components.classes["@mozilla.org/preferences-service;1"] + let psvc = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefService); + .getService(Components.interfaces.nsIPrefService);
+ psvc.savePrefFile(null); + psvc.savePrefFile(null);
+ } + }

26
mozilla-libproxy.patch
View File

@ -1,26 +0,0 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 95b421ca30846be2b5d7230d72263e6dff042d0b
Bug 1220399 - building with libproxy support fails
diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
@@ -2,16 +2,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsISystemProxySettings.h"
#include "mozilla/ModuleUtils.h"
#include "nsIServiceManager.h"
#include "nsIURI.h"
+#include "nsNetCID.h"
#include "nsString.h"
#include "nsCOMPtr.h"
#include "nspr.h"
extern "C" {
#include <proxy.h>
}

34
mozilla-repo.patch
View File

@ -1,34 +0,0 @@
# HG changeset patch
# Parent 80b6464bd883864fce57e8748010869af1be69e9
# Parent 808d61f33afa6fb9921d3a7f994a71cf2dd9331a
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -147,24 +147,24 @@ else
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
endif
ifndef INCLUDED_RCS_MK
USE_RCS_MK := 1
include $(MOZILLA_DIR)/config/makefiles/makeutils.mk
endif
-MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node}\n" 2>/dev/null))
+#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node}\n" 2>/dev/null))
###########################################################################
# bug: 746277 - preserve existing functionality.
# MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists
###########################################################################
ifdef MOZ_INCLUDE_SOURCE_INFO
-MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
+#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
endif
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
MOZ_BUILDID_INFO_TXT_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME)_info.txt
MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json
MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json
MOZ_TEST_PACKAGES_FILE_TC = $(DIST)/$(PKG_PATH)/test_packages_tc.json

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

@ -4,10 +4,10 @@ Subject: use libnsssharedhelper if available at compile time
(can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
References: References:
diff --git a/configure.in b/configure.in diff --git a/old-configure.in b/old-configure.in
--- a/configure.in --- a/old-configure.in
+++ b/configure.in +++ b/old-configure.in
@@ -8310,16 +8310,31 @@ if test "$MOZ_ENABLE_SKIA"; then @@ -8187,16 +8187,31 @@ if test "$MOZ_ENABLE_SKIA"; then
AC_DEFINE(USE_SKIA_GPU) AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU)
fi fi
@ -87,7 +87,7 @@ diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNS
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "mozilla/PublicSSL.h" #include "mozilla/PublicSSL.h"
#include "mozilla/Services.h" #include "mozilla/Services.h"
@@ -1007,17 +1014,31 @@ nsNSSComponent::InitializeNSS() @@ -1017,17 +1024,31 @@ nsNSSComponent::InitializeNSS()
return rv; return rv;
} }
} }
@ -122,22 +122,22 @@ diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNS
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build --- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build +++ b/toolkit/library/moz.build
@@ -205,16 +205,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' @@ -209,16 +209,18 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
'stagefright_omx',
]
if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
OS_LIBS += [ OS_LIBS += [
'rt', 'rt',
] ]
+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
+
OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
OS_LIBS += CONFIG['MOZ_SERVO_LIBS']
+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
+
if CONFIG['MOZ_NATIVE_JPEG']: if CONFIG['MOZ_NATIVE_JPEG']:
OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
if CONFIG['MOZ_NATIVE_PNG']: if CONFIG['MOZ_NATIVE_PNG']:
OS_LIBS += CONFIG['MOZ_PNG_LIBS'] OS_LIBS += CONFIG['MOZ_PNG_LIBS']
if CONFIG['MOZ_NATIVE_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']

2
source-stamp.txt
View File

@ -1,2 +1,2 @@
REV=0b8492c110be REV=b0310cb90fd0
REPO=http://hg.mozilla.org/releases/mozilla-release REPO=http://hg.mozilla.org/releases/mozilla-release