Mercurial Mercurial > hg > mozilla / comparison
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
branchfirefox48
changeset 929 9fc2ebe6d7f1
parent 923 3cc9f17ca9bb
child 932 a58cc7936ce7
equal deleted inserted replaced
928:4663386a04de 929:9fc2ebe6d7f1 
     1 # HG changeset patch
 
     1 # HG changeset patch
 
     2 # Parent  972c67cdd5dd4463abbee60036b686d4cb78e616
 
     2 # Parent  1d3f5cacba056949ea9a56d4d805c3073efe403b
 
     3 Description: Add KDE integration to Firefox (toolkit parts)
 
     3 Description: Add KDE integration to Firefox (toolkit parts)
 
     4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 
     4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 
     5 Author: Lubos Lunak <lunak@suse.com>
 
     5 Author: Lubos Lunak <lunak@suse.com>
 
     6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 
     6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 
     7      https://bugzilla.novell.com/show_bug.cgi?id=170055
 
     7      https://bugzilla.novell.com/show_bug.cgi?id=170055
 
    25  
    25  
    26  #include "prefapi.h"
 
    26  #include "prefapi.h"
 
    27  #include "prefread.h"
 
    27  #include "prefread.h"
 
    28  #include "prefapi_private_data.h"
 
    28  #include "prefapi_private_data.h"
 
    29  
    29  
    30 @@ -1145,16 +1146,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
    30 @@ -1162,16 +1163,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
    31  
    31  
    32  static nsresult pref_LoadPrefsInDirList(const char *listId)
 
    32  static nsresult pref_LoadPrefsInDirList(const char *listId)
 
    33  {
 
    33  {
 
    34    nsresult rv;
 
    34    nsresult rv;
 
    35    nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
 
    35    nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
 
    60                getter_AddRefs(list));
 
    60                getter_AddRefs(list));
 
    61    if (!list)
 
    61    if (!list)
 
    62      return NS_OK;
 
    62      return NS_OK;
 
    63  
    63  
    64    bool hasMore;
 
    64    bool hasMore;
 
    65 @@ -1170,17 +1189,17 @@ static nsresult pref_LoadPrefsInDirList(
 
    65 @@ -1187,17 +1206,17 @@ static nsresult pref_LoadPrefsInDirList(
 
    66  
    66  
    67      nsAutoCString leaf;
 
    67      nsAutoCString leaf;
 
    68      path->GetNativeLeafName(leaf);
 
    68      path->GetNativeLeafName(leaf);
 
    69  
    69  
    70      // Do we care if a file provided by this process fails to load?
 
    70      // Do we care if a file provided by this process fails to load?
 
    79  
    79  
    80  static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
 
    80  static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
 
    81  {
 
    81  {
 
    82    nsZipItemPtr<char> manifest(jarReader, name, true);
 
    82    nsZipItemPtr<char> manifest(jarReader, name, true);
 
    83    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
 
    83    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
 
    84 @@ -1274,24 +1293,36 @@ static nsresult pref_InitInitialObjects(
 
    84 @@ -1291,24 +1310,36 @@ static nsresult pref_InitInitialObjects(
 
    85    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
 
    85    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
 
    86    static const char* specialFiles[] = {
 
    86    static const char* specialFiles[] = {
 
    87  #if defined(XP_MACOSX)
 
    87  #if defined(XP_MACOSX)
 
    88      "macprefs.js"
 
    88      "macprefs.js"
 
    89  #elif defined(XP_WIN)
 
    89  #elif defined(XP_WIN)
 
   139  FINAL_LIBRARY = 'xul'
 
   139  FINAL_LIBRARY = 'xul'
 
   140  
   140  
   141  DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
 
   141  DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
 
   142  DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
 
   142  DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
 
   143  
   143  
   144  if CONFIG['GNU_CXX']:
 
   144  FINAL_TARGET_PP_FILES += [
 
   145 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
 
   145 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
 
   146 --- a/python/mozbuild/mozpack/chrome/flags.py
 
   146 --- a/python/mozbuild/mozpack/chrome/flags.py
 
   147 +++ b/python/mozbuild/mozpack/chrome/flags.py
 
   147 +++ b/python/mozbuild/mozpack/chrome/flags.py
 
   148 @@ -211,16 +211,17 @@ class Flags(OrderedDict):
 
   148 @@ -211,16 +211,17 @@ class Flags(OrderedDict):
 
   149          'contentaccessible': Flag,
 
   149          'contentaccessible': Flag,
 
   185          self.base = base
 
   185          self.base = base
 
   186          self.flags = Flags(*flags)
 
   186          self.flags = Flags(*flags)
 
   187 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 
   187 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 
   188 --- a/toolkit/components/downloads/moz.build
 
   188 --- a/toolkit/components/downloads/moz.build
 
   189 +++ b/toolkit/components/downloads/moz.build
 
   189 +++ b/toolkit/components/downloads/moz.build
 
   190 @@ -60,15 +60,16 @@ if not CONFIG['MOZ_SUITE']:
 
   190 @@ -60,17 +60,18 @@ if not CONFIG['MOZ_SUITE']:
 
   191          'nsDownloadManagerUI.js',
 
   191          'nsDownloadManagerUI.js',
 
   192          'nsDownloadManagerUI.manifest',
 
   192          'nsDownloadManagerUI.manifest',
 
   193      ]
 
   193      ]
 
   194  
   194  
   195  FINAL_LIBRARY = 'xul'
 
   195  FINAL_LIBRARY = 'xul'
 
   203  
   203  
   204  DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 
   204  DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
 
   205  DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
 
   205  DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
 
   206  
   206  
   207  CXXFLAGS += CONFIG['TK_CFLAGS']
 
   207  CXXFLAGS += CONFIG['TK_CFLAGS']
 
       
   208  
       
   209  if CONFIG['GNU_CXX']:
 
   208 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 
   210 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 
   209 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 
   211 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 
   210 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
 
   212 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
 
   211 @@ -51,16 +51,20 @@
 
   213 @@ -51,16 +51,20 @@
 
   212  #ifdef XP_WIN
 
   214  #ifdef XP_WIN
 
  2286 +}
 
  2288 +}
 
  2287 +
 
  2289 +
 
  2288 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 
  2290 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 
  2289 --- a/toolkit/xre/moz.build
 
  2291 --- a/toolkit/xre/moz.build
 
  2290 +++ b/toolkit/xre/moz.build
 
  2292 +++ b/toolkit/xre/moz.build
 
  2291 @@ -48,17 +48,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
 
  2293 @@ -47,17 +47,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
 
  2292  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
 
  2294  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
 
  2293      EXPORTS += ['nsQAppInstance.h']
 
  2295      EXPORTS += ['nsQAppInstance.h']
 
  2294      SOURCES += [
 
  2296      SOURCES += [
 
  2295          '!moc_nsNativeAppSupportQt.cpp',
 
  2297          '!moc_nsNativeAppSupportQt.cpp',
 
  2296          'nsNativeAppSupportQt.cpp',
 
  2298          'nsNativeAppSupportQt.cpp',
 
  2706 +
 
  2708 +
 
  2707 +#endif // nsKDEUtils
 
  2709 +#endif // nsKDEUtils
 
  2708 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 
  2710 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 
  2709 --- a/uriloader/exthandler/moz.build
 
  2711 --- a/uriloader/exthandler/moz.build
 
  2710 +++ b/uriloader/exthandler/moz.build
 
  2712 +++ b/uriloader/exthandler/moz.build
 
  2711 @@ -75,17 +75,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
 
  2713 @@ -77,17 +77,19 @@ else:
 
  2712  else:
 
       
  2713      # These files can't be built in unified mode because they redefine LOG.
 
       
  2714      SOURCES += [
 
  2714      SOURCES += [
 
  2715          osdir + '/nsOSHelperAppService.cpp',
 
  2715          osdir + '/nsOSHelperAppService.cpp',
 
  2716      ]
 
  2716      ]
 
       
  2717      if CONFIG['GNU_CXX']:
 
       
  2718          CXXFLAGS += ['-Wno-error=shadow']
 
  2717  
  2719  
  2718  if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 
  2720  if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 
  2719      UNIFIED_SOURCES += [
 
  2721      UNIFIED_SOURCES += [
 
  2720 +        'unix/nsCommonRegistry.cpp',
 
  2722 +        'unix/nsCommonRegistry.cpp',
 
  2721          'unix/nsGNOMERegistry.cpp',
 
  2723          'unix/nsGNOMERegistry.cpp',
 
  2722 +        'unix/nsKDERegistry.cpp',
 
  2724 +	'unix/nsKDERegistry.cpp',
 
  2723          'unix/nsMIMEInfoUnix.cpp',
 
  2725          'unix/nsMIMEInfoUnix.cpp',
 
  2724      ]
 
  2726      ]
 
  2725  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
 
  2727  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
 
  2726      UNIFIED_SOURCES += [
 
  2728      UNIFIED_SOURCES += [
 
  2727          'android/nsAndroidHandlerApp.cpp',
 
  2729          'android/nsAndroidHandlerApp.cpp',
 
  2728          'android/nsExternalSharingAppService.cpp',
 
  2730          'android/nsExternalSharingAppService.cpp',
 
  2729          'android/nsExternalURLHandlerService.cpp',
 
  2731          'android/nsExternalURLHandlerService.cpp',
 
  2730          'android/nsMIMEInfoAndroid.cpp',
 
  2732          'android/nsMIMEInfoAndroid.cpp',
 
  2731 @@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
 
  2733 @@ -131,16 +133,17 @@ include('/ipc/chromium/chromium-config.m
 
  2732  
  2734  
  2733  FINAL_LIBRARY = 'xul'
 
  2735  FINAL_LIBRARY = 'xul'
 
  2734  
  2736  
  2735  LOCAL_INCLUDES += [
 
  2737  LOCAL_INCLUDES += [
 
  2736      '/dom/base',
 
  2738      '/dom/base',
 
  3162        return gnomeInfo.forget();
 
  3164        return gnomeInfo.forget();
 
  3163      }
 
  3165      }
 
  3164 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 
  3166 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 
  3165 --- a/widget/gtk/moz.build
 
  3167 --- a/widget/gtk/moz.build
 
  3166 +++ b/widget/gtk/moz.build
 
  3168 +++ b/widget/gtk/moz.build
 
  3167 @@ -90,16 +90,17 @@ else:
 
  3169 @@ -87,16 +87,17 @@ else:
 
  3168  include('/ipc/chromium/chromium-config.mozbuild')
 
  3170  include('/ipc/chromium/chromium-config.mozbuild')
 
  3169  
  3171  
  3170  FINAL_LIBRARY = 'xul'
 
  3172  FINAL_LIBRARY = 'xul'
 
  3171  
  3173  
  3172  LOCAL_INCLUDES += [
 
  3174  LOCAL_INCLUDES += [
 
  3670      }
 
  3672      }
 
  3671  
  3673  
  3672 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 
  3674 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 
  3673 --- a/xpcom/components/moz.build
 
  3675 --- a/xpcom/components/moz.build
 
  3674 +++ b/xpcom/components/moz.build
 
  3676 +++ b/xpcom/components/moz.build
 
  3675 @@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul'
 
  3677 @@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul'
 
  3676  LOCAL_INCLUDES += [
 
  3678  LOCAL_INCLUDES += [
 
  3677      '!..',
 
  3679      '!..',
 
  3678      '../base',
 
  3680      '../base',
 
  3679      '../build',
 
  3681      '../build',
 
  3680      '../ds',
 
  3682      '../ds',
mozilla