upkg

3 files changed, 62 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c8bc1879296..a4ae96f1e522 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Aug  9 13:21:45 UTC 2018
+# Sat Sep  8 11:35:04 UTC 2018
 pkgbase = firefox-kde-opensuse
 	pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
-	pkgver = 61.0.2
+	pkgver = 62.0
 	pkgrel = 1
 	url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
 	arch = i686
@@ -47,25 +47,25 @@ pkgbase = firefox-kde-opensuse
 	depends = gtk3
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = speech-dispatcher: Text-to-Speech
-	provides = firefox=61.0.2
+	provides = firefox=62.0
 	conflicts = firefox
 	options = !emptydirs
 	options = debug
 	options = strip
-	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_61_0_2_RELEASE
+	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_62_0_RELEASE
 	source = mozconfig
 	source = firefox.desktop
 	source = vendor.js
 	source = kde.js
 	source = firefox-fixed-loading-icon.png
-	source = firefox-branded-icons-42510f8eee28.patch::http://www.rosenauer.org/hg/mozilla/raw-file/42510f8eee28/firefox-branded-icons.patch
-	source = firefox-kde-42510f8eee28.patch::http://www.rosenauer.org/hg/mozilla/raw-file/42510f8eee28/firefox-kde.patch
-	source = mozilla-kde-42510f8eee28.patch::http://www.rosenauer.org/hg/mozilla/raw-file/42510f8eee28/mozilla-kde.patch
-	source = mozilla-nongnome-proxies-42510f8eee28.patch::http://www.rosenauer.org/hg/mozilla/raw-file/42510f8eee28/mozilla-nongnome-proxies.patch
+	source = firefox-branded-icons-18f97bd2c2bf.patch::http://www.rosenauer.org/hg/mozilla/raw-file/18f97bd2c2bf/firefox-branded-icons.patch
+	source = firefox-kde-18f97bd2c2bf.patch::http://www.rosenauer.org/hg/mozilla/raw-file/18f97bd2c2bf/firefox-kde.patch
+	source = mozilla-kde-18f97bd2c2bf.patch::http://www.rosenauer.org/hg/mozilla/raw-file/18f97bd2c2bf/mozilla-kde.patch
+	source = mozilla-nongnome-proxies-18f97bd2c2bf.patch::http://www.rosenauer.org/hg/mozilla/raw-file/18f97bd2c2bf/mozilla-nongnome-proxies.patch
 	source = unity-menubar.patch
 	source = add_missing_pgo_rule.patch
 	source = pgo_fix_missing_kdejs.patch
-	source = https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-61.0-patches-01.tar.xz
+	source = https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-62.0-patches-01.tar.xz
 	source = https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/firefox/files/firefox-61.0-mozHunspell.patch
 	md5sums = SKIP
 	md5sums = 49c2d3dc354e18ab12c8c4e6f7d68d6b
@@ -74,13 +74,13 @@ pkgbase = firefox-kde-opensuse
 	md5sums = 05bb69d25fb3572c618e3adf1ee7b670
 	md5sums = 6e335a517c68488941340ee1c23f97b0
 	md5sums = d7ce23a18da21c05cd756766e177834f
-	md5sums = 9a9a8cd8da7231e3bfc57132a7863021
-	md5sums = d501f3cf592451a6d377fa748b6967b6
+	md5sums = 35a4fac33f4f3abd0d059e7ee9858617
+	md5sums = 008ee1ff02326a12879ec8856864971e
 	md5sums = 0661e259fe57df87fca791f4aeb78da0
-	md5sums = b3c34d2c275f5373cfcbde17b74d2aa5
+	md5sums = 379c447c7d7c9988738737f92abaf5ee
 	md5sums = fe24f5ea463013bb7f1c12d12dce41b2
 	md5sums = 3fa8bd22d97248de529780f5797178af
-	md5sums = 20f84d63538909f6b069de1b6b10f4b3
+	md5sums = 9f098bf9bf478a36ba00694bb7722fc2
 	md5sums = 13d3ece023495d23f665c78f19b70be8
 
 pkgname = firefox-kde-opensuse
diff --git a/PKGBUILD b/PKGBUILD
index b9c0bab293c3..bd6c9af4ef6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _pgo=true
 
 _pkgname=firefox
 pkgname=$_pkgname-kde-opensuse
-pkgver=61.0.2
+pkgver=62.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('i686' 'x86_64')
@@ -42,7 +42,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'speech-dispatcher: Text-to-Speech')
 provides=("firefox=${pkgver}")
 conflicts=('firefox')
-_patchrev=42510f8eee28
+_patchrev=18f97bd2c2bf
 options=('!emptydirs'  'debug' 'strip')
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
 _repo=https://hg.mozilla.org/mozilla-unified
