Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-kde.patch
changeset 889 de3a92aed259
parent 885 ee3c462047d5
child 893 86f72f1e98a4 
--- a/mozilla-kde.patch	Sun Dec 06 22:23:18 2015 +0100
+++ b/mozilla-kde.patch	Mon Dec 14 00:04:31 2015 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  21f164ba2522a31ab9cfb4766acff17526183f8e
+# Parent  1e6ab61ae64f601da61197f34ad145f54a400b1f
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -40,7 +40,7 @@
 +#include "nsKDEUtils.h"
  
  #include "nsQuickSort.h"
- #include "pldhash.h"
+ #include "PLDHashTable.h"
  
  #include "prefapi.h"
  #include "prefread.h"
@@ -184,11 +184,11 @@
 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
-@@ -67,15 +67,16 @@ if not CONFIG['MOZ_SUITE']:
+@@ -65,15 +65,16 @@ if not CONFIG['MOZ_SUITE']:
+         'nsDownloadManagerUI.js',
+         'nsDownloadManagerUI.manifest',
      ]
  
- FAIL_ON_WARNINGS = True
- 
  FINAL_LIBRARY = 'xul'
  
  LOCAL_INCLUDES += [
@@ -273,8 +273,8 @@
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -60,29 +60,33 @@ toolkit.jar:
-    content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
+@@ -63,29 +63,33 @@ toolkit.jar:
+    content/global/viewZoomOverlay.js
  *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
     content/global/bindings/browser.xml         (widgets/browser.xml)
     content/global/bindings/button.xml          (widgets/button.xml)
@@ -2717,7 +2717,7 @@
          'android/nsExternalSharingAppService.cpp',
          'android/nsExternalURLHandlerService.cpp',
          'android/nsMIMEInfoAndroid.cpp',
-@@ -123,16 +125,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -121,16 +123,17 @@ include('/ipc/chromium/chromium-config.m
  
  FINAL_LIBRARY = 'xul'
  
@@ -3153,7 +3153,7 @@
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -80,16 +80,17 @@ else:
+@@ -81,16 +81,17 @@ else:
  include('/ipc/chromium/chromium-config.mozbuild')
  
  FINAL_LIBRARY = 'xul'
@@ -3661,7 +3661,7 @@
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -46,12 +46,13 @@ FINAL_LIBRARY = 'xul'
+@@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul'
  GENERATED_INCLUDES += ['..']
  LOCAL_INCLUDES += [
      '../base',
mozilla