upkg

- new upstream release
- update unity-menubar patch for firefox 66
- update KDE patches for 66
- add missing nasm, python2-psutils, python2-setuptools to makedepends
- add pulseaudio to optdepends
- add patch to fix build witn rust >= 1.33
- add xz to makedepends as the patch is to huge for the aur

4 files changed, 75 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32df942d0e0f..88d05baecd60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Mar  8 10:02:18 UTC 2019
+# Sat Mar 23 19:14:27 UTC 2019
 pkgbase = firefox-kde-opensuse
 	pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
-	pkgver = 65.0.2
+	pkgver = 66.0
 	pkgrel = 1
 	url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
 	arch = i686
@@ -13,7 +13,7 @@ pkgbase = firefox-kde-opensuse
 	makedepends = unzip
 	makedepends = zip
 	makedepends = diffutils
-	makedepends = python
+	makedepends = python2-setuptools
 	makedepends = yasm
 	makedepends = mesa
 	makedepends = imake
@@ -29,6 +29,10 @@ pkgbase = firefox-kde-opensuse
 	makedepends = gtk2
 	makedepends = nodejs
 	makedepends = cbindgen
+	makedepends = nasm
+	makedepends = python
+	makedepends = python2-psutil
+	makedepends = xz
 	depends = mozilla-common
 	depends = libxt
 	depends = startup-notification
@@ -48,18 +52,19 @@ pkgbase = firefox-kde-opensuse
 	depends = gtk3
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = speech-dispatcher: Text-to-Speech
-	provides = firefox=65.0.2
+	optdepends = pulseaudio: Audio support
+	provides = firefox=66.0
 	conflicts = firefox
 	options = !emptydirs
-	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_65_0_2_RELEASE
+	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_66_0_RELEASE
 	source = mozconfig
 	source = firefox.desktop
 	source = vendor.js
 	source = kde.js
-	source = firefox-branded-icons-87f893cf45b9.patch::http://www.rosenauer.org/hg/mozilla/raw-file/87f893cf45b9/firefox-branded-icons.patch
-	source = firefox-kde-87f893cf45b9.patch::http://www.rosenauer.org/hg/mozilla/raw-file/87f893cf45b9/firefox-kde.patch
-	source = mozilla-kde-87f893cf45b9.patch::http://www.rosenauer.org/hg/mozilla/raw-file/87f893cf45b9/mozilla-kde.patch
-	source = mozilla-nongnome-proxies-87f893cf45b9.patch::http://www.rosenauer.org/hg/mozilla/raw-file/87f893cf45b9/mozilla-nongnome-proxies.patch
+	source = firefox-branded-icons-eca1c1f2fe50.patch::http://www.rosenauer.org/hg/mozilla/raw-file/eca1c1f2fe50/firefox-branded-icons.patch
+	source = firefox-kde-eca1c1f2fe50.patch::http://www.rosenauer.org/hg/mozilla/raw-file/eca1c1f2fe50/firefox-kde.patch
+	source = mozilla-kde-eca1c1f2fe50.patch::http://www.rosenauer.org/hg/mozilla/raw-file/eca1c1f2fe50/mozilla-kde.patch
+	source = mozilla-nongnome-proxies-eca1c1f2fe50.patch::http://www.rosenauer.org/hg/mozilla/raw-file/eca1c1f2fe50/mozilla-nongnome-proxies.patch
 	source = unity-menubar.patch
 	source = add_missing_pgo_rule.patch
 	source = pgo_fix_missing_kdejs.patch
@@ -68,16 +73,17 @@ pkgbase = firefox-kde-opensuse
 	source = mozilla-1516803.patch
 	source = mozilla-1516081.patch
 	source = pgo.patch
+	source = 0001-bz-1468911.patch.xz
 	md5sums = SKIP
 	md5sums = 7a93c5b10defc17661cb13138d38b6bc
 	md5sums = 14e0f6237a79b85e60256f4808163160
 	md5sums = 5cee310a9040ccc5abcf29742b84aeb8
 	md5sums = 05bb69d25fb3572c618e3adf1ee7b670
 	md5sums = d7ce23a18da21c05cd756766e177834f
