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 680 be770d3cbc02
parent 659 fa96cf6ffd14
child 686 ab25aac2aa83 
--- a/mozilla-kde.patch	Sat Oct 05 22:39:27 2013 +0200
+++ b/mozilla-kde.patch	Thu Oct 24 20:13:14 2013 +0200
@@ -26,7 +26,7 @@
 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
 --- a/modules/libpref/src/Preferences.cpp
 +++ b/modules/libpref/src/Preferences.cpp
-@@ -23,16 +23,17 @@
+@@ -24,16 +24,17 @@
  #include "nsIStringEnumerator.h"
  #include "nsIZipReader.h"
  #include "nsPrefBranch.h"
@@ -44,7 +44,7 @@
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -972,16 +973,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -973,16 +974,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -79,7 +79,7 @@
      return NS_OK;
  
    bool hasMore;
-@@ -997,17 +1016,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -998,17 +1017,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -98,7 +98,7 @@
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1101,28 +1120,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1102,28 +1121,40 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -184,18 +184,22 @@
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
-@@ -23,9 +23,11 @@ ifndef MOZ_SUITE
- DISABLED_EXTRA_COMPONENTS = \
-   nsDownloadManagerUI.js \
-   nsDownloadManagerUI.manifest \
-   $(NULL)
- endif
+@@ -11,13 +11,15 @@ VPATH = @srcdir@
+ include $(DEPTH)/config/autoconf.mk
+ 
+ LIBRARY_NAME = download_s
+ LIBXUL_LIBRARY = 1
+ FAIL_ON_WARNINGS = 1
  
  include $(topsrcdir)/config/rules.mk
  
-+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 +
- CXXFLAGS += $(TK_CFLAGS)
+ CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
+ 
+ LOCAL_INCLUDES += \
+   -I$(srcdir)/../protobuf \
++  -I$(topsrcdir)/toolkit/xre \
+   $(NULL)
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -2624,12 +2628,12 @@
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -86,9 +86,10 @@ EXTRA_COMPONENTS = \
- # we don't want the shared lib, but we want to force the creation of a static lib.
- FORCE_STATIC_LIB = 1
+@@ -77,9 +77,10 @@ endif
+ endif
+ 
  include $(topsrcdir)/config/config.mk
+ include $(topsrcdir)/config/rules.mk
  include $(topsrcdir)/ipc/chromium/chromium-config.mk
- include $(topsrcdir)/config/rules.mk
  
  ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
  CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
@@ -3083,7 +3087,7 @@
 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
 --- a/widget/gtk2/Makefile.in
 +++ b/widget/gtk2/Makefile.in
-@@ -67,11 +67,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -68,11 +68,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
  
  INCLUDES	+= \
  		-I$(srcdir)/../xpwidgets \
@@ -3101,7 +3105,7 @@
 diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 --- a/widget/gtk2/nsFilePicker.cpp
 +++ b/widget/gtk2/nsFilePicker.cpp
-@@ -1,31 +1,33 @@
+@@ -1,32 +1,34 @@
  /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
  /* This Source Code Form is subject to the terms of the Mozilla Public
   * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3112,6 +3116,7 @@
  #include <gtk/gtk.h>
 +#include <gdk/gdkx.h>
  
+ #include "nsGtkUtils.h"
  #include "nsIFileURL.h"
  #include "nsIURI.h"
  #include "nsIWidget.h"
@@ -3135,7 +3140,7 @@
  using namespace mozilla;
  
  #define MAX_PREVIEW_SIZE 180
-@@ -242,17 +244,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -232,17 +234,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3156,7 +3161,7 @@
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -366,16 +370,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -356,16 +360,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3189,7 +3194,7 @@
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -567,8 +587,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -553,8 +573,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
@@ -3449,13 +3454,13 @@
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -28,9 +28,10 @@ LOCAL_INCLUDES	= \
- FORCE_STATIC_LIB = 1
+@@ -23,9 +23,10 @@ LOCAL_INCLUDES	= \
+ 	-I$(topsrcdir)/chrome/src \
+ 	-I$(topsrcdir)/modules/libjar \
+ 	$(NULL)
  
  include $(topsrcdir)/config/rules.mk
  
- DEFINES	+= -D_IMPL_NS_COM
- 
  ifdef MOZ_WIDGET_GTK
  CXXFLAGS        += $(TK_CFLAGS)
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
@@ -3594,8 +3599,8 @@
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -43,17 +43,17 @@ include $(topsrcdir)/ipc/chromium/chromi
- DEFINES		+= -D_IMPL_NS_COM
+@@ -26,17 +26,17 @@ include $(topsrcdir)/config/rules.mk
+ include $(topsrcdir)/ipc/chromium/chromium-config.mk
  
  ifeq ($(OS_ARCH),Linux)
  ifneq (,$(findstring lib64,$(libdir)))
mozilla