mozilla-kde.patch
changeset 952 8094e6bba260
parent 944 ce8a98f8d8d7
child 955 55662cbdb950
--- a/mozilla-kde.patch	Sat Mar 18 11:18:01 2017 +0100
+++ b/mozilla-kde.patch	Sat Mar 18 11:29:43 2017 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  5c8ae59424f5318bf7a387257771bf95d3893063
+# Parent  420c86af3acf187f3f0e4d2fd061eb6221bb654c
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -187,8 +187,8 @@
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/toolkit/components/downloads/moz.build
 +++ b/toolkit/components/downloads/moz.build
-@@ -57,16 +57,17 @@ if not CONFIG['MOZ_SUITE']:
-         'nsDownloadManagerUI.manifest',
+@@ -49,16 +49,17 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+         'nsDownloadScanner.cpp',
      ]
  
  FINAL_LIBRARY = 'xul'
@@ -229,7 +229,7 @@
  #include "FennecJNIWrappers.h"
  #endif
  
-@@ -2723,16 +2727,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2724,16 +2728,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -255,7 +255,7 @@
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2764,16 +2777,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2765,16 +2778,17 @@ nsDownload::SetState(DownloadState aStat
                    message, !removeWhenDone,
                    mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
                    mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
@@ -276,10 +276,10 @@
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -71,29 +71,33 @@ toolkit.jar:
-    content/global/bindings/button.xml          (widgets/button.xml)
-    content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
+@@ -74,29 +74,33 @@ toolkit.jar:
     content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
+    content/global/bindings/datekeeper.js       (widgets/datekeeper.js)
+    content/global/bindings/datepicker.js       (widgets/datepicker.js)
     content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
     content/global/bindings/datetimepopup.xml   (widgets/datetimepopup.xml)
     content/global/bindings/datetimebox.xml     (widgets/datetimebox.xml)
@@ -310,14 +310,14 @@
     content/global/bindings/scale.xml           (widgets/scale.xml)
     content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
     content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
-@@ -113,9 +117,9 @@ toolkit.jar:
+@@ -114,9 +118,9 @@ toolkit.jar:
+ *  content/global/bindings/tree.xml            (widgets/tree.xml)
+    content/global/bindings/videocontrols.xml   (widgets/videocontrols.xml)
     content/global/bindings/videocontrols.css   (widgets/videocontrols.css)
  *  content/global/bindings/wizard.xml          (widgets/wizard.xml)
  #ifdef XP_MACOSX
     content/global/macWindowMenu.js
  #endif
-    content/global/svg/svgBindings.xml          (/layout/svg/resources/content/svgBindings.xml)
-    content/global/gmp-sources/eme-adobe.json   (gmp-sources/eme-adobe.json)
     content/global/gmp-sources/openh264.json    (gmp-sources/openh264.json)
 -   content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
 \ No newline at end of file
@@ -2408,8 +2408,8 @@
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -40,17 +40,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
-         'updaterfileutils_osx.mm',
+@@ -53,17 +53,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+         '../components/printingui/mac',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
      UNIFIED_SOURCES += [
@@ -3790,7 +3790,7 @@
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul'
+@@ -43,12 +43,13 @@ FINAL_LIBRARY = 'xul'
  LOCAL_INCLUDES += [
      '!..',
      '../base',
@@ -3825,7 +3825,7 @@
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1949,42 +1950,52 @@ nsLocalFile::SetPersistentDescriptor(con
    return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3884,7 +3884,7 @@
      return rv;
    }
    return NS_ERROR_FAILURE;
-@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
+@@ -1992,16 +2003,22 @@ nsLocalFile::Reveal()
    return NS_ERROR_FAILURE;
  #endif
  }