Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2015-01-21 21:50:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-25 23:19:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2015-01-21 21:50:48.000000000 +0100 @@ -1,0 +2,39 @@ +Sat Jan 10 18:36:37 UTC 2015 - [email protected] + +- update to Firefox 35.0 (bnc#910669) + notable features: + * Firefox Hello with new rooms-based conversations model + * Implemented HTTP Public Key Pinning Extension (for enhanced + authentication of encrypted connections) + security fixes: + * MFSA 2015-01/CVE-2014-8634/CVE-2014-8635 + Miscellaneous memory safety hazards + * MFSA 2015-02/CVE-2014-8637 (bmo#1094536) + Uninitialized memory use during bitmap rendering + * MFSA 2015-03/CVE-2014-8638 (bmo#1080987) + sendBeacon requests lack an Origin header + * MFSA 2015-04/CVE-2014-8639 (bmo#1095859) + Cookie injection through Proxy Authenticate responses + * MFSA 2015-05/CVE-2014-8640 (bmo#1100409) + Read of uninitialized memory in Web Audio + * MFSA 2015-06/CVE-2014-8641 (bmo#1108455) + Read-after-free in WebRTC + * MFSA 2015-07/CVE-2014-8643 (bmo#1114170) (Windows-only) + Gecko Media Plugin sandbox escape + * MFSA 2015-08/CVE-2014-8642 (bmo#1079658) + Delegated OCSP responder certificates failure with + id-pkix-ocsp-nocheck extension + * MFSA 2015-09/CVE-2014-8636 (bmo#987794) + XrayWrapper bypass through DOM objects +- rebased patches +- dropped explicit support for everything older than 12.3 + (including SLES11) + * merge firefox-kde.patch and firefox-kde-114.patch + * dropped mozilla-sle11.patch +- reworked specfile to build conditionally based on release channel + either Firefox or Firefox Developer Edition +- added mozilla-openaes-decl.patch to fix implicit declarations +- obsolete tracker-miner-firefox < 0.15 because it leads to startup + crashes (bnc#908892) + +------------------------------------------------------------------- @@ -33,0 +73 @@ +- rebased patches Old: ---- firefox-34.0.5-source.tar.xz firefox-kde-114.patch l10n-34.0.5.tar.xz mozilla-sle11.patch New: ---- firefox-35.0-source.tar.xz l10n-35.0.tar.xz mozilla-openaes-decl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:04.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package MozillaFirefox # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2014 Wolfgang Rosenauer +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2015 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,38 +18,44 @@ # changed with every update -%define major 34 -%define mainver %major.0.5 +%define major 35 +%define mainver %major.0 %define update_channel release -%define releasedate 2014112600 +%define releasedate 2015010900 # general build definitions +%if "%{update_channel}" != "aurora" +%define progname firefox +%define pkgname MozillaFirefox +%define appname Firefox +%else +%define progname firefox-dev +%define pkgname firefox-dev-edition +%define appname Firefox Developer Edition +%endif +%define progdir %{_prefix}/%_lib/%{progname} +%define gnome_dir %{_prefix} +%define desktop_file_name %{progname} %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind -%define progname firefox -%define progdir %{_prefix}/%_lib/%{progname} -%define gnome_dir %{_prefix} -%if 0%{?suse_version} > 1130 -%define desktop_file_name firefox -%else -%define desktop_file_name %{name} -%endif -%if 0%{?suse_version} > 1210 %if 0%{?suse_version} > 1310 %define gstreamer_ver 1.0 %define gstreamer 1 %else %define gstreamer_ver 0.10 %endif -%endif # 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, # please get your own set of keys. %define _google_api_key AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q +%if %update_channel == "aurora" +%define branding 0 +%else %define branding 1 +%endif %define localize 1 %ifarch aarch64 ppc ppc64 ppc64le s390 s390x ia64 %arm %define crashreporter 0 @@ -57,7 +63,7 @@ %define crashreporter 1 %endif -Name: MozillaFirefox +Name: %{pkgname} BuildRequires: Mesa-devel BuildRequires: autoconf213 BuildRequires: dbus-1-glib-devel @@ -66,8 +72,13 @@ BuildRequires: libcurl-devel BuildRequires: libgnomeui-devel BuildRequires: libidl-devel +BuildRequires: libiw-devel BuildRequires: libnotify-devel +BuildRequires: libproxy-devel BuildRequires: makeinfo +BuildRequires: mozilla-nspr-devel >= 4.10.7 +BuildRequires: mozilla-nss-devel >= 3.17.2 +BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: startup-notification-devel BuildRequires: unzip @@ -75,20 +86,10 @@ BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip -%if 0%{?suse_version} > 1110 -BuildRequires: libiw-devel -BuildRequires: libproxy-devel -%else -BuildRequires: wireless-tools -%endif -BuildRequires: mozilla-nspr-devel >= 4.10.7 -BuildRequires: mozilla-nss-devel >= 3.17.2 -BuildRequires: nss-shared-helper-devel -BuildRequires: pkgconfig(libpulse) -%if 0%{?suse_version} > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) +BuildRequires: pkgconfig(libpulse) %if 0%{?gstreamer} == 1 Requires: libgstreamer-1_0-0 Recommends: gstreamer-fluendo-mp3 @@ -98,18 +99,19 @@ Recommends: gstreamer-0_10-fluendo-mp3 Recommends: gstreamer-0_10-plugins-ffmpeg %endif -%endif Version: %{mainver} Release: 0 +%if "%{name}" == "MozillaFirefox" Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} +%endif Provides: web_browser Provides: browser(npapi) # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package %define kde_helper_version 6 Provides: mozilla-kde4-version = %{kde_helper_version} -Summary: Mozilla Firefox Web Browser +Summary: Mozilla %{appname} Web Browser License: MPL-2.0 Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ @@ -139,24 +141,27 @@ Patch7: mozilla-language.patch Patch8: mozilla-ntlm-full-path.patch Patch9: mozilla-repo.patch -Patch10: mozilla-sle11.patch -Patch11: mozilla-icu-strncat.patch -Patch12: mozilla-arm-disable-edsp.patch -Patch13: mozilla-bmo1088588.patch +Patch10: mozilla-icu-strncat.patch +Patch11: mozilla-arm-disable-edsp.patch +Patch12: mozilla-bmo1088588.patch +Patch13: mozilla-openaes-decl.patch # Firefox/browser Patch101: firefox-kde.patch -Patch102: firefox-kde-114.patch -Patch103: firefox-no-default-ualocale.patch -Patch104: firefox-multilocale-chrome.patch -Patch105: firefox-branded-icons.patch +Patch102: firefox-no-default-ualocale.patch +Patch103: firefox-multilocale-chrome.patch +Patch104: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils +%if %branding Requires: %{name}-branding > 20.0 +%endif Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Recommends: libcanberra0 Recommends: libpulse0 +# addon leads to startup crash (bnc#908892) +Obsoletes: tracker-miner-firefox < 0.15 # libproxy's mozjs pacrunner crashes FF (bnc#759123) %if 0%{?suse_version} < 1220 Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 @@ -168,7 +173,7 @@ plethora of extensions. %package devel -Summary: Devel package for Firefox +Summary: Devel package for %{appname} Group: Development/Tools/Other Provides: firefox-devel = %{version}-%{release} Requires: %{name} = %{version} @@ -176,11 +181,11 @@ Requires: perl(XML::Simple) %description devel -Development files for Firefox to make packaging of addons easier. +Development files for %{appname} to make packaging of addons easier. %if %localize %package translations-common -Summary: Common translations for Firefox +Summary: Common translations for %{appname} Group: System/Localization Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;el;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) Requires: %{name} = %{version} @@ -188,10 +193,10 @@ %description translations-common This package contains several common languages for the user interface -of Firefox. +of %{appname}. %package translations-other -Summary: Extra translations for Firefox +Summary: Extra translations for %{appname} Group: System/Localization 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} @@ -199,11 +204,12 @@ %description translations-other This package contains rarely used languages for the user interface -of Firefox. +of %{appname}. %endif +%if %branding %package branding-upstream -Summary: Upstream branding for Firefox +Summary: Upstream branding for %{appname} Group: Productivity/Networking/Web/Browsers Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) @@ -219,13 +225,12 @@ #BRAND: It's also possible to drop files in /usr/lib/firefox/searchplugins %description branding-upstream -This package provides upstream look and feel for Firefox. - +This package provides upstream look and feel for %{appname}. +%endif %if %crashreporter - %package buildsymbols -Summary: Breakpad buildsymbols for %{name} +Summary: Breakpad buildsymbols for %{appname} Group: Development/Debug %description buildsymbols @@ -249,24 +254,19 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%if 0%{?suse_version} < 1120 %patch10 -p1 -%endif %patch11 -p1 %patch12 -p1 %patch13 -p1 # Firefox %patch101 -p1 -%if 0%{?suse_version} >= 1140 %patch102 -p1 -%endif %patch103 -p1 %patch104 -p1 -%patch105 -p1 %build # no need to add build time to binaries -modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/MozillaFirefox.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + @@ -338,19 +338,12 @@ %if 0%{?gstreamer} == 1 ac_add_options --enable-gstreamer=1.0 %endif -%if 0%{?suse_version} > 1130 ac_add_options --disable-gnomevfs ac_add_options --enable-gio -%endif -%if 0%{?suse_version} < 1220 -ac_add_options --disable-gstreamer -%endif %if %branding ac_add_options --enable-official-branding %endif -%if 0%{?suse_version} > 1110 ac_add_options --enable-libproxy -%endif %if ! %crashreporter ac_add_options --disable-crashreporter %endif @@ -444,16 +437,21 @@ %{SOURCE3} > %{buildroot}%{progdir}/%{progname}.sh chmod 755 %{buildroot}%{progdir}/%{progname}.sh ln -sf ../..%{progdir}/%{progname}.sh %{buildroot}%{_bindir}/%{progname} -# desktop definition +# desktop file mkdir -p %{buildroot}%{_datadir}/applications -install -m 644 %{SOURCE1} \ - %{buildroot}%{_datadir}/applications/%{desktop_file_name}.desktop +sed "s:%%NAME:%{appname}:g +s:%%EXEC:%{progname}:g +s:%%ICON:%{progname}:g" \ + %{SOURCE1} > %{buildroot}%{_datadir}/applications/%{desktop_file_name}.desktop +%suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK # additional mime-types mkdir -p %{buildroot}%{_datadir}/mime/packages cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata +%if "%{update_channel}" != "aurora" mkdir -p %{buildroot}%{_datadir}/appdata cp %{SOURCE15} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml +%endif # install man-page mkdir -p %{buildroot}%{_mandir}/man1/ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 @@ -474,7 +472,6 @@ ln -sf %{progdir}/browser/chrome/icons/default/default$size.png \ %{buildroot}%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png done -%suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK # excludes rm -f %{buildroot}%{progdir}/updater.ini rm -f %{buildroot}%{progdir}/removed-files @@ -536,33 +533,15 @@ %post # update mime and desktop database -%if 0%{?suse_version} > 1130 %mime_database_post %desktop_database_post %icon_theme_cache_post -%else -if [ -f usr/bin/update-mime-database ] ; then - usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : -fi -if [ -f usr/bin/update-desktop-database ] ; then - usr/bin/update-desktop-database > /dev/null || : -fi -%endif exit 0 %postun -%if 0%{?suse_version} > 1130 %icon_theme_cache_postun %desktop_database_postun %mime_database_postun -%else -if [ -f usr/bin/update-mime-database ] ; then - usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : -fi -if [ -f usr/bin/update-desktop-database ] ; then - usr/bin/update-desktop-database > /dev/null || : -fi -%endif exit 0 %files @@ -607,7 +586,6 @@ %{_datadir}/applications/%{desktop_file_name}.desktop %{_datadir}/mime/packages/%{progname}.xml %{_datadir}/pixmaps/firefox* -%{_datadir}/appdata/ %dir %{_datadir}/mozilla %dir %{_datadir}/mozilla/extensions %dir %{_datadir}/mozilla/extensions/%{firefox_appid} @@ -617,6 +595,9 @@ %{gnome_dir}/share/icons/hicolor/ %{_bindir}/%{progname} %doc %{_mandir}/man1/%{progname}.1.gz +%if "%{update_channel}" != "aurora" +%{_datadir}/appdata/ +%endif %files devel %defattr(-,root,root) @@ -638,13 +619,13 @@ # this package does not need to provide files but is needed to fulfill # requirements if no other branding package is to be installed - +%if %branding %files branding-upstream %defattr(-,root,root) %dir %{progdir} +%endif %if %crashreporter - %files buildsymbols %defattr(-,root,root) %{_datadir}/mozilla/*.zip ++++++ MozillaFirefox.desktop ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -1,11 +1,11 @@ [Desktop Entry] Encoding=UTF-8 -Name=Firefox +Name=%NAME GenericName=Web Browser Comment=Web Browser -TryExec=firefox -Exec=firefox %u -Icon=firefox +TryExec=%EXEC +Exec=%EXEC %u +Icon=%ICON Terminal=false StartupNotify=true MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_34_0_5_RELEASE" -VERSION="34.0.5" +RELEASE_TAG="FIREFOX_35_0_RELEASE" +VERSION="35.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-34.0.5-source.tar.xz -> firefox-35.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-34.0.5-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-35.0-source.tar.xz differ: char 26, line 1 ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -1,8 +1,11 @@ +# HG changeset patch +# Parent 6697591ddc0a1b18171c31a7bf18d99be9825aab + diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1269 @@ +@@ -0,0 +1,1272 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -282,7 +285,7 @@ + </panel> + + <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"> -+ <hbox id="abouthome-search-panel-manage" class="abouthome-search-panel-item" ++ <hbox id="abouthome-search-panel-manage" + onclick="openPreferences('paneSearch')"> + <label>&cmd_engineManager.label;</label> + </hbox> @@ -296,7 +299,11 @@ + onpopuphidden="SocialShare.onHidden()" + hidden="true"> + <vbox class="social-share-toolbar"> -+ <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/> ++ <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"> ++ <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio" ++ group="share-providers" tooltiptext="&findShareServices.label;" ++ oncommand="SocialShare.showDirectory()"/> ++ </arrowscrollbox> + </vbox> + </panel> + @@ -546,6 +553,11 @@ +#endif + </tooltip> + ++ <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);"> ++ <label class="tooltip-label"/> ++ <label class="tooltip-label"/> ++ </tooltip> ++ +#include popup-notifications.inc + +#include ../../components/customizableui/content/panelUI.inc.xul @@ -719,7 +731,11 @@ + aria-label="&navbarCmd.label;" + fullscreentoolbar="true" mode="icons" customizable="true" + iconsize="small" -+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item" ++#ifdef MOZ_DEV_EDITION ++ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button" ++#else ++ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button" ++#endif + customizationtarget="nav-bar-customization-target" + overflowable="true" + overflowbutton="nav-bar-overflow-button" @@ -773,7 +789,6 @@ + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> -+ <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> @@ -806,7 +821,7 @@ + </hbox> + </box> + <box id="urlbar-display-box" align="center"> -+ <label id="urlbar-display" value="&urlbar.switchToTab.label;"/> ++ <label class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/> + </box> + <hbox id="urlbar-icons"> + <image id="page-report-button" @@ -967,15 +982,6 @@ + onclick="BrowserGoHome(event);" + cui-areatype="toolbar" + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> -+ -+ <toolbarbutton id="social-share-button" -+ class="toolbarbutton-1 chromeclass-toolbar-additional" -+ label="&sharePageCmd.label;" -+ tooltiptext="&sharePageCmd.label;" -+ cui-areatype="toolbar" -+ removable="true" -+ hidden="true" -+ command="Social:SharePage"/> + </hbox> + + <toolbarbutton id="nav-bar-overflow-button" @@ -1120,7 +1126,7 @@ + </toolbarpalette> + </toolbox> + -+ <hbox id="fullscr-toggler" collapsed="true"/> ++ <hbox id="fullscr-toggler" hidden="true"/> + + <deck id="content-deck" flex="1"> + <hbox flex="1" id="browser"> @@ -1294,7 +1300,7 @@ <button id="editBookmarkPanelDeleteButton" class="editBookmarkPanelBottomButton" label="&editBookmark.cancel.label;" -@@ -1195,17 +1195,17 @@ +@@ -1198,17 +1198,17 @@ <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> @@ -1316,10 +1322,10 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -71,16 +71,18 @@ browser.jar: - content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) +@@ -69,16 +69,18 @@ browser.jar: content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) + content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) * content/browser/browser.css (content/browser.css) @@ -1421,7 +1427,7 @@ // when the user will select the default. We refresh here periodically // in case the default changes. On other Windows OS's defaults can also // be set while the prefs are open. -@@ -497,16 +503,27 @@ var gMainPane = { +@@ -572,16 +578,27 @@ var gMainPane = { */ setDefaultBrowser: function() { @@ -1438,7 +1444,7 @@ + .createInstance(Components.interfaces.nsIProcess); + process.init(shellObj); + var args = ["--file", "kdeglobals", "--group", "General", "--key", -+ "BrowserApplication", "MozillaFirefox"]; ++ "BrowserApplication", "firefox"]; + process.run(false, args, args.length); + } } catch (ex) { @@ -1889,7 +1895,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 -@@ -686,19 +686,21 @@ +@@ -698,19 +698,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/browser/defaults/profile/prefs.js ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -1,12 +1,12 @@ # HG changeset patch -# Parent 11ad195fb502ca7c1ba3c8836b2d91be56d64ce4 +# Parent 16846914f968944f991c8b12fdc38ce8fc099d73 # User Wolfgang Rosenauer <[email protected]> Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -388,16 +388,20 @@ pref("browser.helperApps.deleteTempFileO +@@ -389,16 +389,20 @@ pref("browser.helperApps.deleteTempFileO #endif // search engines URL @@ -30,7 +30,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -66,21 +66,23 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST +@@ -66,24 +66,27 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ $(NULL) @@ -45,8 +45,13 @@ + @srcdir@/en-US/searchplugins/list.txt ) ) ddg endif SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins - SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) + # metro build call a searchplugins target for search engine plugins + .PHONY: searchplugins + SEARCHPLUGINS_TARGET := libs searchplugins +-SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin)))) -PP_TARGETS += SEARCHPLUGINS ++#SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin)))) ++SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) +#PP_TARGETS += SEARCHPLUGINS # Required for l10n.mk - defines a list of app sub dirs that should @@ -56,15 +61,15 @@ DIST_SUBDIRS = browser metro else DIST_SUBDIRS = $(DIST_SUBDIR) -@@ -118,16 +120,39 @@ libs:: $(addprefix generic/profile/,$(PR +@@ -117,16 +120,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J + libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ; + + libs:: $(addprefix generic/profile/,$(PROFILE_FILES)) + $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome - # metro build calls back here for search engine plugins - searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) - .PHONY: searchplugins - +tmp-search.jar.mn:: + printf "$(AB_CD).jar:" > $@ + printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ @@ -99,7 +104,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -139,14 +139,15 @@ +@@ -141,14 +141,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -1,13 +1,13 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# Parent 042ade9d1f6415e52caecf1389bbb67c2da569d4 +# Parent 099312626f5f7c9cb5573a61d0230574ee12a660 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -263,17 +263,17 @@ pref("browser.uitour.whitelist.add.340", - pref("browser.uitour.whitelist.add.341", "www.mozilla.org,support.mozilla.org,about:home"); +@@ -261,17 +261,17 @@ pref("browser.uitour.pinnedTabUrl", "htt + pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/";); pref("browser.customizemode.tip0.shown", false); pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize";); ++++++ l10n-34.0.5.tar.xz -> l10n-35.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-34.0.5.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-35.0.tar.xz differ: char 26, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -44,7 +44,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1167,16 +1168,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1172,16 +1173,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -79,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -1192,17 +1211,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1197,17 +1216,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); -@@ -1296,26 +1315,38 @@ static nsresult pref_InitInitialObjects( +@@ -1301,26 +1320,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) @@ -140,8 +140,7 @@ diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py --- a/python/mozbuild/mozpack/chrome/flags.py +++ b/python/mozbuild/mozpack/chrome/flags.py -@@ -208,16 +208,17 @@ class Flags(OrderedDict): - 'platformversion': VersionFlag, +@@ -209,16 +209,17 @@ class Flags(OrderedDict): 'contentaccessible': Flag, 'os': StringFlag, 'osversion': VersionFlag, @@ -149,7 +148,8 @@ 'platform': Flag, 'xpcnativewrappers': Flag, 'tablet': Flag, -+ 'desktop': StringFlag, + 'process': StringFlag, ++ 'desktop': StringFlag, } RE = re.compile(r'([!<>=]+)') @@ -161,8 +161,7 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py --- a/python/mozbuild/mozpack/chrome/manifest.py +++ b/python/mozbuild/mozpack/chrome/manifest.py -@@ -30,16 +30,17 @@ class ManifestEntry(object): - allowed_flags = [ +@@ -31,16 +31,17 @@ class ManifestEntry(object): 'application', 'platformversion', 'os', @@ -170,7 +169,8 @@ 'abi', 'xpcnativewrappers', 'tablet', -+ 'desktop', + 'process', ++ 'desktop', ] def __init__(self, base, *flags): @@ -202,7 +202,7 @@ 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 -@@ -43,16 +43,20 @@ +@@ -44,16 +44,20 @@ #ifdef XP_WIN #include <shlobj.h> #include "nsWindowsHelpers.h" @@ -223,7 +223,7 @@ #include "AndroidBridge.h" using namespace mozilla::widget::android; #endif -@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2712,16 +2716,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -249,7 +249,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat +@@ -2752,16 +2765,17 @@ nsDownload::SetState(DownloadState aStat NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, message, !removeWhenDone, mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), @@ -2630,9 +2630,9 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build -@@ -75,17 +75,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco +@@ -68,17 +68,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco else: - # These files can't be built in unified mode because they force NSPR logging. + # These files can't be built in unified mode because they redefine LOG. SOURCES += [ osdir + '/nsOSHelperAppService.cpp', ] @@ -2650,7 +2650,7 @@ 'android/nsExternalSharingAppService.cpp', 'android/nsExternalURLHandlerService.cpp', 'android/nsMIMEInfoAndroid.cpp', -@@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m +@@ -121,16 +123,17 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ @@ -3104,7 +3104,7 @@ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -88,16 +88,17 @@ include('/ipc/chromium/chromium-config.m +@@ -81,16 +81,17 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ @@ -3160,7 +3160,7 @@ nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr; void -@@ -226,17 +228,19 @@ nsFilePicker::AppendFilters(int32_t aFil +@@ -224,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3181,7 +3181,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -351,16 +355,32 @@ nsFilePicker::Show(int16_t *aReturn) +@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn) NS_IMETHODIMP nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) @@ -3214,7 +3214,7 @@ GtkFileChooserAction action = GetGtkFileChooserAction(mMode); const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) -@@ -539,8 +559,235 @@ nsFilePicker::Done(GtkWidget* file_choos +@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos if (mCallback) { mCallback->Done(result); mCallback = nullptr; @@ -3502,15 +3502,15 @@ NS_NAMED_LITERAL_STRING(kOsVersion, "osversion"); NS_NAMED_LITERAL_STRING(kABI, "abi"); + NS_NAMED_LITERAL_STRING(kDesktop, "desktop"); + NS_NAMED_LITERAL_STRING(kProcess, "process"); #if defined(MOZ_WIDGET_ANDROID) NS_NAMED_LITERAL_STRING(kTablet, "tablet"); #endif - // Obsolete - NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); + NS_NAMED_LITERAL_STRING(kMain, "main"); + NS_NAMED_LITERAL_STRING(kContent, "content"); - nsAutoString appID; -@@ -543,44 +545,49 @@ ParseManifest(NSLocationType aType, File +@@ -548,44 +550,49 @@ ParseManifest(NSLocationType aType, File CopyUTF8toUTF16(s, abi); abi.Insert(char16_t('_'), 0); abi.Insert(osTarget, 0); @@ -3554,16 +3554,16 @@ + desktop = NS_LITERAL_STRING("android"); #endif - // Because contracts must be registered after CIDs, we save and process them - // at the end. - nsTArray<CachedDirective> contracts; - - char* token; - char* newline = aBuf; -@@ -669,25 +676,27 @@ ParseManifest(NSLocationType aType, File - TriState stOsVersion = eUnspecified; + if (XRE_GetProcessType() == GeckoProcessType_Content) { + process = kContent; + } else { + process = kMain; + } + +@@ -681,25 +688,27 @@ ParseManifest(NSLocationType aType, File TriState stOs = eUnspecified; TriState stABI = eUnspecified; + TriState stProcess = eUnspecified; #if defined(MOZ_WIDGET_ANDROID) TriState stTablet = eUnspecified; #endif @@ -3580,6 +3580,7 @@ CheckStringFlag(kOs, wtoken, osTarget, stOs) || CheckStringFlag(kABI, wtoken, abi, stABI) || + CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckStringFlag(kProcess, wtoken, process, stProcess) || CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) || CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) { @@ -3587,8 +3588,7 @@ } #if defined(MOZ_WIDGET_ANDROID) - bool tablet = false; -@@ -718,16 +727,17 @@ ParseManifest(NSLocationType aType, File +@@ -731,16 +740,17 @@ ParseManifest(NSLocationType aType, File } if (!ok || @@ -3601,15 +3601,15 @@ #ifdef MOZ_WIDGET_ANDROID stTablet == eBad || #endif - stABI == eBad) { + stABI == eBad || + stProcess == eBad) { continue; } - #ifdef MOZ_B2G_LOADER diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build -@@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul' +@@ -48,12 +48,13 @@ FINAL_LIBRARY = 'xul' GENERATED_INCLUDES += ['..'] LOCAL_INCLUDES += [ '../base', ++++++ mozilla-openaes-decl.patch ++++++ # HG changeset patch # Parent 33024abb3c58dab7239e32388df58e14f99defd5 # User Wolfgang Rosenauer <[email protected]> diff --git a/media/gmp-clearkey/0.1/openaes/oaes_lib.c b/media/gmp-clearkey/0.1/openaes/oaes_lib.c --- a/media/gmp-clearkey/0.1/openaes/oaes_lib.c +++ b/media/gmp-clearkey/0.1/openaes/oaes_lib.c @@ -27,16 +27,17 @@ * POSSIBILITY OF SUCH DAMAGE. * --------------------------------------------------------------------------- */ static const char _NR[] = { 0x4e,0x61,0x62,0x69,0x6c,0x20,0x53,0x2e,0x20, 0x41,0x6c,0x20,0x52,0x61,0x6d,0x6c,0x69,0x00 }; #include <stdlib.h> +#include <stdio.h> #include <stddef.h> #include <time.h> #include <string.h> #ifdef WIN32 #include <process.h> #endif ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 1478a2c97152e81b6d7cb89a4ab34da7310e3e86 +# Parent 80b6464bd883864fce57e8748010869af1be69e9 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk @@ -27,7 +27,7 @@ MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json + MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip - ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8199,16 +8199,31 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8302,16 +8302,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) @@ -42,7 +42,7 @@ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build -@@ -91,16 +91,19 @@ FAIL_ON_WARNINGS = True +@@ -95,16 +95,19 @@ FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' @@ -65,15 +65,13 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -3,16 +3,23 @@ +@@ -1,14 +1,21 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * * 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/. */ - #ifdef MOZ_LOGGING - #define FORCE_PR_LOG 1 - #endif - +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> @@ -89,7 +87,7 @@ #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" -@@ -943,17 +950,31 @@ nsNSSComponent::InitializeNSS() +@@ -945,17 +952,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; @@ -122,25 +120,25 @@ if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); } -diff --git a/toolkit/library/libxul.mozbuild b/toolkit/library/libxul.mozbuild ---- a/toolkit/library/libxul.mozbuild -+++ b/toolkit/library/libxul.mozbuild -@@ -22,16 +22,18 @@ DELAYLOAD_DLLS += [ - 'psapi.dll', - 'rasapi32.dll', - 'rasdlg.dll', - 'secur32.dll', - 'wininet.dll', - 'winspool.drv' - ] +diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build +--- a/toolkit/library/moz.build ++++ b/toolkit/library/moz.build +@@ -213,16 +213,18 @@ if CONFIG['MOZ_B2G_CAMERA']: + 'stagefright_omx', + ] + + if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': + OS_LIBS += [ + 'rt', + ] +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) + - if CONFIG['MOZ_METRO']: - DELAYLOAD_DLLS += [ - 'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', - 'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL', - 'uiautomationcore.dll' - ] + OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] + + if CONFIG['MOZ_NATIVE_JPEG']: + OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - if CONFIG['ACCESSIBILITY']: + if CONFIG['MOZ_NATIVE_PNG']: + OS_LIBS += CONFIG['MOZ_PNG_LIBS'] ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.Ewdpd1/_old 2015-01-21 21:51:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Ewdpd1/_new 2015-01-21 21:51:05.000000000 +0100 @@ -1,2 +1,2 @@ -REV=8274648ad79f +REV=32e36869f84a REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
