Merge branch 'master' into f30

5 files changed, 27 insertions, 52 deletions

diff --git a/.gitignore b/.gitignore
index 1f87135..d09688d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -358,3 +358,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-68.0.1-20190722.tar.xz
 /firefox-68.0.2.source.tar.xz
 /firefox-langpacks-68.0.2-20190814.tar.xz
+/firefox-69.0.source.tar.xz
+/firefox-langpacks-69.0-20190829.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 145d763..59ed950 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -89,13 +89,13 @@ ExcludeArch: s390x
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        68.0.2
+Version:        69.0
 Release:        1%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
 %if %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20190814.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20190829.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -932,6 +932,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 29 2019 Jan Horak <jhorak@redhat.com> - 69.0-1
+- Update to 69.0
+
 * Wed Aug 14 2019 Jan Horak <jhorak@redhat.com> - 68.0.2-1
 - Update to 68.0.2
 
diff --git a/mozilla-1516081.patch b/mozilla-1516081.patch
index 8eec605..1ecff39 100644
--- a/mozilla-1516081.patch
+++ b/mozilla-1516081.patch
@@ -1,7 +1,7 @@
-diff -up firefox-65.0/build/moz.configure/toolchain.configure.1516081 firefox-65.0/build/moz.configure/toolchain.configure
---- firefox-65.0/build/moz.configure/toolchain.configure.1516081	2019-01-24 19:48:38.000000000 +0100
-+++ firefox-65.0/build/moz.configure/toolchain.configure	2019-01-28 14:09:00.813320242 +0100
-@@ -1364,7 +1364,7 @@ def pgo_flags(compiler, build_env, targe
+diff -up firefox-69.0/build/moz.configure/toolchain.configure.1516081 firefox-69.0/build/moz.configure/toolchain.configure
+--- firefox-69.0/build/moz.configure/toolchain.configure.1516081	2019-08-27 03:31:51.000000000 +0200
++++ firefox-69.0/build/moz.configure/toolchain.configure	2019-08-29 10:42:45.872919255 +0200
+@@ -1411,7 +1411,7 @@ def pgo_flags(compiler, build_env, targe
  
      if compiler.type == 'gcc':
          return namespace(
@@ -10,19 +10,19 @@ diff -up firefox-65.0/build/moz.configure/toolchain.configure.1516081 firefox-65
              gen_ldflags=['-fprofile-generate'],
              use_cflags=['-fprofile-use', '-fprofile-correction',
                          '-Wcoverage-mismatch'],
-@@ -1385,7 +1385,8 @@ def pgo_flags(compiler, build_env, targe
+@@ -1434,7 +1434,8 @@ def pgo_flags(compiler, build_env, targe
  
          if gen_ldflags:
              return namespace(
--                gen_cflags=['-fprofile-instr-generate'],
-+                gen_cflags=['-fprofile-instr-generate',
+-                gen_cflags=[prefix + '-fprofile-generate'],
++                gen_cflags=[prefix + '-fprofile-generate',
 +			    '-DMOZ_PROFILE_INSTRUMENTATION'],
                  gen_ldflags=gen_ldflags,
-                 use_cflags=['-fprofile-instr-use=%s' % profdata,
-                             '-Wno-error=profile-instr-out-of-date',
-diff -up firefox-65.0/toolkit/components/terminator/nsTerminator.cpp.1516081 firefox-65.0/toolkit/components/terminator/nsTerminator.cpp
---- firefox-65.0/toolkit/components/terminator/nsTerminator.cpp.1516081	2019-01-28 14:09:00.813320242 +0100
-+++ firefox-65.0/toolkit/components/terminator/nsTerminator.cpp	2019-01-28 14:11:56.745577302 +0100
+                 use_cflags=[prefix + '-fprofile-use=%s' % profdata,
+                             # Some error messages about mismatched profile data
+diff -up firefox-69.0/toolkit/components/terminator/nsTerminator.cpp.1516081 firefox-69.0/toolkit/components/terminator/nsTerminator.cpp
+--- firefox-69.0/toolkit/components/terminator/nsTerminator.cpp.1516081	2019-08-27 03:32:05.000000000 +0200
++++ firefox-69.0/toolkit/components/terminator/nsTerminator.cpp	2019-08-29 09:51:08.513440687 +0200
 @@ -419,6 +419,12 @@ void nsTerminator::StartWatchdog() {
      }
    }
diff --git a/mozilla-1568569.patch b/mozilla-1568569.patch
index ab6225a..bb33c59 100644
--- a/mozilla-1568569.patch
+++ b/mozilla-1568569.patch
@@ -1,12 +1,7 @@
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -3238,16 +3238,18 @@ void nsWindow::OnWindowStateEvent(GtkWid
-   // We don't care about anything but changes in the maximized/icon/fullscreen
-   // states
-   if ((aEvent->changed_mask &
-        (GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_MAXIMIZED |
-         GDK_WINDOW_STATE_FULLSCREEN)) == 0) {
+diff -up firefox-69.0/widget/gtk/nsWindow.cpp.1568569 firefox-69.0/widget/gtk/nsWindow.cpp
+--- firefox-69.0/widget/gtk/nsWindow.cpp.1568569	2019-08-29 09:42:10.484631750 +0200
++++ firefox-69.0/widget/gtk/nsWindow.cpp	2019-08-29 09:49:35.371121273 +0200
+@@ -3252,6 +3252,8 @@ void nsWindow::OnWindowStateEvent(GtkWid
      return;
    }
  
@@ -15,17 +10,7 @@ diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
    if (aEvent->new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
      LOG(("\tIconified\n"));
      mSizeState = nsSizeMode_Minimized;
- #ifdef ACCESSIBILITY
-     DispatchMinimizeEventAccessible();
- #endif  // ACCESSIBILITY
-   } else if (aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
-     LOG(("\tFullscreen\n"));
-@@ -3261,16 +3263,28 @@ void nsWindow::OnWindowStateEvent(GtkWid
-   } else {
-     LOG(("\tNormal\n"));
-     mSizeState = nsSizeMode_Normal;
- #ifdef ACCESSIBILITY
-     DispatchRestoreEventAccessible();
+@@ -3275,6 +3277,18 @@ void nsWindow::OnWindowStateEvent(GtkWid
  #endif  // ACCESSIBILITY
    }
  
@@ -44,17 +29,7 @@ diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
    if (mWidgetListener) {
      mWidgetListener->SizeModeChanged(mSizeState);
      if (aEvent->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
-       mWidgetListener->FullscreenChanged(aEvent->new_window_state &
-                                          GDK_WINDOW_STATE_FULLSCREEN);
-     }
-   }
- 
-@@ -3787,16 +3801,21 @@ nsresult nsWindow::Create(nsIWidget* aPa
-       eventWidget = (drawToContainer) ? container : mShell;
- 
-       // Prevent GtkWindow from painting a background to avoid flickering.
-       gtk_widget_set_app_paintable(eventWidget, TRUE);
- 
+@@ -3800,6 +3814,11 @@ nsresult nsWindow::Create(nsIWidget* aPa
        gtk_widget_add_events(eventWidget, kEvents);
        if (drawToContainer) {
          gtk_widget_add_events(mShell, GDK_PROPERTY_CHANGE_MASK);
@@ -66,8 +41,3 @@ diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
          gtk_widget_set_app_paintable(mShell, TRUE);
        }
        if (mTransparencyBitmapForTitlebar) {
-         moz_container_force_default_visual(mContainer);
-       }
- 
-       // If we draw to mContainer window then configure it now because
-       // gtk_container_add() realizes the child widget.
diff --git a/sources b/sources
index cc7352b..29de78f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (firefox-68.0.2.source.tar.xz) = 5c289825fd0de062b9943eabcc16e09c1821c04717e689aa8df03162e722b72ea698195f3ea93e1e746c481dacd77d125301dba951468d134b986e35eb4ef5bb
-SHA512 (firefox-langpacks-68.0.2-20190814.tar.xz) = f0031f7cb6277e5216c63956aeb4e88b2ce76ba0c65f293822970740882f95803ef083525e7c3a23e92252f2322a7fb0e43ac2359416f40c98480b9587f698be
+SHA512 (firefox-69.0.source.tar.xz) = 83b4b9a3466d2686ae5b72f9495172dcb37037f3301c68f7940604180e28a40720256f66b34b090dffbdd7b377fbb815df1bb80c3df842bc9ae59551c7cf07b0
+SHA512 (firefox-langpacks-69.0-20190829.tar.xz) = e45cec7cf4e0832407ce4fbe2c8e881ce6cf3d91ea7309ab9aec14adf808ecd7cdb5117e453eed9d145e3ac63b4c14c61272d00be25853b3a729c0b1e4fe6d19
 SHA512 (cbindgen-vendor.tar.xz) = bdd1535c9923a082cdca263ff2c1765814b00b6a1c74be95bac4dbf7d0b7b29c1c27f0fed6feae99c88521c96e2865f0ea3cf784bd9a32a44cec6ee4df850662