-	md5sums = bf2f398aac1ae3d29ae6477325c50c0f
-	md5sums = b2fef35fb6a6a019b597dc559a1d0e12
+	md5sums = acb2d5930350fb287709283103cfffe2
+	md5sums = 7dbeb468613520beba5de17471487e6c
 	md5sums = f1c5db18b8910b80f1933af1f4fe7c2b
-	md5sums = 51d059491a3aba215b6cea959e9c5d05
+	md5sums = 97cb13d3dfb6222d09070d2c22019deb
 	md5sums = fe24f5ea463013bb7f1c12d12dce41b2
 	md5sums = 3fa8bd22d97248de529780f5797178af
 	md5sums = 554514bf00a7927a85280f19e52a55fb
@@ -85,6 +91,7 @@ pkgbase = firefox-kde-opensuse
 	md5sums = becf6bf9ceb6008401832c855ccadff9
 	md5sums = 79d27c8896913c7d87b148240995ab69
 	md5sums = f867ae41a722630cc5567e2dcc51676d
+	md5sums = 47a4608970217485250b7e9bc59609e3
 
 pkgname = firefox-kde-opensuse
 
diff --git a/0001-bz-1468911.patch.xz b/0001-bz-1468911.patch.xz
new file mode 100644
index 000000000000..7bffaac360cd
--- /dev/null
+++ b/0001-bz-1468911.patch.xz
diff --git a/PKGBUILD b/PKGBUILD
index fbb0ae510df6..2eeee5232a75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ _pgo=true
 
 _pkgname=firefox
 pkgname=$_pkgname-kde-opensuse
-pkgver=65.0.2
+pkgver=66.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('i686' 'x86_64')
@@ -27,16 +27,17 @@ depends=('mozilla-common' 'libxt' 'startup-notification' 'mime-types'
 	 'libvpx' 'icu'  'libevent' 'nss>=3.28.3' 'nspr>=4.10.6' 'hunspell'
 	 'sqlite' 'libnotify' 'kmozillahelper' 'ffmpeg' 'gtk3')
 
-makedepends=('unzip' 'zip' 'diffutils' 'python' 'yasm' 'mesa' 'imake'
+makedepends=('unzip' 'zip' 'diffutils' 'python2-setuptools' 'yasm' 'mesa' 'imake'
              'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'rust'
              'cargo' 'mercurial' 'llvm' 'clang'
-             'gtk2' 'nodejs' 'cbindgen')
+             'gtk2' 'nodejs' 'cbindgen' 'nasm' 'python' 'python2-psutil' 'xz')
 
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'speech-dispatcher: Text-to-Speech')
+            'speech-dispatcher: Text-to-Speech'
+            'pulseaudio: Audio support')
 provides=("firefox=${pkgver}")
 conflicts=('firefox')
-_patchrev=87f893cf45b9
+_patchrev=eca1c1f2fe50
 options=('!emptydirs')
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
 _repo=https://hg.mozilla.org/mozilla-unified
@@ -60,6 +61,8 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
         mozilla-1516803.patch
         mozilla-1516081.patch
         pgo.patch
