# HG changeset patch # User Wolfgang Rosenauer # Date 1465328660 -7200 # Node ID e969636be1888d70bb571254c7e6e675bfaf97d7 # Parent eb9ebe3e2e6a4cea440ba721f067e4edf65bb91d# Parent 20bd16d68ed2f918e3bf9b19271da2d2c5465822 forward merge from firefox46 diff -r eb9ebe3e2e6a -r e969636be188 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Sun Jan 24 13:40:23 2016 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Tue Jun 07 21:44:20 2016 +0200 @@ -1,7 +1,242 @@ ------------------------------------------------------------------- +Wed May 4 10:27:43 UTC 2016 - wr@rosenauer.org + +- update to Firefox 46.0.1 + Fixed: + * Search plugin issue for various locales + * Add-on signing certificate expiration + * Service worker update issue + * Build issue when jit is disabled + * Limit Sync registration updates +- removed now obsolete mozilla-jit_branch64.patch + +------------------------------------------------------------------- +Tue May 3 15:47:18 UTC 2016 - normand@linux.vnet.ibm.com + +- add mozilla-jit_branch64.patch to avoid PowerPC build failure + (from bmo#1266366) + +------------------------------------------------------------------- +Wed Apr 27 08:39:28 UTC 2016 - badshah400@gmail.com + +- Update mozilla-gtk3_20.patch for Firefox 46.0 (sync to latest + version from Fedora). + +------------------------------------------------------------------- +Wed Apr 27 06:09:30 UTC 2016 - wr@rosenauer.org + +- update to Firefox 46.0 (boo#977333) + * Improved security of the JavaScript Just In Time (JIT) Compiler + * WebRTC fixes to improve performance and stability + * Added support for document.elementsFromPoint + * Added HKDF support for Web Crypto API + * requires NSPR 4.12 and NSS 3.22.3 + * added patch to fix unchecked return value + mozilla-check_return.patch + * Gtk3 builds not supported at the moment + security fixes: + * MFSA 2016-39/CVE-2016-2804/CVE-2016-2806/CVE-2016-2807 + (boo#977373, boo#977375, boo#977376) + Miscellaneous memory safety hazards + * MFSA 2016-40/CVE-2016-2809 (bmo#1212939, boo#977377) + Privilege escalation through file deletion by Maintenance Service updater + (Windows only) + * MFSA 2016-41/CVE-2016-2810 (bmo#1229681, boo#977378) + Content provider permission bypass allows malicious application + to access data (Android only) + * MFSA 2016-42/CVE-2016-2811/CVE-2016-2812 + (bmo#1252330, bmo#1261776, boo#977379) + Use-after-free and buffer overflow in Service Workers + * MFSA 2016-43/CVE-2016-2813 (bmo#1197901, bmo#2714650, boo#977380) + Disclosure of user actions through JavaScript with motion and + orientation sensors (only affects mobile variants) + * MFSA 2016-44/CVE-2016-2814 (bmo#1254721, boo#977381) + Buffer overflow in libstagefright with CENC offsets + * MFSA 2016-45/CVE-2016-2816 (bmo#1223743, boo#977382) + CSP not applied to pages sent with multipart/x-mixed-replace + * MFSA 2016-46/CVE-2016-2817 (bmo#1227462, boo#977384) + Elevation of privilege with chrome.tabs.update API in web extensions + * MFSA 2016-47/CVE-2016-2808 (bmo#1246061, boo#977386) + Write to invalid HashMap entry through JavaScript.watch() + * MFSA 2016-48/CVE-2016-2820 (bmo#870870, boo#977388) + Firefox Health Reports could accept events from untrusted domains + +------------------------------------------------------------------- +Thu Apr 21 12:00:28 UTC 2016 - badshah400@gmail.com + +- Update mozilla-gtk3_20.patch to fix scrollbar appearance under + gtk >= 3.20 (patch synced to Fedora's version). + +------------------------------------------------------------------- +Tue Apr 12 19:11:30 UTC 2016 - badshah400@gmail.com + +- Compile against gtk3 depending on whether the macro + %firefox_use_gtk3 is defined or not (e.g., at the prjconf + level); macro is undefined by default and so gtk2 is used as the + default toolkit. +- Add BuildRequires for additional packages needed when building + against gtk3: pkgconfig(glib-2.0), pkgconfig(gobject-2.0), + pkgconfig(gtk+-3.0) >= 3.4.0, pkgconfig(gtk+-unix-print-3.0). +- Add firefox-gtk3_20.patch to fix appearance with gtk3 >= 3.20; + patch taken from Fedora (bmo#1230955). + +------------------------------------------------------------------- +Mon Apr 11 22:49:24 UTC 2016 - astieger@suse.com + +- Mozilla Firefox 45.0.2: + * Fix an issue impacting the cookie header when third-party + cookies are blocked (bmo#1257861) + * Fix a web compatibility regression impacting the srcset + attribute of the image tag (bmo#1259482) + * Fix a crash impacting the video playback with Media Source + Extension (bmo#1258562) + * Fix a regression impacting some specific uploads (bmo#1255735) + * Fix a regression with the copy and paste with some old versions + of some Gecko applications like Thunderbird (bmo#1254980) + +------------------------------------------------------------------- +Fri Mar 18 08:52:58 UTC 2016 - astieger@suse.com + +- Mozilla Firefox 45.0.1: + * Fix a regression causing search engine settings to be lost in + some context (bmo#1254694) + * Bring back non-standard jar: URIs to fix a regression in IBM + iNotes (bmo#1255139) + * XSLTProcessor.importStylesheet was failing when was + used (bmo#1249572) + * Fix an issue which could cause the list of search provider to + be empty (bmo#1255605) + * Fix a regression when using the location bar (bmo#1254503) + * Fix some loading issues when Accept third-party cookies: was + set to Never (bmo#1254856) + * Disabled Graphite font shaping library + +------------------------------------------------------------------- +Sun Mar 6 19:52:13 UTC 2016 - wr@rosenauer.org + +- update to Firefox 45.0 (boo#969894) + * requires NSPR 4.12 / NSS 3.21.1 + * Instant browser tab sharing through Hello + * Synced Tabs button in button bar + * Tabs synced via Firefox Accounts from other devices are now shown + in dropdown area of Awesome Bar when searching + * Introduce a new preference (network.dns.blockDotOnion) to allow + blocking .onion at the DNS level + * Tab Groups (Panorama) feature removed + * MFSA 2016-16/CVE-2016-1952/CVE-2016-1953 + Miscellaneous memory safety hazards + * MFSA 2016-17/CVE-2016-1954 (bmo#1243178) + Local file overwriting and potential privilege escalation through + CSP reports + * MFSA 2016-18/CVE-2016-1955 (bmo#1208946) + CSP reports fail to strip location information for embedded iframe pages + * MFSA 2016-19/CVE-2016-1956 (bmo#1199923) + Linux video memory DOS with Intel drivers + * MFSA 2016-20/CVE-2016-1957 (bmo#1227052) + Memory leak in libstagefright when deleting an array during MP4 + processing + * MFSA 2016-21/CVE-2016-1958 (bmo#1228754) + Displayed page address can be overridden + * MFSA 2016-22/CVE-2016-1959 (bmo#1234949) + Service Worker Manager out-of-bounds read in Service Worker Manager + * MFSA 2016-23/CVE-2016-1960/ZDI-CAN-3545 (bmo#1246014) + Use-after-free in HTML5 string parser + * MFSA 2016-24/CVE-2016-1961/ZDI-CAN-3574 (bmo#1249377) + Use-after-free in SetBody + * MFSA 2016-25/CVE-2016-1962 (bmo#1240760) + Use-after-free when using multiple WebRTC data channels + * MFSA 2016-26/CVE-2016-1963 (bmo#1238440) + Memory corruption when modifying a file being read by FileReader + * MFSA 2016-27/CVE-2016-1964 (bmo#1243335) + Use-after-free during XML transformations + * MFSA 2016-28/CVE-2016-1965 (bmo#1245264) + Addressbar spoofing though history navigation and Location protocol + property + * MFSA 2016-29/CVE-2016-1967 (bmo#1246956) + Same-origin policy violation using perfomance.getEntries and + history navigation with session restore + * MFSA 2016-30/CVE-2016-1968 (bmo#1246742) + Buffer overflow in Brotli decompression + * MFSA 2016-31/CVE-2016-1966 (bmo#1246054) + Memory corruption with malicious NPAPI plugin + * MFSA 2016-32/CVE-2016-1970/CVE-2016-1971/CVE-2016-1975/ + CVE-2016-1976/CVE-2016-1972 + WebRTC and LibVPX vulnerabilities found through code inspection + * MFSA 2016-33/CVE-2016-1973 (bmo#1219339) + Use-after-free in GetStaticInstance in WebRTC + * MFSA 2016-34/CVE-2016-1974 (bmo#1228103) + Out-of-bounds read in HTML parser following a failed allocation + * MFSA 2016-35/CVE-2016-1950 (bmo#1245528) + Buffer overflow during ASN.1 decoding in NSS + (fixed by requiring 3.21.1) + * MFSA 2016-36/CVE-2016-1979 (bmo#1185033) + Use-after-free during processing of DER encoded keys in NSS + (fixed by requiring 3.21.1) + * MFSA 2016-37/CVE-2016-1977/CVE-2016-2790/CVE-2016-2791/ + CVE-2016-2792/CVE-2016-2793/CVE-2016-2794/CVE-2016-2795/ + CVE-2016-2796/CVE-2016-2797/CVE-2016-2798/CVE-2016-2799/ + CVE-2016-2800/CVE-2016-2801/CVE-2016-2802 + Font vulnerabilities in the Graphite 2 library + +------------------------------------------------------------------- +Sat Mar 5 15:27:00 UTC 2016 - olaf@aepfle.de + +- Remove B_CNT from symbols.zip filename to reduce build-compare noise + +------------------------------------------------------------------- +Fri Feb 26 16:22:52 UTC 2016 - astieger@suse.com + +- fix build problems on i586, caused by too large unified compile + units - adding mozilla-reduce-files-per-UnifiedBindings.patch + +------------------------------------------------------------------- +Thu Feb 11 07:51:34 UTC 2016 - wr@rosenauer.org + +- update to Firefox 44.0.2 + * MFSA 2016-13/CVE-2016-1949 (bmo#1245724, boo#966438) + Same-origin-policy violation using Service Workers with plugins + * Fix issue which could lead to the removal of stored passwords + under certain circumstances (bmo#1242176) + * Allows spaces in cookie names (bmo#1244505) + * Disable opus/vorbis audio with H.264 (bmo#1245696) + * Fix for graphics startup crash (GNU/Linux) (bmo#1222171) + * Fix a crash in cache networking (bmo#1244076) + * Fix using WebSockets in service worker controlled pages (bmo#1243942) + +------------------------------------------------------------------- +Sat Jan 30 08:28:17 UTC 2016 - dmueller@suse.com + +- build fixes for arm/aarch64: + * disable webrtc for arm/aarch64 + * switch away from openGL-ES backend to default for arm/aarch64 + since it almost never builds + * reenable neon +- reenable webrtc for powerpc as it seems to build + +------------------------------------------------------------------- Sun Jan 24 09:33:15 UTC 2016 - wr@rosenauer.org -- update to Firefox 44.0b9 +- update to Firefox 44.0 + * MFSA 2016-01/CVE-2016-1930/CVE-2016-1931 boo#963633 + Miscellaneous memory safety hazards + * MFSA 2016-02/CVE-2016-1933 (bmo#1231761) boo#963634 + Out of Memory crash when parsing GIF format images + * MFSA 2016-03/CVE-2016-1935 (bmo#1220450) boo#963635 + Buffer overflow in WebGL after out of memory allocation + * MFSA 2016-04/CVE-2015-7208/CVE-2016-1939 (bmo#1191423, bmo#1233784) boo#963637 + Firefox allows for control characters to be set in cookie names + * MFSA 2016-06/CVE-2016-1937 (bmo#724353) boo#963641 + Missing delay following user click events in protocol handler dialog + * MFSA 2016-07/CVE-2016-1938 (bmo#1190248) boo#963731 + Errors in mp_div and mp_exptmod cryptographic functions in NSS + (fixed by requiring NSS 3.21) + * MFSA 2016-09/CVE-2016-1942/CVE-2016-1943 (bmo#1189082, bmo#1228590) + Addressbar spoofing attacks boo#963643 + * MFSA 2016-10/CVE-2016-1944/CVE-2016-1945/CVE-2016-1946 + (bmo#1186621, bmo#1214782, bmo#1232096) boo#963644 + Unsafe memory manipulation found through code inspection + * MFSA 2016-11/CVE-2016-1947 (bmo#1237103) boo#963645 + Application Reputation service disabled in Firefox 43 * requires NSPR 4.11 * requires NSS 3.21 - prepare mozilla-kde.patch for Gtk3 builds diff -r eb9ebe3e2e6a -r e969636be188 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sun Jan 24 13:40:23 2016 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Tue Jun 07 21:44:20 2016 +0200 @@ -18,10 +18,10 @@ # changed with every update -%define major 43 -%define mainver %major.99 -%define update_channel beta -%define releasedate 2016012300 +%define major 46 +%define mainver %major.0.1 +%define update_channel release +%define releasedate 2016050300 # general build definitions %if "%{update_channel}" != "aurora" @@ -77,8 +77,8 @@ BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.11 -BuildRequires: mozilla-nss-devel >= 3.21 +BuildRequires: mozilla-nspr-devel >= 4.12 +BuildRequires: mozilla-nss-devel >= 3.22.3 BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: startup-notification-devel @@ -91,6 +91,12 @@ BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) BuildRequires: pkgconfig(libpulse) +%if 0%{?firefox_use_gtk3} +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0 +BuildRequires: pkgconfig(gtk+-unix-print-3.0) +%endif # libavcodec is already used if available for H.264 but # explicitely loaded by FF. For proper H.264 support the # openSUSE delivered version is not sufficient but currently @@ -148,6 +154,7 @@ Source14: create-tar.sh Source15: firefox-appdata.xml Source16: MozillaFirefox.changes +Source17: l10n_changesets.txt # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-shared-nss-db.patch @@ -159,6 +166,9 @@ Patch8: mozilla-openaes-decl.patch Patch10: mozilla-no-stdcxx-check.patch Patch11: mozilla-libproxy.patch +Patch12: mozilla-reduce-files-per-UnifiedBindings.patch +Patch13: mozilla-gtk3_20.patch +Patch14: mozilla-check_return.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch @@ -268,6 +278,11 @@ %patch8 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%if 0%{?firefox_use_gtk3} +%patch13 -p1 +%endif +%patch14 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -320,8 +335,10 @@ ac_add_options --mandir=%{_mandir} ac_add_options --includedir=%{_includedir} ac_add_options --enable-release -%if 0%{?suse_version} > 1320 -#ac_add_options --enable-default-toolkit=cairo-gtk3 +%if 0%{?firefox_use_gtk3} +ac_add_options --enable-default-toolkit=cairo-gtk3 +%else +ac_add_options --enable-default-toolkit=cairo-gtk2 %endif %ifarch %ix86 %arm %if 0%{?suse_version} > 1230 @@ -356,17 +373,15 @@ %if ! %crashreporter ac_add_options --disable-crashreporter %endif -# Disable neon for arm as it does not build correctly %ifarch %arm -ac_add_options --disable-neon +ac_add_options --disable-elf-hack +ac_add_options --with-fpu=vfpv3-d16 +ac_add_options --with-float-abi=hard +ac_add_options --with-arch=armv7-a %endif -%ifnarch %ix86 x86_64 +%ifarch %arm aarch64 s390x ac_add_options --disable-webrtc %endif -# try to use OpenGL-ES on ARM -%ifarch %arm aarch64 -ac_add_options --with-gl-provider=EGL -%endif EOF make -f client.mk build @@ -522,7 +537,7 @@ %fdupes %{buildroot}%{_datadir} # create breakpad debugsymbols %if %crashreporter -SYMBOLS_NAME="firefox-%{version}-%{release}.%{_arch}-%{suse_version}-symbols" +SYMBOLS_NAME="firefox-%{version}-` echo '%{release}' | sed 's@\.[^\.]\+$@@' `.%{_arch}-%{suse_version}-symbols" make buildsymbols \ SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \ SYMBOL_FULL_ARCHIVE_BASENAME="$SYMBOLS_NAME-full" \ @@ -560,19 +575,19 @@ %dir %{progdir}/browser/extensions/ %{progdir}/browser/components/ %{progdir}/browser/defaults +%{progdir}/browser/features/ %{progdir}/browser/icons/ %{progdir}/browser/chrome/icons -%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi %{progdir}/browser/blocklist.xml %{progdir}/browser/chrome.manifest %{progdir}/browser/omni.ja %dir %{progdir}/distribution/ %{progdir}/distribution/extensions/ -%{progdir}/components/ %{progdir}/defaults/ %{progdir}/dictionaries/ -%if 0%{?suse_version} > 1320 -#%dir %{progdir}/gtk2 +%if 0%{?firefox_use_gtk3} +%dir %{progdir}/gtk2 %{progdir}/gtk2/libmozgtk.so %endif %{progdir}/webapprt/ @@ -587,7 +602,6 @@ %{progdir}/platform.ini %{progdir}/plugin-container %{progdir}/webapprt-stub -%{progdir}/chrome.manifest %if %crashreporter %{progdir}/crashreporter %{progdir}/crashreporter.ini diff -r eb9ebe3e2e6a -r e969636be188 MozillaFirefox/_constraints --- a/MozillaFirefox/_constraints Sun Jan 24 13:40:23 2016 +0100 +++ b/MozillaFirefox/_constraints Tue Jun 07 21:44:20 2016 +0200 @@ -2,10 +2,10 @@ - 9 + 13 - 5000 + 6000 diff -r eb9ebe3e2e6a -r e969636be188 MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Sun Jan 24 13:40:23 2016 +0100 +++ b/MozillaFirefox/create-tar.sh Tue Jun 07 21:44:20 2016 +0200 @@ -1,9 +1,14 @@ #!/bin/bash -CHANNEL="beta" +# TODO +# http://ftp.mozilla.org/pub/firefox/candidates/46.0-candidates/build5/linux-x86_64/en-US/firefox-46.0.json +# "moz_source_stamp": "078baf501b55eaa47f3b189fda4dd28dae1fa257" +# http://ftp.mozilla.org/pub/firefox/candidates/46.0-candidates/build5/l10n_changesets.txt + +CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_44_0b9_RELEASE" -VERSION="43.99" +RELEASE_TAG="FIREFOX_46_0_1_RELEASE" +VERSION="46.0.1" # mozilla if [ -d mozilla ]; then @@ -46,9 +51,11 @@ ja-JP-mac|en-US) ;; *) - echo "fetching $locale ..." + echo "reading changeset information for $locale" + _changeset=$(grep ^$locale l10n_changesets.txt | awk '{ print $2; }') + echo "fetching $locale changeset $_changeset ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale - [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG + [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $_changeset ;; esac done diff -r eb9ebe3e2e6a -r e969636be188 MozillaFirefox/l10n_changesets.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/l10n_changesets.txt Tue Jun 07 21:44:20 2016 +0200 @@ -0,0 +1,90 @@ +ach 658769a76613 +af 431e02c10881 +an fe436c75f71d +ar bbcf06888dc5 +as 8313f975ae77 +ast 0300b60cd340 +az fd96727d2a26 +be b72077740aac +bg 9f7507dd2b92 +bn-BD fe0a6bb82a2d +bn-IN a2ea6b87d80d +br 95b028350e29 +bs cfee6f5b1e50 +ca e8ca2d46b4a8 +cs ed6004b91b51 +cy 5bbcbba9b054 +da 324fe068c0b9 +de 217ff3f0054a +dsb 7cdfb5d9dc5d +el 22b959c9a739 +en-GB 36012ab486ad +en-ZA 1c91f05aae5a +eo 049c1b065f4c +es-AR b3647b1d5927 +es-CL e45186f983b9 +es-ES 6fe131a8b07f +es-MX 4cd511663283 +et ecae9df9c92a +eu 1a65e2c03dda +fa e5993d9fb76e +ff 8373353b43c4 +fi b743718650bc +fr 7d0bb8edc149 +fy-NL 02ee99ad3f83 +ga-IE 713ecb614f77 +gd e5b86736a5f9 +gl c869caff337a +gn 65b2894520b6 +gu-IN 6245b4309461 +he ee92b661d299 +hi-IN bba2a926e4f8 +hr 8502beb4ee68 +hsb c91a11523487 +hu 09bbddfef7ee +hy-AM 3d7a9324fb25 +id cb8f841d30d2 +is 46c99105eb3b +it 6063a6d94e13 +ja 5ff86cadfe9a +ja-JP-mac ab760b3dcdd1 +kk 5a7bd05bf942 +km 339790840ac1 +kn b23d8fbcf41a +ko 5f303ed16778 +lij e9113fac3a93 +lt 628e96e62e44 +lv 063998fdecf8 +mai ce010a305377 +mk ffdf2a789185 +ml 1b85d75836cd +mr 553ff31f4edd +ms 41bbf86ac0d9 +nb-NO 5e6e5710fac9 +nl ac486141ab40 +nn-NO be9e3eeb75fb +or febd1b04dbfc +pa-IN 6c5ed1be55fb +pl 49e141118acb +pt-BR cd1aef7b5045 +pt-PT 2e4fd2a1f98f +rm 0a52db6a6117 +ro c6ac34be77b1 +ru 3f0b3c8e19a4 +si 03a3b09a2203 +sk 3505a5f99bff +sl 1e098ab8c27a +son 3ae9a4ff0453 +sq c24e570a4207 +sr 896d72a0fa21 +sv-SE ea1de38fe731 +ta f9dbc2cca1fb +te 286ff9885ea2 +th d630f05d665f +tr b751d2d9b6ee +uk c5cdb9068667 +uz dc28cf99c5cf +vi 68ce305343a3 +xh f3eb8f92afe8 +zh-CN d73d448f89d6 +zh-TW 44c9950bb3e6 diff -r eb9ebe3e2e6a -r e969636be188 MozillaFirefox/mozilla-check_return.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-check_return.patch Tue Jun 07 21:44:20 2016 +0200 @@ -0,0 +1,1 @@ +../mozilla-check_return.patch \ No newline at end of file diff -r eb9ebe3e2e6a -r e969636be188 MozillaFirefox/mozilla-gtk3_20.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-gtk3_20.patch Tue Jun 07 21:44:20 2016 +0200 @@ -0,0 +1,1 @@ +../mozilla-gtk3_20.patch \ No newline at end of file diff -r eb9ebe3e2e6a -r e969636be188 MozillaFirefox/mozilla-reduce-files-per-UnifiedBindings.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-reduce-files-per-UnifiedBindings.patch Tue Jun 07 21:44:20 2016 +0200 @@ -0,0 +1,1 @@ +../mozilla-reduce-files-per-UnifiedBindings.patch \ No newline at end of file diff -r eb9ebe3e2e6a -r e969636be188 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Sun Jan 24 13:40:23 2016 +0100 +++ b/firefox-branded-icons.patch Tue Jun 07 21:44:20 2016 +0200 @@ -1,6 +1,6 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent e10e9bf6ab3a74655998bd0286d248f5d17a601a +# Parent a5764b0a088418fdbf4b774a8ff2745cc99f6706 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -30,26 +30,26 @@ diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild --- a/browser/branding/branding-common.mozbuild +++ b/browser/branding/branding-common.mozbuild -@@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co - 'disk.icns', - 'document.icns', - 'dsstore', - 'firefox.icns', - ] - elif CONFIG['MOZ_WIDGET_GTK']: - BRANDING_FILES += [ - 'default16.png', -+ 'default22.png', -+ 'default24.png', -+ 'default256.png', - 'default32.png', - 'default48.png', - 'mozicon128.png', - ] +@@ -34,12 +34,15 @@ def FirefoxBranding(): + 'disk.icns', + 'document.icns', + 'dsstore', + 'firefox.icns', + ] + elif CONFIG['MOZ_WIDGET_GTK']: + BRANDING_FILES += [ + 'default16.png', ++ 'default22.png', ++ 'default24.png', ++ 'default256.png', + 'default32.png', + 'default48.png', + 'mozicon128.png', + ] 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 -@@ -670,18 +670,21 @@ +@@ -664,18 +664,21 @@ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/chrome/toolkit@JAREXT@ @@ -64,10 +64,10 @@ @RESPATH@/browser/chrome/icons/default/default48.png +@RESPATH@/browser/chrome/icons/default/default256.png #endif + @RESPATH@/browser/features/* ; [Webide Files] @RESPATH@/browser/chrome/webide@JAREXT@ @RESPATH@/browser/chrome/webide.manifest @RESPATH@/browser/@PREF_DIR@/webide-prefs.js - ; DevTools diff -r eb9ebe3e2e6a -r e969636be188 firefox-kde.patch --- a/firefox-kde.patch Sun Jan 24 13:40:23 2016 +0100 +++ b/firefox-kde.patch Tue Jun 07 21:44:20 2016 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 77c3bdc27160dfa96aa4b3288c7f12a72f273967 +# Parent fd5629206dcf3f64d85ab177be6bc6076f0f1619 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,1250 @@ +@@ -0,0 +1,1175 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -16,7 +16,7 @@ + + + -+ ++ + + + @@ -99,15 +99,6 @@ +