@@ -61,7 +61,7 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
 	unity-menubar.patch
 	add_missing_pgo_rule.patch
         pgo_fix_missing_kdejs.patch
-        https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-61.0-patches-01.tar.xz
+        https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-62.0-patches-01.tar.xz
         https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/firefox/files/firefox-61.0-mozHunspell.patch
 )
 
@@ -243,11 +243,11 @@ md5sums=('SKIP'
          '05bb69d25fb3572c618e3adf1ee7b670'
          '6e335a517c68488941340ee1c23f97b0'
          'd7ce23a18da21c05cd756766e177834f'
-         '9a9a8cd8da7231e3bfc57132a7863021'
-         'd501f3cf592451a6d377fa748b6967b6'
+         '35a4fac33f4f3abd0d059e7ee9858617'
+         '008ee1ff02326a12879ec8856864971e'
          '0661e259fe57df87fca791f4aeb78da0'
-         'b3c34d2c275f5373cfcbde17b74d2aa5'
+         '379c447c7d7c9988738737f92abaf5ee'
          'fe24f5ea463013bb7f1c12d12dce41b2'
          '3fa8bd22d97248de529780f5797178af'
-         '20f84d63538909f6b069de1b6b10f4b3'
+         '9f098bf9bf478a36ba00694bb7722fc2'
          '13d3ece023495d23f665c78f19b70be8')
diff --git a/unity-menubar.patch b/unity-menubar.patch
index b0924f56a625..915433fa17c6 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -19,13 +19,13 @@ diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/bro
              <menu id="file-menu" label="&fileMenu.label;"
                    accesskey="&fileMenu.accesskey;">
                <menupopup id="menu_FilePopup"
-                          onpopupshowing="updateUserContextUIVisibility();">
+                          onpopupshowing="updateFileMenuUserContextUIVisibility('menu_newUserContext');">
                  <menuitem id="menu_newNavigatorTab"
                            label="&tabCmd.label;"
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -5573,21 +5573,27 @@ function onViewToolbarsPopupShowing(aEve
+@@ -5701,21 +5701,27 @@ function onViewToolbarsPopupShowing(aEve
      if (deadItem.hasAttribute("toolbarId"))
        popup.removeChild(deadItem);
    }
@@ -196,7 +196,7 @@ diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
  #include "mozilla/dom/ipc/IPCBlobInputStreamStorage.h"
  #include "mozilla/dom/U2FTokenManager.h"
  #include "mozilla/dom/PointerEventHandler.h"
- #include "nsHostObjectProtocolHandler.h"
+ #include "mozilla/dom/BlobURLProtocolHandler.h"
  #include "nsThreadManager.h"
  
 +#ifdef MOZ_WIDGET_GTK
@@ -227,16 +227,16 @@ diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
    NS_SetStaticAtomsDone();
  
    StartupJSEnvironment();
+   nsJSContext::EnsureStatics();
  
    nsGlobalWindowInner::Init();
    nsGlobalWindowOuter::Init();
-   Navigator::Init();
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -272,16 +272,19 @@ pref("dom.script_loader.bytecode_cache.e
- // look at: ScriptLoader::ShouldCacheBytecode function.
- pref("dom.script_loader.bytecode_cache.strategy", 0);
+@@ -262,16 +262,19 @@ pref("dom.script_loader.bytecode_cache.s
+ pref("dom.script_loader.binast_encoding.enabled", false);
+ #endif
  
  // Fastback caching - if this pref is negative, then we calculate the number
  // of content viewers to cache based on the amount of available memory.
@@ -282,14 +282,15 @@ diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
    -moz-box-flex: 1000;
  }
  
- toolbarpaletteitem {
-   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem");
- }
+ /********* menu ***********/
  
+ menubar > menu {
+   -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-menubar");
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
+index d0edc29..a2fec84 100644
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -39,10 +39,18 @@
+@@ -39,10 +39,18 @@ UNIFIED_SOURCES += [
      'nsAppShell.cpp',
      'nsBidiKeyboard.cpp',
      'nsColorPicker.cpp',
@@ -308,24 +309,23 @@ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
      'nsNativeThemeGTK.cpp',
      'nsSound.cpp',
      'nsToolkit.cpp',
-@@ -55,6 +63,8 @@
+@@ -55,6 +63,8 @@ UNIFIED_SOURCES += [
  ]
- 
+
  SOURCES += [
 +    'nsMenu.cpp', # conflicts with X11 headers
 +    'nsNativeMenuService.cpp',
      'nsWindow.cpp', # conflicts with X11 headers
  ]
- 
-@@ -125,6 +135,7 @@
- 
+
+@@ -125,6 +135,7 @@ FINAL_LIBRARY = 'xul'
+
  LOCAL_INCLUDES += [
      '/layout/generic',
 +    '/layout/style',
      '/layout/xul',
      '/other-licenses/atk-1.0',
      '/toolkit/xre',
-
 diff --git a/widget/gtk/nsDbusmenu.cpp b/widget/gtk/nsDbusmenu.cpp
 new file mode 100644
 --- /dev/null
@@ -838,7 +838,7 @@ new file mode 100644
 +            continue;
 +        }
 +
-+        AppendChild(Move(child));
++        AppendChild(std::move(child));
 +    }
 +}
 +
@@ -913,7 +913,7 @@ new file mode 100644
 +        EnsureNoPlaceholderItem();
 +    }
 +
-+    nsMenuContainer::InsertChildAfter(Move(aChild), aPrevSibling,
++    nsMenuContainer::InsertChildAfter(std::move(aChild), aPrevSibling,
 +                                      !IsInBatchedUpdate());
 +    StructureMutated();
 +}
@@ -925,7 +925,7 @@ new file mode 100644
 +        EnsureNoPlaceholderItem();
 +    }
 +
