Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2014-06-16 21:42:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2014-05-13 20:47:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2014-06-16 21:43:16.000000000 +0200 @@ -1,0 +2,45 @@ +Mon Jun 9 08:28:17 UTC 2014 - [email protected] + +- update to Firefox 30.0 (bnc#881874) + * MFSA 2014-48/CVE-2014-1533/CVE-2014-1534 + (bmo#921622, bmo#967354, bmo#969517, bmo#969549, bmo#973874, + bmo#978652, bmo#978811, bmo#988719, bmo#990868, bmo#991981, + bmo#992274, bmo#994907, bmo#995679, bmo#995816, bmo#995817, + bmo#996536, bmo#996715, bmo#999651, bmo#1000598, + bmo#1000960, bmo#1002340, bmo#1005578, bmo#1007223, + bmo#1009952, bmo#1011007) + Miscellaneous memory safety hazards (rv:30.0) + * MFSA 2014-49/CVE-2014-1536/CVE-2014-1537/CVE-2014-1538 + (bmo#989994, bmo#999274, bmo#1005584) + Use-after-free and out of bounds issues found using Address + Sanitizer + * MFSA 2014-50/CVE-2014-1539 (bmo#995603) + Clickjacking through cursor invisability after Flash interaction + * MFSA 2014-51/CVE-2014-1540 (bmo#978862) + Use-after-free in Event Listener Manager + * MFSA 2014-52/CVE-2014-1541 (bmo#1000185) + Use-after-free with SMIL Animation Controller + * MFSA 2014-53/CVE-2014-1542 (bmo#991533) + Buffer overflow in Web Audio Speex resampler + * MFSA 2014-54/CVE-2014-1543 (bmo#1011859) + Buffer overflow in Gamepad API + * MFSA 2014-55/CVE-2014-1545 (bmo#1018783) + Out of bounds write in NSPR +- rebased patches +- removed obsolete patches + * firefox-browser-css.patch + * mozilla-aarch64-bmo-962488.patch + * mozilla-aarch64-bmo-963023.patch + * mozilla-aarch64-bmo-963024.patch + * mozilla-aarch64-bmo-963027.patch + * mozilla-ppc64-xpcom.patch + * mozilla-ppc64le-javascript.patch + * mozilla-ppc64le-libffi.patch + * mozilla-ppc64le-mfbt.patch + * mozilla-ppc64le-webrtc.patch + * mozilla-ppc64le-xpcom.patch + * mozilla-ppc64le-build.patch +- requires NSPR 4.10.6 +- enabled GStreamer 1.0 usage for 13.2 and above + +------------------------------------------------------------------- Old: ---- firefox-29.0.1-source.tar.xz l10n-29.0.1.tar.xz mozilla-aarch64-bmo-962488.patch mozilla-aarch64-bmo-963023.patch mozilla-aarch64-bmo-963024.patch mozilla-aarch64-bmo-963027.patch mozilla-ppc64-xpcom.patch mozilla-ppc64le-build.patch mozilla-ppc64le-javascript.patch mozilla-ppc64le-libffi.patch mozilla-ppc64le-mfbt.patch mozilla-ppc64le-webrtc.patch mozilla-ppc64le-xpcom.patch New: ---- firefox-30.0-source.tar.xz l10n-30.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -17,15 +17,18 @@ # -%define major 29 -%define mainver %major.0.1 +%define major 30 +%define mainver %major.0 %define update_channel release -%if %suse_version > 1220 -%define gstreamer_ver 0.10 +%if %suse_version > 1210 +%if %suse_version > 1310 +%define gstreamer_ver 1.0 +%define gstreamer 1 %else %define gstreamer_ver 0.10 %endif +%endif Name: MozillaFirefox BuildRequires: Mesa-devel @@ -51,7 +54,7 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.10.3 +BuildRequires: mozilla-nspr-devel >= 4.10.6 BuildRequires: mozilla-nss-devel >= 3.16 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) @@ -59,13 +62,19 @@ BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) +%if 0%{?gstreamer} == 1 +Requires: libgstreamer-1_0-0 +Recommends: gstreamer-fluendo-mp3 +Recommends: gstreamer-plugin-libav +%else Requires: libgstreamer-0_10-0 Recommends: gstreamer-0_10-fluendo-mp3 Recommends: gstreamer-0_10-plugins-ffmpeg %endif +%endif Version: %{mainver} Release: 0 -%define releasedate 2014050900 +%define releasedate 2014060900 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -108,19 +117,8 @@ Patch12: mozilla-arm-disable-edsp.patch Patch13: mozilla-ppc.patch Patch14: mozilla-libproxy-compat.patch -Patch15: mozilla-ppc64le-build.patch -Patch16: mozilla-ppc64le-javascript.patch -Patch17: mozilla-ppc64le-libffi.patch -Patch18: mozilla-ppc64le-mfbt.patch -Patch19: mozilla-ppc64le-webrtc.patch -Patch20: mozilla-ppc64le-xpcom.patch -Patch21: mozilla-ppc64-xpcom.patch # Gecko/Toolkit AArch64 Porting Patch30: mozilla-aarch64-bmo-810631.patch -Patch31: mozilla-aarch64-bmo-962488.patch -Patch32: mozilla-aarch64-bmo-963027.patch -Patch33: mozilla-aarch64-bmo-963023.patch -Patch34: mozilla-aarch64-bmo-963024.patch # Firefox/browser Patch101: firefox-kde.patch @@ -198,7 +196,7 @@ %package translations-other Summary: Extra translations for Firefox Group: System/Localization -Provides: locale(%{name}:ach;af;an;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lij;lt;lv;mai;mk;ml;mr;ms;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;vi;xh;zu) +Provides: locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -261,18 +259,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 %patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 # Firefox %patch101 -p1 @@ -340,6 +327,9 @@ ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar ac_add_options --enable-update-channel=%{update_channel} +%if 0%{?gstreamer} == 1 +ac_add_options --enable-gstreamer=1.0 +%endif %if %suse_version > 1130 ac_add_options --disable-gnomevfs ac_add_options --enable-gio ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_29_0_1_RELEASE" -VERSION="29.0.1" +RELEASE_TAG="FIREFOX_30_0_RELEASE" +VERSION="30.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-29.0.1-source.tar.xz -> firefox-30.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-29.0.1-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-30.0-source.tar.xz differ: char 26, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 5defe7bd2f041c227fe4a65f8a90e6cc42a9a339 +# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -133,16 +133,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifdef MOZ_WIDGET_GTK @@ -29,7 +29,7 @@ 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 -@@ -42,18 +42,21 @@ BRANDING_FILES := \ +@@ -36,18 +36,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) @@ -47,14 +47,14 @@ $(NULL) endif - ifeq ($(OS_ARCH),OS2) - BRANDING_FILES := \ - firefox-os2.ico \ - document-os2.ico \ + BRANDING_DEST := $(DIST)/branding + BRANDING_TARGET := export + INSTALL_TARGETS += BRANDING + 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 -@@ -571,18 +571,21 @@ +@@ -611,18 +611,21 @@ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/chrome/toolkit@JAREXT@ ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1217 @@ +@@ -0,0 +1,1219 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -411,14 +411,9 @@ + <image class="sync-panel-icon"/> + <vbox class="sync-panel-inner"> + <description id="sync-start-panel-title" -+ value="&syncStartPanel.heading;"/> -+ <description id="sync-start-panel-subtitle"> -+#ifdef XP_UNIX -+ &syncStartPanel.subTitleUnix; -+#else -+ &syncStartPanel.subTitle; -+#endif -+ </description> ++ value="&syncStartPanel2.heading;"/> ++ <description id="sync-start-panel-subtitle" ++ value="&syncStartPanel2.subTitle;"/> + </vbox> + </hbox> + </panel> @@ -714,6 +709,8 @@ + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> + </box> @@ -813,6 +810,12 @@ + oncommand="toggleSidebar('viewBookmarksSidebar');"> + <observes element="viewBookmarksSidebar" attribute="checked"/> + </menuitem> ++ <!-- NB: temporary solution for bug 985024, this should go away soon. --> ++ <menuitem id="BMB_bookmarksShowAllTop" ++ class="menuitem-iconic subviewbutton" ++ label="&showAllBookmarks2.label;" ++ command="Browser:ShowAllBookmarks" ++ key="manBookmarkKb"/> + <menuseparator/> + <menuitem id="BMB_subscribeToPageMenuitem" +#ifndef XP_MACOSX @@ -1111,7 +1114,6 @@ + command="Social:ToggleNotifications" + label="&social.toggleNotifications.label;" + accesskey="&social.toggleNotifications.accesskey;"/> -+ <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> + <menuseparator/> + <menuseparator class="social-provider-menu" hidden="true"/> + <menuitem class="social-addons-menuitem" command="Social:Addons" @@ -1223,7 +1225,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -66,16 +66,18 @@ browser.jar: +@@ -62,16 +62,18 @@ browser.jar: content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) @@ -1805,7 +1807,7 @@ 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 -@@ -654,19 +654,21 @@ +@@ -641,19 +641,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/browser/defaults/profile/prefs.js ++++++ l10n-29.0.1.tar.xz -> l10n-30.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-29.0.1.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-30.0.tar.xz differ: char 46, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -44,7 +44,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1113,16 +1114,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1119,16 +1120,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -79,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -1138,17 +1157,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1144,17 +1163,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -98,7 +98,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1242,28 +1261,40 @@ static nsresult pref_InitInitialObjects( +@@ -1248,26 +1267,38 @@ 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) @@ -113,8 +113,6 @@ #elif defined(_AIX) , "aix.js" #endif - #elif defined(XP_OS2) - "os2pref.js" #elif defined(XP_BEOS) "beos.js" #endif @@ -184,21 +182,21 @@ 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 -@@ -4,9 +4,10 @@ +@@ -1,9 +1,9 @@ + # + # 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 $(topsrcdir)/config/rules.mk - CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI - - LOCAL_INCLUDES += \ - -I$(srcdir)/../protobuf \ -+ -I$(topsrcdir)/toolkit/xre \ - $(NULL) + CXXFLAGS += $(TK_CFLAGS) +- ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -41,16 +41,20 @@ +@@ -42,16 +42,20 @@ #ifdef XP_WIN #include <shlobj.h> #include "nsWindowsHelpers.h" @@ -219,7 +217,7 @@ #include "AndroidBridge.h" using namespace mozilla::widget::android; #endif -@@ -2687,16 +2691,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2695,16 +2699,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -245,7 +243,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2724,19 +2737,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2732,19 +2745,20 @@ nsDownload::SetState(DownloadState aStat // because if it is, they'll click open the download manager and // the items they downloaded will have been removed. alerts->ShowAlertNotification( @@ -270,7 +268,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -55,29 +55,33 @@ toolkit.jar: +@@ -56,29 +56,33 @@ toolkit.jar: content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) content/global/bindings/browser.xml (widgets/browser.xml) @@ -308,7 +306,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,451 @@ +@@ -0,0 +1,449 @@ +<?xml version="1.0"?> +<!-- 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 @@ -341,7 +339,7 @@ + <xul:button dlgtype="cancel" class="dialog-button"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> +#elif XP_UNIX -+ pack="end"> ++ > + <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:spacer anonid="spacer" flex="1" hidden="true"/> @@ -728,8 +726,6 @@ + </implementation> + + <handlers> -+ <handler event="keypress" keycode="VK_ENTER" -+ group="system" action="this._hitEnter(event);"/> + <handler event="keypress" keycode="VK_RETURN" + group="system" action="this._hitEnter(event);"/> + <handler event="keypress" keycode="VK_ESCAPE" group="system"> @@ -1350,7 +1346,7 @@ + <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> +#elif XP_UNIX -+ pack="end"> ++ > + <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:spacer anonid="spacer" flex="1"/> @@ -2197,13 +2193,13 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build -@@ -45,17 +45,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt - 'nsNativeAppSupportQt.cpp', - 'nsQAppInstance.cpp', +@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt + GENERATED_SOURCES += [ + 'moc_nsNativeAppSupportQt.cpp', ] - elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': SOURCES += [ - 'nsNativeAppSupportOS2.cpp', + 'nsNativeAppSupportQt.cpp', + 'nsQAppInstance.cpp', ] elif CONFIG['MOZ_ENABLE_GTK']: + EXPORTS += ['nsKDEUtils.h'] @@ -2617,7 +2613,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -19,9 +19,10 @@ endif +@@ -6,9 +6,10 @@ ifdef MOZ_ENABLE_DBUS OS_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) endif @@ -2631,7 +2627,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build -@@ -81,17 +81,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco +@@ -80,17 +80,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco else: # These files can't be built in unified mode because they force NSPR logging. SOURCES += [ @@ -3440,10 +3436,10 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in -@@ -14,9 +14,10 @@ LOCAL_INCLUDES = \ - -I$(topsrcdir)/chrome/src \ - -I$(topsrcdir)/modules/libjar \ - $(NULL) +@@ -2,9 +2,10 @@ + # 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 $(topsrcdir)/config/rules.mk @@ -3583,19 +3579,6 @@ if (directive->regfunc) { if (GeckoProcessType_Default != XRE_GetProcessType()) -diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in ---- a/xpcom/io/Makefile.in -+++ b/xpcom/io/Makefile.in -@@ -1,8 +1,8 @@ - # 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/. - - MOZILLA_INTERNAL_API = 1 - include $(topsrcdir)/config/rules.mk - --LOCAL_INCLUDES += -I.. -+LOCAL_INCLUDES += -I.. -I$(topsrcdir)/toolkit/xre diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp @@ -3617,7 +3600,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1811,46 +1812,52 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1813,46 +1814,52 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3684,7 +3667,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1858,16 +1865,23 @@ nsLocalFile::Reveal() +@@ -1860,16 +1867,23 @@ nsLocalFile::Reveal() return NS_ERROR_FAILURE; #endif } ++++++ mozilla-language.patch ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# Parent df748bfc0eaca6dedf086cfd7167392416bfae27 +# Parent 13eb644c1216aed92b29dbc63fc26ce66f98c66c Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp -@@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void) +@@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void) nsRefPtr<nsLocale> resultLocale(new nsLocale()); NS_ENSURE_TRUE_VOID(resultLocale); @@ -24,7 +24,7 @@ for( i = 0; i < LocaleListLength; i++ ) { nsresult result; -@@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void) +@@ -150,16 +151,21 @@ nsLocaleService::nsLocaleService(void) } else { CopyASCIItoUTF16(lang, platformLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale); @@ -45,4 +45,4 @@ mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX - #ifdef XP_OS2 + ++++++ mozilla-preferences.patch ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -5,19 +5,19 @@ package unconditionally. # HG changeset patch -# Parent bf7f0353aa8e00b1deaa05b7cb84bb7ea4c9ce8f +# Parent 5c086bb8e0fa4f1600aced485e6156b0cdcd1755 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 -@@ -1554,17 +1554,17 @@ pref("intl.charsetmenu.browser.more5", - pref("intl.charsetmenu.mailedit", "chrome://global/locale/intl.properties"); +@@ -1428,17 +1428,17 @@ pref("intl.charsetmenu.mailedit", 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.fallback.override", ""); + pref("intl.charset.fallback.tld", true); pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); -pref("intl.locale.matchOS", false); +pref("intl.locale.matchOS", true); ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8113,16 +8113,31 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8069,16 +8069,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) @@ -79,7 +79,7 @@ #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" -@@ -1117,17 +1124,31 @@ nsNSSComponent::InitializeNSS() +@@ -1129,17 +1136,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; @@ -115,8 +115,8 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -223,17 +223,17 @@ endif - ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) +@@ -161,17 +161,17 @@ endif + ifneq (,$(filter WINNT,$(OS_ARCH))) SDK_LIBRARY = $(IMPORT_LIBRARY) else SDK_LIBRARY = $(SHARED_LIBRARY) @@ -130,7 +130,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) OS_LIBS += \ - -framework SystemConfiguration \ - -framework QTKit \ - -framework IOKit \ - -F$(MACOS_PRIVATE_FRAMEWORKS_DIR) -framework CoreUI \ + $(TK_LIBS) \ + $(NULL) + endif + ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.Cp2sgq/_old 2014-06-16 21:43:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp2sgq/_new 2014-06-16 21:43:34.000000000 +0200 @@ -1,2 +1,2 @@ -REV=0cd2e9a8ba6f +REV=529a45c94e5a REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