+        # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
+        0001-bz-1468911.patch.xz
 )
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -83,10 +86,10 @@ prepare() {
   cp "$srcdir/mozconfig" .mozconfig
 
   echo -n "$_google_api_key" >google-api-key
-  echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
+  echo "ac_add_options --with-google-location-service-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 
   echo -n "$_google_default_client_id $_google_default_client_secret" >google-oauth-api-key
-  echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-oauth-api-key\"" >>.mozconfig
+  echo "ac_add_options --with-google-safebrowsing-api-keyfile=\"$PWD/google-oauth-api-key\"" >>.mozconfig
 
   echo -n "$_mozilla_api_key" >mozilla-api-key
   echo "ac_add_options --with-mozilla-api-keyfile=\"$PWD/mozilla-api-key\"" >>.mozconfig
@@ -104,6 +107,11 @@ prepare() {
   patch -Np1 -i "$srcdir"/2000_system_harfbuzz_support.patch
   patch -Np1 -i "$srcdir"/2001_system_graphite2_support.patch
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
+  # patch -Np1 -i ../0001-bz-1468911.patch patch is to large for the AUR
+  xcat "$srcdir"/0001-bz-1468911.patch.xz | patch -Np1
+
+  
   if [[ $_pgo ]] ; then
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1516803
     patch -Np1 -i  "$srcdir"/mozilla-1516803.patch
@@ -203,14 +211,15 @@ md5sums=('SKIP'
          '5cee310a9040ccc5abcf29742b84aeb8'
          '05bb69d25fb3572c618e3adf1ee7b670'
          'd7ce23a18da21c05cd756766e177834f'
-         'bf2f398aac1ae3d29ae6477325c50c0f'
-         'b2fef35fb6a6a019b597dc559a1d0e12'
+         'acb2d5930350fb287709283103cfffe2'
+         '7dbeb468613520beba5de17471487e6c'
          'f1c5db18b8910b80f1933af1f4fe7c2b'
-         '51d059491a3aba215b6cea959e9c5d05'
+         '97cb13d3dfb6222d09070d2c22019deb'
          'fe24f5ea463013bb7f1c12d12dce41b2'
          '3fa8bd22d97248de529780f5797178af'
          '554514bf00a7927a85280f19e52a55fb'
          '5b0d39aebb1ce84f89bda300320b851f'
          'becf6bf9ceb6008401832c855ccadff9'
          '79d27c8896913c7d87b148240995ab69'
-         'f867ae41a722630cc5567e2dcc51676d')
+         'f867ae41a722630cc5567e2dcc51676d'
+         '47a4608970217485250b7e9bc59609e3')
diff --git a/unity-menubar.patch b/unity-menubar.patch
index d9c9697f0ecd..9147edcbc985 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -14,7 +14,7 @@
              <menu id="file-menu" label="&fileMenu.label;"
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -5568,11 +5568,17 @@ function onViewToolbarsPopupShowing(aEve
+@@ -5595,11 +5595,17 @@ function onViewToolbarsPopupShowing(aEve
  
    let toolbarNodes = gNavToolbox.querySelectorAll("toolbar");
  
@@ -70,8 +70,8 @@
  nsINode* XULPopupElement::GetTriggerNode() const {
 --- a/dom/xul/moz.build
 +++ b/dom/xul/moz.build
-@@ -75,6 +75,11 @@ LOCAL_INCLUDES += [
-     '/layout/xul',
+@@ -76,6 +76,11 @@ LOCAL_INCLUDES += [
+     '/layout/xul/tree',
  ]
  
 +if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
@@ -97,7 +97,7 @@
      LOCAL_INCLUDES += [
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -271,6 +271,9 @@ pref("dom.window.event.enabled", false);
+@@ -275,6 +275,9 @@ pref("dom.window.event.enabled", true);
  pref("browser.sessionhistory.max_total_viewers", -1);
  
  pref("ui.use_native_colors", true);
@@ -109,7 +109,7 @@
  // Pop up context menu on mouseup instead of mousedown, if that's the OS default.
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
-@@ -254,6 +254,18 @@ toolbar[type="menubar"] {
+@@ -250,6 +250,18 @@ toolbar[type="menubar"] {
  }
  %endif
  
@@ -334,6 +334,7 @@
 +
 +#define _IMPL_NS_LAYOUT
 +
++#include "mozilla/dom/Document.h"
 +#include "mozilla/dom/Element.h"
 +#include "mozilla/Assertions.h"
 +#include "mozilla/ComputedStyle.h"
@@ -351,7 +352,6 @@
 +#include "nsGtkUtils.h"
 +#include "nsAtom.h"
 +#include "nsIContent.h"
-+#include "nsIDocument.h"
 +#include "nsIPresShell.h"
 +#include "nsIRunnable.h"
 +#include "nsITimer.h"
@@ -445,7 +445,7 @@
 +static void
 +AttachXBLBindings(nsIContent *aContent)
 +{
-+    nsIDocument *doc = aContent->OwnerDoc();
++    dom::Document *doc = aContent->OwnerDoc();
 +    nsIPresShell *shell = doc->GetShell();
 +    if (!shell) {
 +        return;
@@ -1310,6 +1310,7 @@
 +
 +#include "mozilla/Assertions.h"
 +#include "mozilla/DebugOnly.h"
++#include "mozilla/dom/Document.h"
 +#include "mozilla/dom/Element.h"
 +#include "mozilla/dom/Event.h"
 +#include "mozilla/dom/KeyboardEvent.h"
@@ -1318,7 +1319,6 @@
 +#include "mozilla/Preferences.h"
 +#include "nsAutoPtr.h"
 +#include "nsContentUtils.h"
-+#include "nsIDocument.h"
 +#include "nsIDOMEventListener.h"
 +#include "nsIRunnable.h"
 +#include "nsIWidget.h"
@@ -1876,12 +1876,12 @@
 +#include <gtk/gtk.h>
 +
 +class nsIContent;
-+class nsIDocument;
 +class nsIWidget;
 +class nsMenuBarDocEventListener;
 +
 +namespace mozilla {
 +namespace dom {
++class Document;
 +class KeyboardEvent;
 +}
 +}
@@ -1956,7 +1956,7 @@
 +
 +    GtkWidget *mTopLevel;
 +    DbusmenuServer *mServer;
-+    nsCOMPtr<nsIDocument> mDocument;
++    nsCOMPtr<mozilla::dom::Document> mDocument;
 +    RefPtr<DocEventListener> mEventListener;
 +
 +    uint32_t mAccessKey;
@@ -2225,6 +2225,7 @@
 +#include "mozilla/ArrayUtils.h"
 +#include "mozilla/Assertions.h"
 +#include "mozilla/ComputedStyle.h"
++#include "mozilla/dom/Document.h"
 +#include "mozilla/dom/Element.h"
 +#include "mozilla/dom/KeyboardEventBinding.h"
 +#include "mozilla/dom/XULCommandEvent.h"
@@ -2238,7 +2239,6 @@
 +#include "nsGlobalWindowInner.h"
 +#include "nsGtkUtils.h"
 +#include "nsIContent.h"
-+#include "nsIDocument.h"
 +#include "nsIRunnable.h"
 +#include "nsQueryObject.h"
 +#include "nsReadableUtils.h"
@@ -2569,7 +2569,7 @@
 +                                            true);
 +    }
 +
-+    nsIDocument *doc = ContentNode()->OwnerDoc();
++    dom::Document *doc = ContentNode()->OwnerDoc();
 +    ErrorResult rv;
 +    RefPtr<dom::Event> event =
 +        doc->CreateEvent(NS_LITERAL_STRING("xulcommandevent"),
@@ -2669,7 +2669,7 @@
 +void
 +nsMenuItem::UpdateAccel()
 +{
-+    nsIDocument *doc = ContentNode()->GetUncomposedDoc();
++    dom::Document *doc = ContentNode()->GetUncomposedDoc();
 +    if (doc) {
 +        nsCOMPtr<nsIContent> oldKeyContent;
 +        oldKeyContent.swap(mKeyContent);
@@ -2826,7 +2826,7 @@
 +void
 +nsMenuItem::UpdateContentAttributes()
 +{
-+    nsIDocument *doc = ContentNode()->GetUncomposedDoc();
++    dom::Document *doc = ContentNode()->GetUncomposedDoc();
 +    if (!doc) {
 +        return;
 +    }
@@ -3081,6 +3081,7 @@
 +#include "mozilla/ArrayUtils.h"
 +#include "mozilla/Assertions.h"
 +#include "mozilla/ComputedStyle.h"
++#include "mozilla/dom/Document.h"
 +#include "mozilla/dom/Element.h"
 +#include "mozilla/Preferences.h"
 +#include "nsAttrValue.h"
@@ -3089,7 +3090,6 @@
 +#include "nsGkAtoms.h"
 +#include "nsIContent.h"
 +#include "nsIContentPolicy.h"
-+#include "nsIDocument.h"
 +#include "nsILoadGroup.h"
 +#include "nsImageToPixbuf.h"
 +#include "nsIPresShell.h"
@@ -3239,7 +3239,7 @@
 +void
 +nsMenuObjectIconLoader::LoadIcon(ComputedStyle *aComputedStyle)
 +{
-+    nsIDocument *doc = mOwner->ContentNode()->OwnerDoc();
++    dom::Document *doc = mOwner->ContentNode()->OwnerDoc();
 +
 +    nsCOMPtr<nsIURI> uri;
 +    nsIntRect imageRect;
@@ -4044,11 +4044,11 @@
 +
 +#include "mozilla/Assertions.h"
 +#include "mozilla/DebugOnly.h"
++#include "mozilla/dom/Document.h"
 +#include "mozilla/dom/Element.h"
 +#include "nsContentUtils.h"
 +#include "nsAtom.h"
 +#include "nsIContent.h"
-+#include "nsIDocument.h"
 +
 +#include "nsMenuContainer.h"
 +
@@ -4387,7 +4387,7 @@
 +}
 --- /dev/null
 +++ b/widget/gtk/nsNativeMenuDocListener.h
-@@ -0,0 +1,152 @@
+@@ -0,0 +1,157 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -4408,9 +4408,14 @@
 +
 +class nsAtom;
 +class nsIContent;
-+class nsIDocument;
 +class nsNativeMenuChangeObserver;
 +
++namespace mozilla {
++namespace dom {
++class Document;
++}
++}
++
 +/*
 + * This class keeps a mapping of content nodes to observers and forwards DOM
 + * mutations to these. There is exactly one of these for every menubar.
@@ -4504,7 +4509,7 @@
 +    static void RemoveUpdateBlocker();
 +
 +    nsCOMPtr<nsIContent> mRootNode;
-+    nsIDocument *mDocument;
++    mozilla::dom::Document *mDocument;
 +    nsIContent *mLastSource;
 +    nsNativeMenuChangeObserver *mLastTarget;
 +    nsTArray<nsAutoPtr<MutationRecord> > mPendingMutations;
@@ -5138,7 +5143,7 @@
 --- a/widget/gtk/nsWidgetFactory.cpp
 +++ b/widget/gtk/nsWidgetFactory.cpp
 @@ -48,6 +48,8 @@
- #include "GfxInfoX11.h"
+ #  include "GfxInfoX11.h"
  #endif
  
 +#include "nsNativeMenuService.h"
@@ -5182,7 +5187,7 @@
  static void nsWidgetGtk2ModuleDtor() {
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -71,6 +71,7 @@
+@@ -70,6 +70,7 @@
  
  #include "mozilla/Assertions.h"
  #include "mozilla/Likely.h"
@@ -5190,7 +5195,7 @@
  #include "mozilla/Preferences.h"
  #include "nsIPrefService.h"
  #include "nsIGConfService.h"
-@@ -4815,6 +4816,10 @@ void nsWindow::HideWindowChrome(bool aSh
+@@ -4765,6 +4766,10 @@ void nsWindow::HideWindowChrome(bool aSh
    SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle);
  }
  
@@ -5221,7 +5226,7 @@
    /**
     * GetLastUserInputTime returns a timestamp for the most recent user input
     * event.  This is intended for pointer grab requests (including drags).
-@@ -644,6 +648,8 @@ class nsWindow final : public nsBaseWidg
+@@ -616,6 +620,8 @@ class nsWindow final : public nsBaseWidg
  
    mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
    static CSDSupportLevel sCSDSupportLevel;
@@ -5232,9 +5237,9 @@
  #endif /* __nsWindow_h__ */
 --- a/widget/moz.build
 +++ b/widget/moz.build
-@@ -65,9 +65,9 @@ elif toolkit == 'cocoa':
-         'nsISystemStatusBar.idl',
-         'nsITaskbarProgress.idl',
+@@ -68,9 +68,9 @@ elif toolkit == 'cocoa':
+         'nsITouchBarInput.idl',
+         'nsITouchBarUpdater.idl',
      ]
 -    EXPORTS += [
 -        'nsINativeMenuService.h',
@@ -5247,14 +5252,14 @@
  
 --- a/xpfe/appshell/nsWebShellWindow.cpp
 +++ b/xpfe/appshell/nsWebShellWindow.cpp
-@@ -68,7 +68,7 @@
+@@ -70,7 +70,7 @@
  
  #include "gfxPlatform.h"
  
 -#ifdef XP_MACOSX
 +#if defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK)
- #include "nsINativeMenuService.h"
- #define USE_NATIVE_MENUS
+ #  include "nsINativeMenuService.h"
+ #  define USE_NATIVE_MENUS
  #endif
 --- /dev/null
 +++ b/xpcom/ds/NativeMenuAtoms.py
@@ -5278,7 +5283,7 @@
  import sys
  
  # Static atom definitions, used to generate nsGkAtomList.h.
-@@ -2391,7 +2392,7 @@ STATIC_ATOMS = [
+@@ -2464,7 +2465,7 @@ STATIC_ATOMS = [
      InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"),
      InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"),
      # END ATOMS