-+    nsMenuContainer::AppendChild(Move(aChild), !IsInBatchedUpdate());
++    nsMenuContainer::AppendChild(std::move(aChild), !IsInBatchedUpdate());
 +    StructureMutated();
 +}
 +
@@ -967,7 +967,7 @@ new file mode 100644
 +        UniquePtr<nsMenuObject> child = CreateChild(aChild);
 +
 +        if (child) {
-+            InsertChildAfter(Move(child), aPrevSibling);
++            InsertChildAfter(std::move(child), aPrevSibling);
 +        }
 +    } else {
 +        Build();
@@ -1713,7 +1713,7 @@ new file mode 100644
 +            continue;
 +        }
 +
-+        AppendChild(Move(child));
++        AppendChild(std::move(child));
 +    }
 +}
 +
@@ -1880,7 +1880,7 @@ new file mode 100644
 +        return;
 +    }
 +
-+    InsertChildAfter(Move(child), aPrevSibling);
++    InsertChildAfter(std::move(child), aPrevSibling);
 +}
 +
 +void
@@ -1954,7 +1954,7 @@ new file mode 100644
 +        return nullptr;
 +    }
 +
-+    return Move(menubar);
++    return std::move(menubar);
 +}
 +
 +nsMenuObject::EType
@@ -2235,7 +2235,7 @@ new file mode 100644
 +    }
 +
 +    UniquePtr<nsMenuObject> res = ctor(this, aContent);
-+    return Move(res);
++    return std::move(res);
 +}
 +
 +size_t
@@ -2298,7 +2298,7 @@ new file mode 100644
 +                                                 index));
 +    }
 +
-+    MOZ_ALWAYS_TRUE(mChildren.InsertElementAt(index, Move(aChild)));
++    MOZ_ALWAYS_TRUE(mChildren.InsertElementAt(index, std::move(aChild)));
 +}
 +
 +void
@@ -2312,7 +2312,7 @@ new file mode 100644
 +                                           aChild->GetNativeData()));
 +    }
 +
-+    MOZ_ALWAYS_TRUE(mChildren.AppendElement(Move(aChild)));
++    MOZ_ALWAYS_TRUE(mChildren.AppendElement(std::move(aChild)));
 +}
 +
 +bool
@@ -5334,10 +5334,10 @@ new file mode 100644
 +    NS_ENSURE_ARG(aParent);
 +    NS_ENSURE_ARG(aMenuBarNode);
 +
-+    if (aMenuBarNode->AsElement()->AttrValueIs(kNameSpaceID_None,
-+                                               nsNativeMenuAtoms::_moz_menubarkeeplocal,
-+                                               nsGkAtoms::_true,
-+                                               eCaseMatters)) {
++    if (aMenuBarNode->AttrValueIs(kNameSpaceID_None,
++                                  nsNativeMenuAtoms::_moz_menubarkeeplocal,
++                                  nsGkAtoms::_true,
++                                  eCaseMatters)) {
 +        return NS_OK;
 +    }
 +
@@ -5358,7 +5358,7 @@ new file mode 100644
 +    mMenuBars.AppendElement(menubar.get());
 +    RegisterNativeMenuBar(menubar.get());
 +
-+    static_cast<nsWindow *>(aParent)->SetMenuBar(Move(menubar));
++    static_cast<nsWindow *>(aParent)->SetMenuBar(std::move(menubar));
 +
 +    return NS_OK;
 +}
@@ -5497,7 +5497,7 @@ new file mode 100644
 diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp
 --- a/widget/gtk/nsWidgetFactory.cpp
 +++ b/widget/gtk/nsWidgetFactory.cpp
-@@ -43,16 +43,18 @@
+@@ -44,16 +44,18 @@
  #include "nsImageToPixbuf.h"
  #include "nsPrintDialogGTK.h"
  
