equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1559294891 -7200 |
3 # Date 1559294891 -7200 |
4 # Fri May 31 11:28:11 2019 +0200 |
4 # Fri May 31 11:28:11 2019 +0200 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
6 # Parent aa58e8c70d1448a08407c6c191ea8b76d61e8bf6 |
6 # Parent 43647626f7204e312a4e38cac0414a461b06667f |
7 Description: Add KDE integration to Firefox (toolkit parts) |
7 Description: Add KDE integration to Firefox (toolkit parts) |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
9 Author: Lubos Lunak <lunak@suse.com> |
9 Author: Lubos Lunak <lunak@suse.com> |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
29 #endif |
29 #endif |
30 |
30 |
31 #ifdef MOZ_MEMORY |
31 #ifdef MOZ_MEMORY |
32 # include "mozmemory.h" |
32 # include "mozmemory.h" |
33 #endif |
33 #endif |
34 @@ -4566,25 +4567,37 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4570,25 +4571,37 @@ nsresult Preferences::InitInitialObjects |
35 // application pref files for backwards compatibility. |
35 // application pref files for backwards compatibility. |
36 static const char* specialFiles[] = { |
36 static const char* specialFiles[] = { |
37 #if defined(XP_MACOSX) |
37 #if defined(XP_MACOSX) |
38 "macprefs.js" |
38 "macprefs.js" |
39 #elif defined(XP_WIN) |
39 #elif defined(XP_WIN) |
67 NS_WARNING("Error parsing application default preferences."); |
67 NS_WARNING("Error parsing application default preferences."); |
68 } |
68 } |
69 |
69 |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
72 @@ -4630,17 +4643,17 @@ nsresult Preferences::InitInitialObjects |
72 @@ -4634,17 +4647,17 @@ nsresult Preferences::InitInitialObjects |
73 } |
73 } |
74 |
74 |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
76 if (!path) { |
76 if (!path) { |
77 continue; |
77 continue; |
89 |
89 |
90 if (aIsStartup) { |
90 if (aIsStartup) { |
91 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
91 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
92 --- a/modules/libpref/moz.build |
92 --- a/modules/libpref/moz.build |
93 +++ b/modules/libpref/moz.build |
93 +++ b/modules/libpref/moz.build |
94 @@ -114,16 +114,20 @@ EXPORTS.mozilla += [ |
94 @@ -117,16 +117,20 @@ EXPORTS.mozilla += [ |
95 ] |
95 ] |
96 EXPORTS.mozilla += sorted(['!' + g for g in gen_h]) |
96 EXPORTS.mozilla += sorted(['!' + g for g in gen_h]) |
97 |
97 |
98 UNIFIED_SOURCES += [ |
98 UNIFIED_SOURCES += [ |
99 'Preferences.cpp', |
99 'Preferences.cpp', |
104 + '/toolkit/xre' |
104 + '/toolkit/xre' |
105 +] |
105 +] |
106 + |
106 + |
107 gen_all_tuple = tuple(gen_h + gen_cpp + gen_rs) |
107 gen_all_tuple = tuple(gen_h + gen_cpp + gen_rs) |
108 |
108 |
109 GENERATED_FILES += [gen_all_tuple] |
109 GeneratedFile(*gen_all_tuple, script='init/generate_static_pref_list.py', |
110 |
110 entry_point='emit_code', inputs=['init/StaticPrefList.yaml']) |
111 static_pref_list = GENERATED_FILES[gen_all_tuple] |
111 |
112 static_pref_list.script = 'init/generate_static_pref_list.py:emit_code' |
112 PYTHON_UNITTEST_MANIFESTS += [ |
113 static_pref_list.inputs = ['init/StaticPrefList.yaml'] |
113 'test/python.ini', |
114 |
114 ] |
115 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
115 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
116 --- a/python/mozbuild/mozpack/chrome/flags.py |
116 --- a/python/mozbuild/mozpack/chrome/flags.py |
117 +++ b/python/mozbuild/mozpack/chrome/flags.py |
117 +++ b/python/mozbuild/mozpack/chrome/flags.py |
118 @@ -227,16 +227,17 @@ class Flags(OrderedDict): |
118 @@ -227,16 +227,17 @@ class Flags(OrderedDict): |
119 'contentaccessible': Flag, |
119 'contentaccessible': Flag, |
354 return result.forget().downcast<nsISupports>(); |
354 return result.forget().downcast<nsISupports>(); |
355 } |
355 } |
356 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
356 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
357 --- a/toolkit/xre/moz.build |
357 --- a/toolkit/xre/moz.build |
358 +++ b/toolkit/xre/moz.build |
358 +++ b/toolkit/xre/moz.build |
359 @@ -88,17 +88,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
359 @@ -90,17 +90,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
360 '../components/printingui', |
360 '../components/printingui', |
361 ] |
361 ] |
362 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
362 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
363 UNIFIED_SOURCES += [ |
363 UNIFIED_SOURCES += [ |
364 'nsNativeAppSupportDefault.cpp', |
364 'nsNativeAppSupportDefault.cpp', |
1291 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1291 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1292 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1292 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1293 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1293 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1294 --- a/widget/gtk/moz.build |
1294 --- a/widget/gtk/moz.build |
1295 +++ b/widget/gtk/moz.build |
1295 +++ b/widget/gtk/moz.build |
1296 @@ -131,16 +131,17 @@ include('/ipc/chromium/chromium-config.m |
1296 @@ -133,16 +133,17 @@ include('/ipc/chromium/chromium-config.m |
1297 |
1297 |
1298 FINAL_LIBRARY = 'xul' |
1298 FINAL_LIBRARY = 'xul' |
1299 |
1299 |
1300 LOCAL_INCLUDES += [ |
1300 LOCAL_INCLUDES += [ |
1301 '/layout/base', |
1301 '/layout/base', |