From 2bd754dfc16323f397b4078cdaacdcae935d7325bc5fd2f20d119e7b80de9e14 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 7 Apr 2020 12:16:56 +0000 Subject: [PATCH 1/4] Accepting request 791805 from home:michel_mno:branches:mozilla:Factory - increase _constraints memory for ppc64le OBS-URL: https://build.opensuse.org/request/show/791805 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=820 --- MozillaFirefox.changes | 5 +++++ _constraints | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index df2cecc..2cf68bb 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 6 11:19:24 UTC 2020 - Michel Normand + +- increase _constraints memory for ppc64le + ------------------------------------------------------------------- Fri Apr 3 15:23:28 UTC 2020 - Wolfgang Rosenauer diff --git a/_constraints b/_constraints index bdf10b5..5566790 100644 --- a/_constraints +++ b/_constraints @@ -42,4 +42,17 @@ + + + ppc64le + + + + 25 + + + 10 + + + From f0a9acb709b11ed118f7fc982c0011db6057a5bedf1dc7cc998b918dd757bd0e Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 7 Apr 2020 12:21:48 +0000 Subject: [PATCH 2/4] - Mozilla Firefox 75.0 - removed obsolete patch mozilla-bmo1609538.patch - requires * rust >= 1.41 * rust-cbindgen >= 0.13.1 * mozilla-nss >= 3.51 * nodejs10 >= 10.19 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=821 --- MozillaFirefox.changes | 12 ++ MozillaFirefox.spec | 18 ++- firefox-74.0.1.source.tar.xz | 3 - firefox-74.0.1.source.tar.xz.asc | 16 --- firefox-75.0.source.tar.xz | 3 + firefox-75.0.source.tar.xz.asc | 16 +++ l10n-74.0.1.tar.xz | 3 - l10n-75.0.tar.xz | 3 + mozilla-bmo1568145.patch | 2 +- mozilla-bmo1609538.patch | 191 ------------------------------- mozilla-kde.patch | 22 ++-- tar_stamps | 8 +- 12 files changed, 58 insertions(+), 239 deletions(-) delete mode 100644 firefox-74.0.1.source.tar.xz delete mode 100644 firefox-74.0.1.source.tar.xz.asc create mode 100644 firefox-75.0.source.tar.xz create mode 100644 firefox-75.0.source.tar.xz.asc delete mode 100644 l10n-74.0.1.tar.xz create mode 100644 l10n-75.0.tar.xz delete mode 100644 mozilla-bmo1609538.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 2cf68bb..0f00ac6 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 7 12:18:27 UTC 2020 - Wolfgang Rosenauer + +- Mozilla Firefox 75.0 +- removed obsolete patch + mozilla-bmo1609538.patch +- requires + * rust >= 1.41 + * rust-cbindgen >= 0.13.1 + * mozilla-nss >= 3.51 + * nodejs10 >= 10.19 + ------------------------------------------------------------------- Mon Apr 6 11:19:24 UTC 2020 - Michel Normand diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 9750f57..8a0acd1 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,9 +18,9 @@ # changed with every update -%define major 74 -%define mainver %major.0.1 -%define orig_version 74.0.1 +%define major 75 +%define mainver %major.0 +%define orig_version 75.0 %define orig_suffix %{nil} %define update_channel release %define branding 1 @@ -75,7 +75,7 @@ BuildRequires: gcc7-c++ %else BuildRequires: gcc-c++ %endif -BuildRequires: cargo >= 1.39 +BuildRequires: cargo >= 1.41 BuildRequires: libXcomposite-devel BuildRequires: libcurl-devel BuildRequires: libidl-devel @@ -84,14 +84,14 @@ BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.25 -BuildRequires: mozilla-nss-devel >= 3.50 +BuildRequires: mozilla-nss-devel >= 3.51 BuildRequires: nasm >= 2.13 -BuildRequires: nodejs8 >= 8.11 +BuildRequires: nodejs10 >= 10.19.0 BuildRequires: python-devel BuildRequires: python2-xml BuildRequires: python3 >= 3.5 -BuildRequires: rust >= 1.39 -BuildRequires: rust-cbindgen >= 0.13.0 +BuildRequires: rust >= 1.41 +BuildRequires: rust-cbindgen >= 0.13.1 BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files @@ -186,7 +186,6 @@ Patch19: mozilla-bmo1512162.patch Patch20: mozilla-fix-top-level-asm.patch Patch21: mozilla-bmo1504834-part4.patch Patch22: mozilla-bmo849632.patch -Patch23: mozilla-bmo1609538.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -322,7 +321,6 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version} %patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 # Firefox %patch101 -p1 %patch102 -p1 diff --git a/firefox-74.0.1.source.tar.xz b/firefox-74.0.1.source.tar.xz deleted file mode 100644 index 0d536c3..0000000 --- a/firefox-74.0.1.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62e4297b682fad1ea50d8e32fc51c811169f8edec8d12d2aab0ea60b3197f011 -size 321313088 diff --git a/firefox-74.0.1.source.tar.xz.asc b/firefox-74.0.1.source.tar.xz.asc deleted file mode 100644 index 6bccab0..0000000 --- a/firefox-74.0.1.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl6HGwgACgkQ8aZmj7t9 -Vy4Fzw/8C389UvAAuJGwAyTQ3lf30kQL/mV8cuL7fPvXMdCpL3czh2qE3t/HwRki -aw2RNweyt0c/Ag5I7g+qXynK/rA2mV6rXpONn5j+tbcUrHmLtb32bNUkiL8DrwAo -ORm55+d4ipOI44bRnx5m7iQD3aMlqkF0z5h0Tfm9Diqfg0dQmSwG+qZbkbfn8qfw -uRHytqUL8SCi876Kz3eUyIW4wapQ4H6v2y+UNL06oC/kqdWhY/xKXn/9MhyVe8kk -+zQYJghSWzgESCNZLQuFz5pMFlEgsByCjFDNXWBMWJIW1T0soBWQzHYLsjgt4u/H -WMwUtpK0U0sCFw9Cl++42iQzYYY8EGliTA+rIQ9u2rCY89eGKoBFJl0tKbqwN3Z5 -wIZOACXbNag1uu/fK+R9Cg9EgsWld9oPoco3FBMCS6Cp4Lm52XqJ9VYCk25JoAjB -rUNVZD3c7D4xpagtdvxDepMTUSn0RQKlKRXckp+j4m05iU7mIx+qD6Jynp8pncbY -BQEj3hnEQiU7HOVt/rbVn3AcrpxnXNle6Z0Rma97AzqEXM2Dc1MKAkJFAAOEdUgY -fwAUYJgPjkD328UZxoQZ85xtA+57vJD9td3LPOtWl6fbISl/sJiX3F3hdy5vWFIK -MQzPy9Ej4/uHAuo2L+6RU/av5ba1ticILkHalcCKgGkDYG5WhS4= -=N2ko ------END PGP SIGNATURE----- diff --git a/firefox-75.0.source.tar.xz b/firefox-75.0.source.tar.xz new file mode 100644 index 0000000..fa4f9d9 --- /dev/null +++ b/firefox-75.0.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f +size 324614064 diff --git a/firefox-75.0.source.tar.xz.asc b/firefox-75.0.source.tar.xz.asc new file mode 100644 index 0000000..fe0ba4a --- /dev/null +++ b/firefox-75.0.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl6HkaUACgkQ8aZmj7t9 +Vy4dmg//UdZoIejlXG67lkOdFnVYDJmBnQN4481u6hntUxR9VCO8LDx+1PdRbcz+ +CByteJN+UECuPcw2A0ZHNeya7ea6iE5u+XkvZTw0Ch1dNGYdz1gI+m1hLm4KcGsk +EDXCwFy3JufPujuVnWzhmEtpsHVIwLV+KdyXBiO8cdyNQ6pmrDg+DfoGfpVyAIi7 +4SYG7pdn82xVYM5zubo8RBMMMWqIg4DcOxc8zV/lc1ODDqGEzpOolKo55oKmMfE/ +4amJy+b/XgAfrPHETISF6dQueJoSsNGlpcEya++cUfjTPOAhYXYV6V0+hJAKhTo/ +u+lT9rNfidR3Y5BaRyZIVzzZURVfFN4ExXC9IB1hSc5OWQ86uOA6ZGvoV4KLEEk2 +awlrKpaZx7p7bEiuJ2DrB92Karaln8qaUKCzaPWRWouGEuu/4f1cv1PO/Svq6vJL +FYpRSZK6zezMyhtzIoVz2cD+FWj8fV/10VbRgEDub6CnnaBc6QMfaMIUkA9ppkfP +phwzNflcJ+oGOpBrcTNHfdMpvcMPrZXVFlX5BAvjcD//fxxzjEd+rCe9KT8rohvp +rkuQuCU2CYijSLCaZy5QRzbCFcyIdR5n0GLBRMLVc/VftdKAcIaVNPWMTLDHK6Ch +uJ7XnFiQL+XYoqh3BbhgoZatqpkZkI1eblK0Rhkagd/A2AcbC74= +=fw6a +-----END PGP SIGNATURE----- diff --git a/l10n-74.0.1.tar.xz b/l10n-74.0.1.tar.xz deleted file mode 100644 index b66a839..0000000 --- a/l10n-74.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:365a8ab6c0ce40132fffc6d4feb2a7ee36e6172d142590e4e9c923433d51d7d9 -size 51410736 diff --git a/l10n-75.0.tar.xz b/l10n-75.0.tar.xz new file mode 100644 index 0000000..397d09b --- /dev/null +++ b/l10n-75.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:112d3ac0374525e1119164aa5bf246ce3074c3d0ea043a7b69eaa6146707ccc3 +size 51658952 diff --git a/mozilla-bmo1568145.patch b/mozilla-bmo1568145.patch index d40ec68..b4aedcd 100644 --- a/mozilla-bmo1568145.patch +++ b/mozilla-bmo1568145.patch @@ -11,7 +11,7 @@ diff --git a/python/mozbuild/mozbuild/action/langpack_manifest.py b/python/mozbu --- a/python/mozbuild/mozbuild/action/langpack_manifest.py +++ b/python/mozbuild/mozbuild/action/langpack_manifest.py @@ -11,16 +11,17 @@ - from __future__ import absolute_import, print_function + from __future__ import absolute_import, print_function, unicode_literals import argparse import sys diff --git a/mozilla-bmo1609538.patch b/mozilla-bmo1609538.patch deleted file mode 100644 index dbe571c..0000000 --- a/mozilla-bmo1609538.patch +++ /dev/null @@ -1,191 +0,0 @@ -# HG changeset patch -# Parent 047fa9d20b78759029e87c48f0d64f819e889e4c - -diff --git a/widget/gtk/mozcontainer.cpp b/widget/gtk/mozcontainer.cpp ---- a/widget/gtk/mozcontainer.cpp -+++ b/widget/gtk/mozcontainer.cpp -@@ -159,23 +159,25 @@ void moz_container_move(MozContainer* co - - // Wayland subsurface is not created yet. - if (!container->subsurface) { - return; - } - - // wl_subsurface_set_position is actually property of parent surface - // which is effective when parent surface is commited. -- wl_surface* parent_surface = -- moz_gtk_widget_get_wl_surface(GTK_WIDGET(container)); -- if (parent_surface) { -- wl_subsurface_set_position(container->subsurface, container->subsurface_dx, -- container->subsurface_dy); -- wl_surface_commit(parent_surface); -- container->surface_position_needs_update = false; -+ wl_subsurface_set_position(container->subsurface, container->subsurface_dx, -+ container->subsurface_dy); -+ container->surface_position_needs_update = false; -+ -+ GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(container)); -+ if (window) { -+ GdkRectangle rect = (GdkRectangle){0, 0, gdk_window_get_width(window), -+ gdk_window_get_height(window)}; -+ gdk_window_invalidate_rect(window, &rect, false); - } - } - - // This is called from layout/compositor code only with - // size equal to GL rendering context. Otherwise there are - // rendering artifacts as wl_egl_window size does not match - // GL rendering pipeline setup. - void moz_container_egl_window_set_size(MozContainer* container, int width, -@@ -217,16 +219,17 @@ void moz_container_init(MozContainer* co - container->subsurface = nullptr; - container->eglwindow = nullptr; - container->frame_callback_handler = nullptr; - container->frame_callback_handler_surface_id = -1; - // We can draw to x11 window any time. - container->ready_to_draw = gfxPlatformGtk::GetPlatform()->IsX11Display(); - container->opaque_region_needs_update = false; - container->opaque_region_subtract_corners = false; -+ container->opaque_region_fullscreen = false; - container->surface_needs_clear = true; - container->subsurface_dx = 0; - container->subsurface_dy = 0; - container->surface_position_needs_update = 0; - container->initial_draw_cbs.clear(); - #endif - - LOG(("%s [%p]\n", __FUNCTION__, (void*)container)); -@@ -569,22 +572,26 @@ static void moz_container_add(GtkContain - moz_container_put(MOZ_CONTAINER(container), widget, 0, 0); - } - - #ifdef MOZ_WAYLAND - static void moz_container_set_opaque_region(MozContainer* container) { - GtkAllocation allocation; - gtk_widget_get_allocation(GTK_WIDGET(container), &allocation); - -- // Set region to mozcontainer which does not have any offset -- wl_region* region = -- CreateOpaqueRegionWayland(0, 0, allocation.width, allocation.height, -- container->opaque_region_subtract_corners); -- wl_surface_set_opaque_region(container->surface, region); -- wl_region_destroy(region); -+ // Set region to mozcontainer for normal state only -+ if (!container->opaque_region_fullscreen) { -+ wl_region* region = -+ CreateOpaqueRegionWayland(0, 0, allocation.width, allocation.height, -+ container->opaque_region_subtract_corners); -+ wl_surface_set_opaque_region(container->surface, region); -+ wl_region_destroy(region); -+ } else { -+ wl_surface_set_opaque_region(container->surface, nullptr); -+ } - } - - struct wl_surface* moz_container_get_wl_surface(MozContainer* container) { - LOGWAYLAND(("%s [%p] surface %p ready_to_draw %d\n", __FUNCTION__, - (void*)container, (void*)container->surface, - container->ready_to_draw)); - - if (!container->surface) { -@@ -670,17 +677,19 @@ gboolean moz_container_has_wl_egl_window - - gboolean moz_container_surface_needs_clear(MozContainer* container) { - int ret = container->surface_needs_clear; - container->surface_needs_clear = false; - return ret; - } - - void moz_container_update_opaque_region(MozContainer* container, -- bool aSubtractCorners) { -+ bool aSubtractCorners, -+ bool aFullScreen) { - container->opaque_region_needs_update = true; - container->opaque_region_subtract_corners = aSubtractCorners; -+ container->opaque_region_fullscreen = aFullScreen; - } - #endif - - void moz_container_force_default_visual(MozContainer* container) { - container->force_default_visual = true; - } -diff --git a/widget/gtk/mozcontainer.h b/widget/gtk/mozcontainer.h ---- a/widget/gtk/mozcontainer.h -+++ b/widget/gtk/mozcontainer.h -@@ -77,16 +77,17 @@ struct _MozContainer { - struct wl_surface* surface; - struct wl_subsurface* subsurface; - int subsurface_dx, subsurface_dy; - struct wl_egl_window* eglwindow; - struct wl_callback* frame_callback_handler; - int frame_callback_handler_surface_id; - gboolean opaque_region_needs_update; - gboolean opaque_region_subtract_corners; -+ gboolean opaque_region_fullscreen; - gboolean surface_position_needs_update; - gboolean surface_needs_clear; - gboolean ready_to_draw; - std::vector> initial_draw_cbs; - #endif - gboolean force_default_visual; - }; - -@@ -112,12 +113,13 @@ void moz_container_move_resize(MozContai - void moz_container_egl_window_set_size(MozContainer* container, int width, - int height); - void moz_container_scale_changed(MozContainer* container, - GtkAllocation* aAllocation); - void moz_container_add_initial_draw_callback( - MozContainer* container, const std::function& initial_draw_cb); - wl_surface* moz_gtk_widget_get_wl_surface(GtkWidget* aWidget); - void moz_container_update_opaque_region(MozContainer* container, -- bool aSubtractCorners); -+ bool aSubtractCorners, -+ bool aFullScreen); - #endif - - #endif /* __MOZ_CONTAINER_H__ */ -diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp ---- a/widget/gtk/nsWindow.cpp -+++ b/widget/gtk/nsWindow.cpp -@@ -4860,27 +4860,34 @@ void nsWindow::UpdateTopLevelOpaqueRegio - int width = DevicePixelsToGdkCoordRoundDown(mBounds.width); - int height = DevicePixelsToGdkCoordRoundDown(mBounds.height); - - GdkRectangle rect = {x, y, width, height}; - if (!mToplevelOpaqueRegionState.NeedsUpdate(rect, aSubtractCorners)) { - return; - } - -- wl_region* region = -- CreateOpaqueRegionWayland(x, y, width, height, aSubtractCorners); -- wl_surface_set_opaque_region(surface, region); -- wl_region_destroy(region); -- -+ // Set opaque region to toplevel window only in fullscreen mode. -+ bool fullScreen = mSizeState != nsSizeMode_Normal && !mIsTiled; -+ if (fullScreen) { -+ wl_region* region = -+ CreateOpaqueRegionWayland(x, y, width, height, aSubtractCorners); -+ wl_surface_set_opaque_region(surface, region); -+ wl_region_destroy(region); -+ } else { -+ wl_surface_set_opaque_region(surface, nullptr); -+ } -+ -+ // TODO -> create a function for it - GdkWindow* window = gtk_widget_get_window(mShell); - if (window) { - gdk_window_invalidate_rect(window, &rect, false); - } - -- moz_container_update_opaque_region(mContainer, aSubtractCorners); -+ moz_container_update_opaque_region(mContainer, aSubtractCorners, fullScreen); - } - #endif - - static void GdkWindowSetOpaqueRegion(GdkWindow* aGdkWindow, - cairo_region_t* aRegion) { - // Available as of GTK 3.10+ - static auto sGdkWindowSetOpaqueRegion = - (void (*)(GdkWindow*, cairo_region_t*))dlsym( diff --git a/mozilla-kde.patch b/mozilla-kde.patch index f114698..ace0920 100644 --- a/mozilla-kde.patch +++ b/mozilla-kde.patch @@ -3,7 +3,7 @@ # Date 1559294891 -7200 # Fri May 31 11:28:11 2019 +0200 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 -# Parent d942febc5733911d795d1cec027fb4f3c0a6e53b +# Parent fbac8545cf6f461803505c2d1f57531798dee96a Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -13,7 +13,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp -@@ -84,16 +84,17 @@ +@@ -83,16 +83,17 @@ #include "nsXPCOM.h" #include "nsXULAppAPI.h" #include "nsZipArchive.h" @@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp #ifdef MOZ_MEMORY # include "mozmemory.h" #endif -@@ -4539,25 +4540,37 @@ nsresult Preferences::InitInitialObjects +@@ -4535,25 +4536,37 @@ nsresult Preferences::InitInitialObjects // application pref files for backwards compatibility. static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -69,7 +69,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp // Load jar:$app/omni.jar!/defaults/preferences/*.js // or jar:$gre/omni.jar!/defaults/preferences/*.js. -@@ -4603,17 +4616,17 @@ nsresult Preferences::InitInitialObjects +@@ -4599,17 +4612,17 @@ nsresult Preferences::InitInitialObjects } nsCOMPtr path = do_QueryInterface(elem); @@ -800,7 +800,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle using mozilla::dom::RemoteHandlerApp; namespace { -@@ -288,17 +288,17 @@ mozilla::ipc::IPCResult HandlerServicePa +@@ -294,17 +294,17 @@ mozilla::ipc::IPCResult HandlerServicePa mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS( const nsCString& aProtocolScheme, bool* aHandlerExists) { if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { @@ -819,7 +819,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle /* * Check if a handler exists for the provided protocol. Check the datastore -@@ -317,17 +317,17 @@ mozilla::ipc::IPCResult HandlerServicePa +@@ -323,17 +323,17 @@ mozilla::ipc::IPCResult HandlerServicePa nsCOMPtr protoSvc = do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv); if (NS_WARN_IF(NS_FAILED(rv))) { @@ -1295,7 +1295,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -128,16 +128,17 @@ include('/ipc/chromium/chromium-config.m +@@ -129,16 +129,17 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' @@ -1404,15 +1404,15 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp + return NS_OK; + } + - nsCString title; - title.Adopt(ToNewUTF8String(mTitle)); + NS_ConvertUTF16toUTF8 title(mTitle); GtkWindow* parent_widget = GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); GtkFileChooserAction action = GetGtkFileChooserAction(mMode); -@@ -572,16 +599,240 @@ void nsFilePicker::Done(void* file_choos + const gchar* accept_button; +@@ -571,16 +598,240 @@ void nsFilePicker::Done(void* file_choos mCallback->Done(result); mCallback = nullptr; } else { @@ -1852,7 +1852,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp # include "prmem.h" # include "plbase64.h" -@@ -1904,62 +1905,77 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1907,62 +1908,77 @@ nsLocalFile::SetPersistentDescriptor(con NS_IMETHODIMP nsLocalFile::Reveal() { diff --git a/tar_stamps b/tar_stamps index 665579a..cce2ffe 100644 --- a/tar_stamps +++ b/tar_stamps @@ -1,11 +1,11 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="74.0.1" +VERSION="75.0" VERSION_SUFFIX="" -PREV_VERSION="74.0" +PREV_VERSION="75.0" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" -RELEASE_TAG="63afe468c6a580c6c01623fd60c8393fc2c2a4e0" -RELEASE_TIMESTAMP="20200403064753" +RELEASE_TAG="6200ca9b300670ec069cdbf6e4f05e6a0bca46f1" +RELEASE_TIMESTAMP="20200403170909" From 65f3f19592f3fa503947303f9a661a361f99f64cf10f82832c11e617e873c68b Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 7 Apr 2020 20:38:25 +0000 Subject: [PATCH 3/4] * https://www.mozilla.org/en-US/firefox/75.0/releasenotes MFSA 2020-12 (bsc#1168874) * CVE-2020-6821 (bmo#1625404) Uninitialized memory could be read when using the WebGL copyTexSubImage method * CVE-2020-6822 (bmo#1544181) Out of bounds write in GMPDecodeData when processing large images * CVE-2020-6823 (bmo#1614919) Malicious Extension could obtain auth codes from OAuth login flows * CVE-2020-6824 (bmo#1621853) Generated passwords may be identical on the same site between separate private browsing sessions * CVE-2020-6825 (bmo#1572541,bmo#1620193,bmo#1620203) Memory safety bugs fixed in Firefox 75 and Firefox ESR 68.7 * CVE-2020-6826 (bmo#1613009,bmo#1613195,bmo#1616734,bmo#1617488, bmo#1619229,bmo#1620719,bmo#1624897) Memory safety bugs fixed in Firefox 75 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=822 --- MozillaFirefox.changes | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 0f00ac6..8c9bdf1 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -2,6 +2,23 @@ Tue Apr 7 12:18:27 UTC 2020 - Wolfgang Rosenauer - Mozilla Firefox 75.0 + * https://www.mozilla.org/en-US/firefox/75.0/releasenotes + MFSA 2020-12 (bsc#1168874) + * CVE-2020-6821 (bmo#1625404) + Uninitialized memory could be read when using the WebGL + copyTexSubImage method + * CVE-2020-6822 (bmo#1544181) + Out of bounds write in GMPDecodeData when processing large images + * CVE-2020-6823 (bmo#1614919) + Malicious Extension could obtain auth codes from OAuth login flows + * CVE-2020-6824 (bmo#1621853) + Generated passwords may be identical on the same site between + separate private browsing sessions + * CVE-2020-6825 (bmo#1572541,bmo#1620193,bmo#1620203) + Memory safety bugs fixed in Firefox 75 and Firefox ESR 68.7 + * CVE-2020-6826 (bmo#1613009,bmo#1613195,bmo#1616734,bmo#1617488, + bmo#1619229,bmo#1620719,bmo#1624897) + Memory safety bugs fixed in Firefox 75 - removed obsolete patch mozilla-bmo1609538.patch - requires From 81c21d1d0f8e92be45842ec14e0d061b50a6bcc9b4d185a5a3d1740527e59aed Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 9 Apr 2020 17:21:52 +0000 Subject: [PATCH 4/4] - fix build issue in libvpx for i586 via mozilla-bmo1622013.patch OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=823 --- MozillaFirefox.changes | 1 + MozillaFirefox.spec | 2 ++ mozilla-bmo1622013.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 mozilla-bmo1622013.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 8c9bdf1..e1116ef 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -26,6 +26,7 @@ Tue Apr 7 12:18:27 UTC 2020 - Wolfgang Rosenauer * rust-cbindgen >= 0.13.1 * mozilla-nss >= 3.51 * nodejs10 >= 10.19 +- fix build issue in libvpx for i586 via mozilla-bmo1622013.patch ------------------------------------------------------------------- Mon Apr 6 11:19:24 UTC 2020 - Michel Normand diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 8a0acd1..591660f 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -186,6 +186,7 @@ Patch19: mozilla-bmo1512162.patch Patch20: mozilla-fix-top-level-asm.patch Patch21: mozilla-bmo1504834-part4.patch Patch22: mozilla-bmo849632.patch +Patch23: mozilla-bmo1622013.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -321,6 +322,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version} %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 # Firefox %patch101 -p1 %patch102 -p1 diff --git a/mozilla-bmo1622013.patch b/mozilla-bmo1622013.patch new file mode 100644 index 0000000..8016939 --- /dev/null +++ b/mozilla-bmo1622013.patch @@ -0,0 +1,28 @@ +From be45ba20c33a8a247115e79fd4c1f3295d652ba3 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 23 Mar 2020 08:20:22 +0000 +Subject: [PATCH] Bug 1622013 - Build *_mmx.c files with -mmmx in bundled libvpx. + +diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build +index f3845941fe4de..47853d43408b7 100644 +--- a/media/libvpx/moz.build ++++ b/media/libvpx/moz.build +@@ -97,16 +97,18 @@ if CONFIG['OS_TARGET'] == 'Android': + DEFINES['__linux__'] = True + + SOURCES += [ + '%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'], + ] + + for f in SOURCES: + if f.endswith('.c'): ++ if 'mmx.c' in f: ++ SOURCES[f].flags += ['-mmmx'] + if 'sse2.c' in f: + SOURCES[f].flags += CONFIG['SSE2_FLAGS'] + if 'ssse3.c' in f: + SOURCES[f].flags += ['-mssse3'] + if 'sse4.c' in f: + SOURCES[f].flags += ['-msse4.1'] + if 'avx.c' in f: + SOURCES[f].flags += ['-mavx']