--- a/MozillaFirefox/MozillaFirefox.changes Sun Feb 12 08:57:22 2017 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Sun Feb 12 20:15:21 2017 +0100
@@ -1,4 +1,25 @@
-------------------------------------------------------------------
+Sun Feb 12 08:16:24 UTC 2017 - wr@rosenauer.org
+
+- update to Firefox 52.0b5
+ * requires NSS >= 3.28.2
+ * Pages containing insecure password fields now display a warning
+ directly within username and password fields.
+ * Windows 8 touch screen support for multiprocess Firefox
+ * Send and open a tab from one device to another with Sync
+ * Removed NPAPI support for plugins other than Flash. Silverlight,
+ Java, Acrobat and the like are no longer supported.
+ * Removed Battery Status API to reduce fingerprinting of users by
+ trackers
+- removed obsolete patches
+ * mozilla-binutils-visibility.patch
+ * mozilla-check_return.patch
+ * mozilla-disable-skia-be.patch
+ * mozilla-skia-overflow.patch
+ * mozilla-skia-ppc-endianess.patch
+- rebased patches
+
+-------------------------------------------------------------------
Fri Jan 27 20:25:59 UTC 2017 - astieger@suse.com
- Mozilla Firefox 51.0.1:
--- a/MozillaFirefox/MozillaFirefox.spec Sun Feb 12 08:57:22 2017 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Sun Feb 12 20:15:21 2017 +0100
@@ -144,26 +144,20 @@
Patch4: mozilla-preferences.patch
Patch5: mozilla-language.patch
Patch6: mozilla-ntlm-full-path.patch
-Patch8: mozilla-openaes-decl.patch
-Patch10: mozilla-no-stdcxx-check.patch
-Patch11: mozilla-reduce-files-per-UnifiedBindings.patch
-Patch13: mozilla-check_return.patch
-Patch14: mozilla-skia-overflow.patch
-Patch17: mozilla-binutils-visibility.patch
-Patch18: mozilla-skia-ppc-endianess.patch
-Patch19: mozilla-disable-skia-be.patch
+Patch7: mozilla-openaes-decl.patch
+Patch8: mozilla-no-stdcxx-check.patch
+Patch9: mozilla-reduce-files-per-UnifiedBindings.patch
+Patch10: mozilla-aarch64-startup-crash.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch
Patch103: firefox-branded-icons.patch
-# hotfix
-Patch200: mozilla-aarch64-startup-crash.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 > 39.0
+Requires: %{name}-branding > 44.0
%endif
Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
@@ -260,19 +254,14 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%patch8 -p1
+%patch9 -p1
%patch10 -p1
-%patch11 -p1
-%patch13 -p1
-%patch14 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
# Firefox
%patch101 -p1
%patch102 -p1
%patch103 -p1
-%patch200 -p1
%build
# no need to add build time to binaries
@@ -564,7 +553,6 @@
%dir %{progdir}/browser/
%dir %{progdir}/browser/chrome/
%dir %{progdir}/browser/extensions/
-%{progdir}/browser/components/
%{progdir}/browser/defaults
%{progdir}/browser/features/
%{progdir}/browser/icons/
@@ -586,9 +574,10 @@
%{progdir}/firefox
%{progdir}/firefox-bin
%{progdir}/application.ini
+%{progdir}/chrome.manifest
%{progdir}/dependentlibs.list
+%{progdir}/icudt58l.dat
%{progdir}/*.so
-%{progdir}/icudt56l.dat
%{progdir}/omni.ja
%{progdir}/fonts/
%{progdir}/platform.ini
@@ -597,6 +586,7 @@
%{progdir}/crashreporter
%{progdir}/crashreporter.ini
%{progdir}/Throbber-small.gif
+%{progdir}/minidump-analyzer
%{progdir}/browser/crashreporter-override.ini
%endif
%{_datadir}/applications/%{desktop_file_name}.desktop
--- a/MozillaFirefox/l10n_changesets.txt Sun Feb 12 08:57:22 2017 +0100
+++ b/MozillaFirefox/l10n_changesets.txt Sun Feb 12 20:15:21 2017 +0100
@@ -1,93 +1,93 @@
-ach d6ba00c5c59a
-af 221acbf9c551
-an efef89681add
-ar 940e066d2dd8
-as a97311f0a051
-ast 37ff5970cc8f
-az 374715191cd0
-bg d15a763f746a
-bn-BD b4cdbb48d9fb
-bn-IN 405c89530a66
-br e730984a8770
-bs e25f083ed28a
-ca 2909feec9b62
-cak b0fe49f697f3
-cs 53096821fe5c
-cy 4690316110e9
-da 24845323c326
-de ec96b812a542
-dsb 8e338605ccb9
-el 34a3488407a6
-en-GB 8000aa9daf28
-en-ZA ad5be8ba60f3
-eo 3a024766912e
-es-AR 541f1c3690da
-es-CL 56477941664e
-es-ES 8b7162b69b09
-es-MX 77bc335e0853
-et a9b1775874d3
-eu 52ec58e99375
-fa 95d8b781e109
-ff 2e39572916fb
-fi 94ad306d1492
-fr 27c4dc4cba4d
-fy-NL 9399c11d5edb
-ga-IE 5d9852283915
-gd bc702e34726b
-gl 74d31ad43213
-gn 43e8b6cb5fc6
-gu-IN 97b7ec458ace
-he 32e85d63d323
-hi-IN 25c7d3fceff8
-hr 15e2ad66589c
-hsb ff5fb215596d
-hu 814fad9068d9
-hy-AM 339e5b6d31d2
-id 1f325ac9007c
-is e346cec6bace
-it fc766adb485d
-ja 78a60bf924e7
-ja-JP-mac 0ca52430f89c
-ka fb0e9f4fdbe7
-kab 3de51a9c61ce
-kk 368faf9a9ed3
-km 97cd3bb4f2f3
-kn f657dd18d8a1
-ko bc9fde5af704
-lij 500f328a0bf0
-lt 3eefea021768
-lv 90a827f08cb4
-mai 4a95441f376c
-mk 666cf4d8067b
-ml 1f2e734fbd60
-mr 8067689c39f3
-ms 76c4152f9e3f
-nb-NO 1effc4c0ba39
-nl 28f169daa01f
-nn-NO 272d7d7fbd67
-or 765fc4b06ed0
-pa-IN 8518db59aecf
-pl 339f79766251
-pt-BR 3e521cc717b9
-pt-PT 5ea4fd22db27
-rm 66840279c384
-ro a87554f9bf7e
-ru a8f0bc1f85db
-si 2629b7b1279c
-sk b78499013196
-sl b91f9bd2d619
-son 2934d6741b1a
-sq 8ff97a87cbeb
-sr 8ddd91c5629b
-sv-SE 483944f0c102
-ta dc89744a2281
-te 545bca10223a
-th 6076f69e7093
-tr 70129fabcb60
-uk cb0a4b0816fa
-uz 01402c615783
-vi d6c09226896e
-xh f587b401f8fc
-zh-CN d260be15e967
-zh-TW 267404478cf9
+ach 34c236a22596
+af 90f7ccd90de4
+an 10f71571821e
+ar 0edb7b32133a
+as ee642d74fde9
+ast 80b866a98b5a
+az 07778ef756d4
+bg 1d8a8f804040
+bn-BD 6182802acd04
+bn-IN 0775fc62a38e
+br 88938f2eb7e2
+bs afe1158833f4
+ca c49b6bb37779
+cak 30c024aa79ef
+cs 392a1ff68cfd
+cy e9cc2975266f
+da cb1423eac811
+de 6535fbec1846
+dsb bbdbee2ecc9f
+el 4232653d09a7
+en-GB 3b1783bdb6fd
+en-ZA 86f98526de2f
+eo d478da264502
+es-AR adc3a9f3054e
+es-CL 8ce5a00c2709
+es-ES 3debdad3d876
+es-MX c2d80c000c8c
+et 5ce460a1227b
+eu 55202a38f74c
+fa de4daf555606
+ff 98974e0270a8
+fi f8b1401c07d3
+fr 7e9efb5f39b1
+fy-NL 551f14553b31
+ga-IE 94a750872504
+gd b2e4e78a85cf
+gl 79eda21c5b0b
+gn 8448413afd01
+gu-IN ef0d3c1d041a
+he 31df213cf89d
+hi-IN 6578b433d66e
+hr 77f103c07be0
+hsb 99f7c592ff8c
+hu 7ec46b30e96d
+hy-AM ee9609100a98
+id 584289a98164
+is 0de2039f0ead
+it ac8abee179d4
+ja 341947354a69
+ja-JP-mac 1c99dfb48618
+ka fd11643d032b
+kab 89a29ca718ef
+kk bbde07088662
+km 1d78cae948e2
+kn ceb699bfc19e
+ko ab9bc02a8c39
+lij 221601dc2320
+lt 1c563aa726f8
+lv 33dd8fbeb14e
+mai 4974d9967e3a
+mk 85557d511a18
+ml 3ac6473b90b8
+mr 9c8106a513fd
+ms f5ed710c8534
+nb-NO c84b8fb6b939
+nl b3c2ab953068
+nn-NO bc795ce8885a
+or ad0d79e1df34
+pa-IN 7a7d721c7f47
+pl 42ea1da43a3b
+pt-BR e9eaef0caba5
+pt-PT 5deb6216933d
+rm 4981325b9462
+ro 952587a63617
+ru 3d319dcf82c7
+si ea8510d62e56
+sk 968ee9fbd8ba
+sl e398e25297bc
+son a071d439a5f3
+sq c526b7451403
+sr 3fb1197cc3f3
+sv-SE 2d93a3f0c284
+ta e5fbcf49496f
+te d4cabe943952
+th e66a11b8da51
+tr 2ec45f681bb0
+uk d3ccc79b70b2
+uz 53122cc7d6ad
+vi e4f8d820bef2
+xh 6ba5a5671721
+zh-CN fb21432035d2
+zh-TW d17da9c45a93
--- a/MozillaFirefox/mozilla-binutils-visibility.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-binutils-visibility.patch
\ No newline at end of file
--- a/MozillaFirefox/mozilla-check_return.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-check_return.patch
\ No newline at end of file
--- a/MozillaFirefox/mozilla-disable-skia-be.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-disable-skia-be.patch
\ No newline at end of file
--- a/MozillaFirefox/mozilla-skia-overflow.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-skia-overflow.patch
\ No newline at end of file
--- a/MozillaFirefox/mozilla-skia-ppc-endianess.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-skia-ppc-endianess.patch
\ No newline at end of file
--- a/firefox-kde.patch Sun Feb 12 08:57:22 2017 +0100
+++ b/firefox-kde.patch Sun Feb 12 20:15:21 2017 +0100
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent 2cae514c05c8836ca5b69884d3a07998a5d53e8b
+# Parent e4b8399bc2706a7b5331407b232bc8845aea7f2e
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,1119 @@
+@@ -0,0 +1,1133 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -149,7 +149,12 @@
+ <tooltip id="remoteBrowserTooltip"/>
+
+ <!-- for search and content formfill/pw manager -->
-+ <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
++
++ <panel type="autocomplete-richlistbox"
++ id="PopupAutoComplete"
++ noautofocus="true"
++ hidden="true"
++ norolluponanchor="true" />
+
+ <!-- for search with one-off buttons -->
+ <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/>
@@ -160,7 +165,18 @@
+ noautofocus="true"
+ hidden="true"
+ flip="none"
-+ level="parent"/>
++ level="parent"
++ overflowpadding="30" />
++
++ <panel id="DateTimePickerPanel"
++ type="arrow"
++ hidden="true"
++ orient="vertical"
++ noautofocus="true"
++ consumeoutsideclicks="false"
++ level="parent">
++ <iframe id="dateTimePopupFrame"/>
++ </panel>
+
+ <!-- for select dropdowns. The menupopup is what shows the list of options,
+ and the popuponly menulist makes things like the menuactive attributes
@@ -170,7 +186,7 @@
+ <menupopup rolluponmousewheel="true"
+ activateontab="true" position="after_start"
+#ifdef XP_WIN
-+ consumeoutsideclicks="false" ignorekeys="handled"
++ consumeoutsideclicks="false" ignorekeys="shortcuts"
+#endif
+ />
+ </menulist>
@@ -267,12 +283,12 @@
+ onpopuphidden="SocialShare.onHidden()"
+ hidden="true">
+ <hbox class="social-share-toolbar">
-+ <toolbarbutton id="manage-share-providers" class="toolbarbutton share-provider-button"
++ <toolbarbutton id="manage-share-providers" class="share-provider-button"
+ tooltiptext="&social.addons.label;"
+ oncommand="BrowserOpenAddonsMgr('addons://list/service');
+ this.parentNode.parentNode.hidePopup();"/>
+ <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end">
-+ <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"
++ <toolbarbutton id="add-share-provider" class="share-provider-button" type="radio"
+ group="share-providers" tooltiptext="&findShareServices.label;"
+ oncommand="SocialShare.showDirectory()"/>
+ </arrowscrollbox>
@@ -679,13 +695,9 @@
+ newlines="stripsurroundingwhitespace"
+ ontextentered="this.handleCommand(param);"
+ ontextreverted="return this.handleRevert();"
-+ pageproxystate="invalid"
-+ onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
-+ onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);">
++ pageproxystate="invalid">
+ <!-- Use onclick instead of normal popup= syntax since the popup
-+ code fires onmousedown, and hence eats our favicon drag events.
-+ We only add the identity-box button to the tab order when the location bar
-+ has focus, otherwise pressing F6 focuses it instead of the location bar -->
++ code fires onmousedown, and hence eats our favicon drag events. -->
+ <box id="identity-box" role="button"
+ align="center"
+ aria-label="&urlbar.viewSiteInfo.label;"
@@ -752,14 +764,15 @@
+ </hbox>
+ </box>
+ <box id="urlbar-display-box" align="center">
-+ <label class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
++ <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
++ <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
+ </box>
+ <hbox id="urlbar-icons">
+ <image id="page-report-button"
+ class="urlbar-icon"
+ hidden="true"
+ tooltiptext="&pageReportIcon.tooltip;"
-+ onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
++ onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
+ <image id="reader-mode-button"
+ class="urlbar-icon"
+ hidden="true"
@@ -1061,7 +1074,8 @@
+ tabcontainer="tabbrowser-tabs"
+ contentcontextmenu="contentAreaContextMenu"
+ autocompletepopup="PopupAutoComplete"
-+ selectmenulist="ContentSelectDropdown"/>
++ selectmenulist="ContentSelectDropdown"
++ datetimepicker="DateTimePickerPanel"/>
+ </vbox>
+ <vbox id="browser-border-end" hidden="true" layer="true"/>
+ </hbox>
@@ -1128,25 +1142,25 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -68,16 +68,18 @@ browser.jar:
+@@ -66,16 +66,18 @@ browser.jar:
+ content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
+ content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml)
content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css)
content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js)
content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml)
- * content/browser/aboutTabGroupsMigration.xhtml (content/aboutTabGroupsMigration.xhtml)
- content/browser/aboutTabGroupsMigration.js (content/aboutTabGroupsMigration.js)
* content/browser/browser.css (content/browser.css)
content/browser/browser.js (content/browser.js)
* content/browser/browser.xul (content/browser.xul)
+* content/browser/browser-kde.xul (content/browser-kde.xul)
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
content/browser/browser-addons.js (content/browser-addons.js)
+ content/browser/browser-captivePortal.js (content/browser-captivePortal.js)
content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js)
content/browser/browser-customization.js (content/browser-customization.js)
content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
content/browser/browser-devedition.js (content/browser-devedition.js)
content/browser/browser-feeds.js (content/browser-feeds.js)
content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js)
- content/browser/browser-fullZoom.js (content/browser-fullZoom.js)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -1505,7 +1519,7 @@
+#define nskdeshellservice_h____
+
+#include "nsIGNOMEShellService.h"
-+#include "nsStringAPI.h"
++#include "nsString.h"
+#include "mozilla/Attributes.h"
+
+class nsKDEShellService final : public nsIGNOMEShellService
@@ -1576,7 +1590,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
-@@ -675,16 +675,17 @@
+@@ -652,16 +652,17 @@
@RESPATH@/greprefs.js
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions
--- a/mozilla-binutils-visibility.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 83bc32d997c714b607db1ffa71f02b30e1484a75
-From: NetBSD
-Subject: Workaround for gcc/binutils combination in Leap 42.2
-References:
-https://bugzilla.opensuse.org/show_bug.cgi?id=984637
-
-diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
---- a/xpcom/components/Module.h
-+++ b/xpcom/components/Module.h
-@@ -120,17 +120,17 @@ struct Module
- #if defined(MOZILLA_INTERNAL_API)
- # define NSMODULE_NAME(_name) _name##_NSModule
- # if defined(_MSC_VER)
- # pragma section(".kPStaticModules$M", read)
- # pragma comment(linker, "/merge:.kPStaticModules=.rdata")
- # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport)
- # elif defined(__GNUC__)
- # if defined(__ELF__)
--# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected")))
-+# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default")))
- # elif defined(__MACH__)
- # define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default")))
- # elif defined (_WIN32)
- # define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), dllexport))
- # endif
- # endif
- # if !defined(NSMODULE_SECTION)
- # error Do not know how to define sections.
--- a/mozilla-check_return.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 5f8b5e8163ece92dc819896dd52b9dbf5f524fe3
-
-diff --git a/media/libstagefright/binding/include/mp4_demuxer/ByteWriter.h b/media/libstagefright/binding/include/mp4_demuxer/ByteWriter.h
---- a/media/libstagefright/binding/include/mp4_demuxer/ByteWriter.h
-+++ b/media/libstagefright/binding/include/mp4_demuxer/ByteWriter.h
-@@ -19,57 +19,64 @@ public:
- {
- }
- ~ByteWriter()
- {
- }
-
- void WriteU8(uint8_t aByte)
- {
-- mPtr.append(aByte);
-+ bool rv;
-+ rv = mPtr.append(aByte);
- }
-
- void WriteU16(uint16_t aShort)
- {
- uint8_t c[2];
-+ bool rv;
- mozilla::BigEndian::writeUint16(&c[0], aShort);
-- mPtr.append(&c[0], 2);
-+ rv = mPtr.append(&c[0], 2);
- }
-
- void WriteU32(uint32_t aLong)
- {
- uint8_t c[4];
-+ bool rv;
- mozilla::BigEndian::writeUint32(&c[0], aLong);
-- mPtr.append(&c[0], 4);
-+ rv = mPtr.append(&c[0], 4);
- }
-
- void Write32(int32_t aLong)
- {
- uint8_t c[4];
-+ bool rv;
- mozilla::BigEndian::writeInt32(&c[0], aLong);
-- mPtr.append(&c[0], 4);
-+ rv = mPtr.append(&c[0], 4);
- }
-
- void WriteU64(uint64_t aLongLong)
- {
- uint8_t c[8];
-+ bool rv;
- mozilla::BigEndian::writeUint64(&c[0], aLongLong);
-- mPtr.append(&c[0], 8);
-+ rv = mPtr.append(&c[0], 8);
- }
-
- void Write64(int64_t aLongLong)
- {
- uint8_t c[8];
-+ bool rv;
- mozilla::BigEndian::writeInt64(&c[0], aLongLong);
-- mPtr.append(&c[0], 8);
-+ rv = mPtr.append(&c[0], 8);
- }
-
- void Write(const uint8_t* aSrc, size_t aCount)
- {
-- mPtr.append(aSrc, aCount);
-+ bool rv;
-+ rv = mPtr.append(aSrc, aCount);
- }
-
- private:
- mozilla::Vector<uint8_t>& mPtr;
- };
- }
-
- #endif
--- a/mozilla-disable-skia-be.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1484854371 18000
-# Node ID 42afdb8f7e6b3e8a465042f64c6c49782f231af4
-# Parent dfadd79c97458f898d542461033a61dd34d3a5f0
-Bug 1319374 - Wrap PaintCounter with ifdef USE_SKIA. r=mchang, a=jcristau
-
-diff --git a/gfx/2d/BorrowedContext.h b/gfx/2d/BorrowedContext.h
---- a/gfx/2d/BorrowedContext.h
-+++ b/gfx/2d/BorrowedContext.h
-@@ -190,18 +190,28 @@ public:
- }
-
- ~BorrowedCGContext() {
- MOZ_ASSERT(!cg);
- }
-
- CGContextRef cg;
- private:
-+#ifdef USE_SKIA
- static CGContextRef BorrowCGContextFromDrawTarget(DrawTarget *aDT);
- static void ReturnCGContextToDrawTarget(DrawTarget *aDT, CGContextRef cg);
-+#else
-+ static CGContextRef BorrowCGContextFromDrawTarget(DrawTarget *aDT) {
-+ MOZ_CRASH("Not supported without Skia");
-+ }
-+
-+ static void ReturnCGContextToDrawTarget(DrawTarget *aDT, CGContextRef cg) {
-+ MOZ_CRASH("not supported without Skia");
-+ }
-+#endif
- DrawTarget *mDT;
- };
- #endif
-
- } // namespace gfx
- } // namespace mozilla
-
- #endif // _MOZILLA_GFX_BORROWED_CONTEXT_H
-diff --git a/gfx/layers/composite/LayerManagerComposite.cpp b/gfx/layers/composite/LayerManagerComposite.cpp
---- a/gfx/layers/composite/LayerManagerComposite.cpp
-+++ b/gfx/layers/composite/LayerManagerComposite.cpp
-@@ -7,17 +7,16 @@
- #include <stddef.h> // for size_t
- #include <stdint.h> // for uint16_t, uint32_t
- #include "CanvasLayerComposite.h" // for CanvasLayerComposite
- #include "ColorLayerComposite.h" // for ColorLayerComposite
- #include "Composer2D.h" // for Composer2D
- #include "CompositableHost.h" // for CompositableHost
- #include "ContainerLayerComposite.h" // for ContainerLayerComposite, etc
- #include "FPSCounter.h" // for FPSState, FPSCounter
--#include "PaintCounter.h" // For PaintCounter
- #include "FrameMetrics.h" // for FrameMetrics
- #include "GeckoProfiler.h" // for profiler_set_frame_number, etc
- #include "ImageLayerComposite.h" // for ImageLayerComposite
- #include "Layers.h" // for Layer, ContainerLayer, etc
- #include "LayerScope.h" // for LayerScope Tool
- #include "protobuf/LayerScopePacket.pb.h" // for protobuf (LayerScope)
- #include "PaintedLayerComposite.h" // for PaintedLayerComposite
- #include "TiledContentHost.h"
-@@ -68,16 +67,20 @@
- #include "nsScreenManagerGonk.h"
- #include "nsWindow.h"
- #endif
- #include "GeckoProfiler.h"
- #include "TextRenderer.h" // for TextRenderer
- #include "mozilla/layers/CompositorBridgeParent.h"
- #include "TreeTraversal.h" // for ForEachNode
-
-+#ifdef USE_SKIA
-+#include "PaintCounter.h" // For PaintCounter
-+#endif
-+
- class gfxContext;
-
- namespace mozilla {
- namespace layers {
-
- class ImageLayer;
-
- using namespace mozilla::gfx;
-@@ -128,16 +131,20 @@ LayerManagerComposite::LayerManagerCompo
- , mGeometryChanged(true)
- , mLastFrameMissedHWC(false)
- , mWindowOverlayChanged(false)
- , mLastPaintTime(TimeDuration::Forever())
- , mRenderStartTime(TimeStamp::Now())
- {
- mTextRenderer = new TextRenderer(aCompositor);
- MOZ_ASSERT(aCompositor);
-+
-+#ifdef USE_SKIA
-+ mPaintCounter = nullptr;
-+#endif
- }
-
- LayerManagerComposite::~LayerManagerComposite()
- {
- Destroy();
- }
-
-
-@@ -146,18 +153,21 @@ LayerManagerComposite::Destroy()
- {
- if (!mDestroyed) {
- mCompositor->GetWidget()->CleanupWindowEffects();
- if (mRoot) {
- RootLayer()->Destroy();
- }
- mRoot = nullptr;
- mClonedLayerTreeProperties = nullptr;
-+ mDestroyed = true;
-+
-+#ifdef USE_SKIA
- mPaintCounter = nullptr;
-- mDestroyed = true;
-+#endif
- }
- }
-
- void
- LayerManagerComposite::UpdateRenderBounds(const IntRect& aRect)
- {
- mRenderBounds = aRect;
- }
-@@ -559,48 +569,52 @@ LayerManagerComposite::RootLayer() const
- #endif
-
- void
- LayerManagerComposite::InvalidateDebugOverlay(nsIntRegion& aInvalidRegion, const IntRect& aBounds)
- {
- bool drawFps = gfxPrefs::LayersDrawFPS();
- bool drawFrameCounter = gfxPrefs::DrawFrameCounter();
- bool drawFrameColorBars = gfxPrefs::CompositorDrawColorBars();
-- bool drawPaintTimes = gfxPrefs::AlwaysPaint();
-
- if (drawFps || drawFrameCounter) {
- aInvalidRegion.Or(aInvalidRegion, nsIntRect(0, 0, 256, 256));
- }
- if (drawFrameColorBars) {
- aInvalidRegion.Or(aInvalidRegion, nsIntRect(0, 0, 10, aBounds.height));
- }
-+
-+#ifdef USE_SKIA
-+ bool drawPaintTimes = gfxPrefs::AlwaysPaint();
- if (drawPaintTimes) {
- aInvalidRegion.Or(aInvalidRegion, nsIntRect(PaintCounter::GetPaintRect()));
- }
-+#endif
- }
-
-+#ifdef USE_SKIA
- void
- LayerManagerComposite::DrawPaintTimes(Compositor* aCompositor)
- {
- if (!mPaintCounter) {
- mPaintCounter = new PaintCounter();
- }
-
- TimeDuration compositeTime = TimeStamp::Now() - mRenderStartTime;
- mPaintCounter->Draw(aCompositor, mLastPaintTime, compositeTime);
- }
-+#endif
-
- static uint16_t sFrameCount = 0;
- void
- LayerManagerComposite::RenderDebugOverlay(const IntRect& aBounds)
- {
- bool drawFps = gfxPrefs::LayersDrawFPS();
- bool drawFrameCounter = gfxPrefs::DrawFrameCounter();
- bool drawFrameColorBars = gfxPrefs::CompositorDrawColorBars();
-- bool drawPaintTimes = gfxPrefs::AlwaysPaint();
-
- TimeStamp now = TimeStamp::Now();
-
- if (drawFps) {
- if (!mFPS) {
- mFPS = MakeUnique<FPSState>();
- }
-
-@@ -731,19 +745,22 @@ LayerManagerComposite::RenderDebugOverla
- }
- #endif
-
- if (drawFrameColorBars || drawFrameCounter) {
- // We intentionally overflow at 2^16.
- sFrameCount++;
- }
-
-+#ifdef USE_SKIA
-+ bool drawPaintTimes = gfxPrefs::AlwaysPaint();
- if (drawPaintTimes) {
- DrawPaintTimes(mCompositor);
- }
-+#endif
- }
-
- RefPtr<CompositingRenderTarget>
- LayerManagerComposite::PushGroupForLayerEffects()
- {
- // This is currently true, so just making sure that any new use of this
- // method is flagged for investigation
- MOZ_ASSERT(gfxPrefs::LayersEffectInvert() ||
-diff --git a/gfx/layers/composite/LayerManagerComposite.h b/gfx/layers/composite/LayerManagerComposite.h
---- a/gfx/layers/composite/LayerManagerComposite.h
-+++ b/gfx/layers/composite/LayerManagerComposite.h
-@@ -326,21 +326,16 @@ private:
- * Render the current layer tree to the active target.
- */
- void Render(const nsIntRegion& aInvalidRegion, const nsIntRegion& aOpaqueRegion);
- #if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
- void RenderToPresentationSurface();
- #endif
-
- /**
-- * Render paint and composite times above the frame.
-- */
-- void DrawPaintTimes(Compositor* aCompositor);
--
-- /**
- * We need to know our invalid region before we're ready to render.
- */
- void InvalidateDebugOverlay(nsIntRegion& aInvalidRegion, const gfx::IntRect& aBounds);
-
- /**
- * Render debug overlays such as the FPS/FrameCounter above the frame.
- */
- void RenderDebugOverlay(const gfx::IntRect& aBounds);
-@@ -386,19 +381,26 @@ private:
- RefPtr<TextRenderer> mTextRenderer;
- bool mGeometryChanged;
-
- // Testing property. If hardware composer is supported, this will return
- // true if the last frame was deemed 'too complicated' to be rendered.
- bool mLastFrameMissedHWC;
-
- bool mWindowOverlayChanged;
-- RefPtr<PaintCounter> mPaintCounter;
- TimeDuration mLastPaintTime;
- TimeStamp mRenderStartTime;
-+
-+#ifdef USE_SKIA
-+ /**
-+ * Render paint and composite times above the frame.
-+ */
-+ void DrawPaintTimes(Compositor* aCompositor);
-+ RefPtr<PaintCounter> mPaintCounter;
-+#endif
- };
-
- /**
- * Composite layers are for use with OMTC on the compositor thread only. There
- * must be corresponding Basic layers on the content thread. For composite
- * layers, the layer manager only maintains the layer tree, all rendering is
- * done by a Compositor (see Compositor.h). As such, composite layers are
- * platform-independent and can be used on any platform for which there is a
-diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
---- a/gfx/layers/moz.build
-+++ b/gfx/layers/moz.build
-@@ -335,17 +335,16 @@ UNIFIED_SOURCES += [
- 'composite/CompositableHost.cpp',
- 'composite/ContainerLayerComposite.cpp',
- 'composite/ContentHost.cpp',
- 'composite/FPSCounter.cpp',
- 'composite/FrameUniformityData.cpp',
- 'composite/ImageHost.cpp',
- 'composite/ImageLayerComposite.cpp',
- 'composite/LayerManagerComposite.cpp',
-- 'composite/PaintCounter.cpp',
- 'composite/PaintedLayerComposite.cpp',
- 'composite/TextRenderer.cpp',
- 'composite/TextureHost.cpp',
- 'composite/TiledContentHost.cpp',
- 'Compositor.cpp',
- 'CopyableCanvasLayer.cpp',
- 'Effects.cpp',
- 'FrameMetrics.cpp',
-@@ -480,8 +479,13 @@ MOCHITEST_CHROME_MANIFESTS += ['apz/test
-
- CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
- CXXFLAGS += CONFIG['TK_CFLAGS']
-
- LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
-
- if CONFIG['GNU_CXX']:
- CXXFLAGS += ['-Wno-error=shadow']
-+
-+if CONFIG['MOZ_ENABLE_SKIA']:
-+ UNIFIED_SOURCES += [
-+ 'composite/PaintCounter.cpp',
-+ ]
--- a/mozilla-kde.patch Sun Feb 12 08:57:22 2017 +0100
+++ b/mozilla-kde.patch Sun Feb 12 20:15:21 2017 +0100
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent f3e80d26a430dfa1c58421fb66144a3c23ffc166
+# Parent 0e88a32ef7263e76f6970bab17458130d1f3677f
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -255,12 +255,12 @@
int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2763,16 +2776,17 @@ nsDownload::SetState(DownloadState aStat
- NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
+@@ -2764,16 +2777,17 @@ nsDownload::SetState(DownloadState aStat
message, !removeWhenDone,
mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
- EmptyString(), EmptyString(), nullptr, mPrivate);
+ EmptyString(), EmptyString(), nullptr, mPrivate,
+ false /* requireInteraction */);
}
}
}
@@ -276,14 +276,14 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -67,29 +67,33 @@ toolkit.jar:
- content/global/viewZoomOverlay.js
- content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
- content/global/bindings/browser.xml (widgets/browser.xml)
+@@ -71,29 +71,33 @@ toolkit.jar:
content/global/bindings/button.xml (widgets/button.xml)
content/global/bindings/checkbox.xml (widgets/checkbox.xml)
content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
+ content/global/bindings/datetimepopup.xml (widgets/datetimepopup.xml)
+ content/global/bindings/datetimebox.xml (widgets/datetimebox.xml)
+ content/global/bindings/datetimebox.css (widgets/datetimebox.css)
* content/global/bindings/dialog.xml (widgets/dialog.xml)
+* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
@@ -310,6 +310,18 @@
content/global/bindings/scale.xml (widgets/scale.xml)
content/global/bindings/scrollbar.xml (widgets/scrollbar.xml)
content/global/bindings/scrollbox.xml (widgets/scrollbox.xml)
+@@ -113,9 +117,9 @@ toolkit.jar:
+ content/global/bindings/videocontrols.css (widgets/videocontrols.css)
+ * content/global/bindings/wizard.xml (widgets/wizard.xml)
+ #ifdef XP_MACOSX
+ content/global/macWindowMenu.js
+ #endif
+ content/global/svg/svgBindings.xml (/layout/svg/resources/content/svgBindings.xml)
+ content/global/gmp-sources/eme-adobe.json (gmp-sources/eme-adobe.json)
+ content/global/gmp-sources/openh264.json (gmp-sources/openh264.json)
+- content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
+\ No newline at end of file
++ content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
new file mode 100644
--- /dev/null
@@ -460,7 +472,7 @@
+ <body>
+ <![CDATA[
+ var xOffset = screen.availWidth/2 - window.outerWidth/2;
-+ var yOffset = screen.availHeight/2 - window.outerHeight/2; //(opener.outerHeight *2)/10;
++ var yOffset = screen.availHeight/2 - window.outerHeight/2;
+
+ xOffset = xOffset > 0 ? xOffset : 0;
+ yOffset = yOffset > 0 ? yOffset : 0;
@@ -776,7 +788,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1403 @@
+@@ -0,0 +1,1411 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE bindings [
@@ -2042,11 +2054,19 @@
+ </body>
+ </method>
+
-+ <field name="DeferredTask" readonly="true">
-+ let targetObj = {};
-+ Components.utils.import("resource://gre/modules/DeferredTask.jsm", targetObj);
-+ targetObj.DeferredTask;
-+ </field>
++ <property name="DeferredTask" readonly="true">
++ <getter><![CDATA[
++ let module = {};
++ Components.utils.import("resource://gre/modules/DeferredTask.jsm", module);
++ Object.defineProperty(this, "DeferredTask", {
++ configurable: true,
++ enumerable: true,
++ writable: true,
++ value: module.DeferredTask
++ });
++ return module.DeferredTask;
++ ]]></getter>
++ </property>
+ <method name="_deferredValueUpdate">
+ <parameter name="aElement"/>
+ <body>
@@ -3676,7 +3696,7 @@
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -44,16 +44,17 @@
+@@ -45,16 +45,17 @@
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
@@ -3694,7 +3714,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1947,42 +1948,52 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3753,7 +3773,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
+@@ -1990,16 +2001,22 @@ nsLocalFile::Reveal()
return NS_ERROR_FAILURE;
#endif
}
--- a/mozilla-skia-overflow.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1474489725 14400
-# Wed Sep 21 16:28:45 2016 -0400
-# Node ID 38a427a913b57080374b9966466b8f436ec39eb8
-# Parent 4dfd3f00543d1d7adc3f0f852e6f32fbca6f3420
-fix invalid Sk4f store to SkColor in SkPixmap::erase
-
-MozReview-Commit-ID: 840x1nXgYns
-
-diff --git a/gfx/skia/skia/src/core/SkPixmap.cpp b/gfx/skia/skia/src/core/SkPixmap.cpp
---- a/gfx/skia/skia/src/core/SkPixmap.cpp
-+++ b/gfx/skia/skia/src/core/SkPixmap.cpp
-@@ -221,17 +221,17 @@ bool SkPixmap::erase(const SkColor4f& or
- pm = *this;
- }
-
- const SkColor4f color = origColor.pin();
-
- if (kRGBA_F16_SkColorType != pm.colorType()) {
- Sk4f c4 = Sk4f::Load(color.vec());
- SkColor c;
-- (c4 * Sk4f(255) + Sk4f(0.5f)).store(&c);
-+ SkNx_cast<uint8_t>(c4 * Sk4f(255) + Sk4f(0.5f)).store(&c);
- return pm.erase(c);
- }
-
- const uint64_t half4 = color.premul().toF16();
- for (int y = 0; y < pm.height(); ++y) {
- sk_memset64(pm.writable_addr64(0, y), half4, pm.width());
- }
- return true;
--- a/mozilla-skia-ppc-endianess.patch Sun Feb 12 08:57:22 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1479812942 -32400
-# Node ID a6d015fd1add5e16cf37f5868cd2734bafb709b4
-# Parent 319e03b9e8a22a8fba3756cb1afc8b9e7a6724c8
-Bug 1319389 - Generically set SK_CPU_[BL]ENDIAN based on __BYTE_ORDER__ when available. r?jrmuizel
-
-
-diff --git a/gfx/skia/skia/include/core/SkPreConfig.h b/gfx/skia/skia/include/core/SkPreConfig.h
---- a/gfx/skia/skia/include/core/SkPreConfig.h
-+++ b/gfx/skia/skia/include/core/SkPreConfig.h
-@@ -67,25 +67,29 @@
-
- #if !defined(SK_WARN_UNUSED_RESULT)
- #define SK_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
- #endif
-
- //////////////////////////////////////////////////////////////////////
-
- #if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
-- #if defined(__sparc) || defined(__sparc__) || \
-+ #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-+ #define SK_CPU_BENDIAN
-+ #elif defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-+ #define SK_CPU_LENDIAN
-+ #elif defined(__sparc) || defined(__sparc__) || \
- defined(_POWER) || defined(__powerpc__) || \
- defined(__ppc__) || defined(__hppa) || \
- defined(__PPC__) || defined(__PPC64__) || \
- defined(_MIPSEB) || defined(__ARMEB__) || \
- defined(__s390__) || \
- (defined(__sh__) && defined(__BIG_ENDIAN__)) || \
- (defined(__ia64) && defined(__BIG_ENDIAN__))
-- #define SK_CPU_BENDIAN
-+ #define SK_CPU_BENDIAN
- #else
- #define SK_CPU_LENDIAN
- #endif
- #endif
-
- //////////////////////////////////////////////////////////////////////
-
- #if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
-
--- a/series Sun Feb 12 08:57:22 2017 +0100
+++ b/series Sun Feb 12 20:15:21 2017 +0100
@@ -9,12 +9,7 @@
mozilla-openaes-decl.patch
mozilla-no-stdcxx-check.patch
mozilla-reduce-files-per-UnifiedBindings.patch
-mozilla-check_return.patch
-mozilla-skia-overflow.patch
-mozilla-binutils-visibility.patch
mozilla-aarch64-startup-crash.patch
-mozilla-skia-ppc-endianess.patch
-mozilla-disable-skia-be.patch
# Firefox patches
firefox-kde.patch