@@ -5516,7 +5516,7 @@ diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp
  #include "mozilla/gfx/2D.h"
  #include "mozilla/widget/ScreenManager.h"
  #include <gtk/gtk.h>
-@@ -111,16 +113,19 @@ nsNativeThemeGTKConstructor(nsISupports 
+@@ -112,16 +114,19 @@ nsNativeThemeGTKConstructor(nsISupports 
  namespace mozilla {
  namespace widget {
  // This constructor should really be shared with all platforms.
@@ -5536,7 +5536,7 @@ diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp
  NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintDialogServiceGTK, Init)
  #endif
  
-@@ -224,16 +229,17 @@ NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID)
+@@ -225,16 +230,17 @@ NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID)
  NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID);
  NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID);
  #endif
@@ -5554,7 +5554,7 @@ diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp
      { &kNS_APPSHELL_CID, false, nullptr, nsAppShellConstructor, Module::ALLOW_IN_GPU_PROCESS },
      { &kNS_COLORPICKER_CID, false, nullptr, nsColorPickerConstructor, Module::MAIN_PROCESS_ONLY },
      { &kNS_FILEPICKER_CID, false, nullptr, nsFilePickerConstructor, Module::MAIN_PROCESS_ONLY },
-@@ -260,16 +266,17 @@ static const mozilla::Module::CIDEntry k
+@@ -261,16 +267,17 @@ static const mozilla::Module::CIDEntry k
      { &kNS_DEVICE_CONTEXT_SPEC_CID, false, nullptr, nsDeviceContextSpecGTKConstructor },
      { &kNS_PRINTDIALOGSERVICE_CID, false, nullptr, nsPrintDialogServiceGTKConstructor },
  #endif
@@ -5572,7 +5572,7 @@ diff --git a/widget/gtk/nsWidgetFactory.cpp b/widget/gtk/nsWidgetFactory.cpp
      { "@mozilla.org/widgets/child_window/gtk;1", &kNS_CHILD_CID },
      { "@mozilla.org/widget/appshell/gtk;1", &kNS_APPSHELL_CID, Module::ALLOW_IN_GPU_PROCESS },
      { "@mozilla.org/colorpicker;1", &kNS_COLORPICKER_CID, Module::MAIN_PROCESS_ONLY },
-@@ -298,16 +305,17 @@ static const mozilla::Module::ContractID
+@@ -299,16 +306,17 @@ static const mozilla::Module::ContractID
      { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID },
      { NS_PRINTDIALOGSERVICE_CONTRACTID, &kNS_PRINTDIALOGSERVICE_CID },
  #endif
@@ -5611,7 +5611,7 @@ diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
  #include "nsGtkUtils.h"
  #include "nsIObserverService.h"
  #include "mozilla/layers/LayersTypes.h"
-@@ -5219,16 +5220,21 @@ nsWindow::SetWindowDecoration(nsBorderSt
+@@ -5246,16 +5247,21 @@ nsWindow::SetWindowDecoration(nsBorderSt
  }
  
  void
@@ -5622,7 +5622,7 @@ diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
  
 +void
 +nsWindow::SetMenuBar(UniquePtr<nsMenuBar> aMenuBar) {
-+    mMenuBar = mozilla::Move(aMenuBar);
++    mMenuBar = std::move(aMenuBar);
 +}
 +
  bool
@@ -5655,7 +5655,7 @@ diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
  #include "Units.h"
  
  extern mozilla::LazyLogModule gWidgetLog;
-@@ -159,16 +161,18 @@ public:
+@@ -173,16 +175,18 @@ public:
                                               uint16_t aDuration,
                                               nsISupports* aData,
                                               nsIRunnable* aCallback) override;
@@ -5674,7 +5674,7 @@ diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
  
      // utility method, -1 if no change should be made, otherwise returns a
      // value that can be passed to gdk_window_set_decorations
-@@ -632,11 +636,13 @@ private:
+@@ -646,11 +650,13 @@ private:
       * all windows in a hierarchy.  If the children are released after the top
       * level window is released, the children still have a valid pointer,
       * however, IME doesn't work at that time.
@@ -5717,7 +5717,7 @@ diff --git a/widget/moz.build b/widget/moz.build
 diff --git a/xpfe/appshell/nsWebShellWindow.cpp b/xpfe/appshell/nsWebShellWindow.cpp
 --- a/xpfe/appshell/nsWebShellWindow.cpp
 +++ b/xpfe/appshell/nsWebShellWindow.cpp
-@@ -62,17 +62,17 @@
+@@ -61,17 +61,17 @@
  #include "mozilla/DebugOnly.h"
  #include "mozilla/EventDispatcher.h"
  #include "mozilla/MouseEvents.h"