← Back to branch summary

~ubuntu-branches/ubuntu/precise/firefox/precise-security

« back to all changes in this revision

Viewing changes to debian/patches/firefox-kde.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson, Chris Coulson, Micah Gersten
  • Date: 2011-12-22 23:26:50 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20111222232650-f2wojmw156xved8d
Tags: 10.0~b1+build1-0ubuntu1
* New upstream release from the beta channel (FIREFOX_10_0b1_BUILD1)

[ Chris Coulson <chris.coulson@canonical.com> ]
* Update patches for PRBool -> bool transition
  - refresh debian/patches/firefox-kde.patch
  - refresh debian/patches/mozilla-kde.patch
  - refresh debian/patches/ubuntu-ua-string-changes.patch
* Drop some more hanging IPC xpcshell tests
  - update debian/build/testsuite.mk
* Borrow functionality from Chromium package to have distro
  specific patches
  - update debian/rules
  - add debian/build/enable-dist-patches.pl
* Don't enable unity-globalmenu-build-support.patch on lucid and maverick
  - update debian/patches/series
* Remove prerm hook for cleaning up pyc files in the apport package-hooks
  folder. Nothing creates these
  - update debian/firefox.prerm.in
* Set up alternatives in the postinst script on abort-remove too
  - update debian/firefox.postinst.in
* Imporove maintainer script magic for moving the system pref file and
  removing obsolete conffiles when upgrading from 3.6, by doing what
  dpkg-maintscripts-helper does
  - update debian/firefox.postinst.in
  - update debian/firefox.postrm.in
  - update debian/firefox.preinst.in
* Only run the Apparmor stuff in the postinst script on configure, and
  in the preinst script on install or upgrade, to handle upgrade failures
  more gracefully
  - update debian/firefox.postinst.in
  - update debian/firefox.preinst.in
* Add add-syspref-dir.patch for Lucid and Maverick builds only, so we get
  nightly/aurora coverage for this
  - add debian/patches/add-syspref-dir.patch
  - update debian/patches/series
  - update debian/rules
  - update debian/firefox.install.in
  - update debian/firefox.links.in
  - update debian/firefox.postinst.in
  - update debian/firefox.postrm.in
  - update debian/firefox.preinst.in
* Drop the Ubuntuzilla workarounds now
  - update debian/firefox.postinst.in
* Refresh patches
  - update debian/patches/mozilla-kde.patch
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/ubuntu_bookmarks.patch
* Turn off Network Manager integration for now, as it causes Firefox to
  always start in offline mode. In any case, probing Network Manager isn't
  the most reliable way to test if there is a connection
  - update debian/vendor.js
* Update after landing of bmo: #701875 - Rename omni.jar to omni.ja
  - update debian/firefox.install.in
* Update mozilla-kde.patch and firefox-kde.patch to remove the use of
  nsCStringArray, which was dropped from Firefox 10
* Disable KDE patches, which currently don't work with Firefox 10
  - update debian/patches/series
* Drop the firefox-kde-support suggest on precise onwards, whilst the
  patches are disabled
  - update debian/rules
  - update debian/control{,.in}

[ Micah Gersten <micahg@ubuntu.com> ]
* Rebase patches for PRBool -> bool transition (bmo: 675553)
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/mozilla-kde.patch
* Drop patch after upstream landing of (bmo: 690432) aka Logging.h passes a
  string directly to printf
  - drop debian/patches/printf-fix.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/firefox-kde.patch
6
6
Bug-OpenSUSE: https://bugzilla.novell.com/show_bug.cgi?id=170055
7
7
Forwarded: no
8
8
 
9
 
--- a/browser/base/content/browser-kde.xul
10
 
+++ b/browser/base/content/browser-kde.xul
11
 
@@ -200,7 +200,7 @@
 
9
Index: mozilla/browser/base/content/browser-kde.xul
 
10
===================================================================
 
11
--- mozilla.orig/browser/base/content/browser-kde.xul   2011-12-21 00:50:07.985722205 +0000
 
12
+++ mozilla/browser/base/content/browser-kde.xul        2011-12-21 01:00:23.133697213 +0000
 
13
@@ -201,7 +201,7 @@
12
14
       </row>
13
15
       <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
14
16
       <hbox id="editBookmarkPanelBottomButtons" pack="end">
17
19
         <button id="editBookmarkPanelDoneButton"
18
20
                 class="editBookmarkPanelBottomButton"
19
21
                 label="&editBookmark.done.label;"
20
 
--- a/browser/base/jar.mn
21
 
+++ b/browser/base/jar.mn
22
 
@@ -28,6 +28,8 @@ browser.jar:
 
22
Index: mozilla/browser/base/jar.mn
 
23
===================================================================
 
24
--- mozilla.orig/browser/base/jar.mn    2011-12-20 02:04:11.000000000 +0000
 
25
+++ mozilla/browser/base/jar.mn 2011-12-21 01:00:23.133697213 +0000
 
26
@@ -28,6 +28,8 @@
23
27
 *       content/browser/browser.css                   (content/browser.css)
24
28
 *       content/browser/browser.js                    (content/browser.js)
25
29
 *       content/browser/browser.xul                   (content/browser.xul)
28
32
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
29
33
 *       content/browser/content.js                    (content/content.js)
30
34
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
31
 
--- a/browser/components/build/nsModule.cpp
32
 
+++ b/browser/components/build/nsModule.cpp
 
35
Index: mozilla/browser/components/build/nsModule.cpp
 
36
===================================================================
 
37
--- mozilla.orig/browser/components/build/nsModule.cpp  2011-12-20 02:04:15.000000000 +0000
 
38
+++ mozilla/browser/components/build/nsModule.cpp       2011-12-21 01:00:23.133697213 +0000
33
39
@@ -46,7 +46,7 @@
34
40
 #elif defined(XP_MACOSX)
35
41
 #include "nsMacShellService.h"
39
45
 #endif
40
46
 
41
47
 #include "nsProfileMigrator.h"
42
 
@@ -76,8 +76,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(Directory
 
48
@@ -73,8 +73,6 @@
43
49
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
44
50
 #elif defined(XP_MACOSX)
45
51
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
47
53
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
48
54
 #endif
49
55
 
50
 
 #if !defined(XP_OS2)
51
 
@@ -119,7 +117,7 @@ static const mozilla::Module::CIDEntry k
 
56
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
 
57
@@ -110,7 +108,7 @@
52
58
 #if defined(XP_WIN)
53
59
     { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
54
60
 #elif defined(MOZ_WIDGET_GTK2)
57
63
 #endif
58
64
     { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
59
65
     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
60
 
--- a/browser/components/shell/src/Makefile.in
61
 
+++ b/browser/components/shell/src/Makefile.in
62
 
@@ -57,7 +57,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
66
Index: mozilla/browser/components/shell/src/Makefile.in
 
67
===================================================================
 
68
--- mozilla.orig/browser/components/shell/src/Makefile.in       2011-12-20 02:04:20.000000000 +0000
 
69
+++ mozilla/browser/components/shell/src/Makefile.in    2011-12-21 01:00:23.133697213 +0000
 
70
@@ -56,7 +56,8 @@
63
71
 CPPSRCS = nsMacShellService.cpp
64
72
 else
65
73
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
69
77
 endif
70
78
 endif
71
79
 endif
72
 
--- /dev/null
73
 
+++ b/browser/components/shell/src/nsKDEShellService.cpp
 
80
Index: mozilla/browser/components/shell/src/nsKDEShellService.cpp
 
81
===================================================================
 
82
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
83
+++ mozilla/browser/components/shell/src/nsKDEShellService.cpp  2011-12-21 01:00:23.133697213 +0000
74
84
@@ -0,0 +1,193 @@
75
85
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
76
86
+/* ***** BEGIN LICENSE BLOCK *****
129
139
+NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService)
130
140
+
131
141
+NS_IMETHODIMP
132
 
+nsKDEShellService::IsDefaultBrowser(PRBool aStartupCheck,
133
 
+                                      PRBool* aIsDefaultBrowser)
 
142
+nsKDEShellService::IsDefaultBrowser(bool aStartupCheck,
 
143
+                                    bool* aIsDefaultBrowser)
134
144
+    {
135
145
+    *aIsDefaultBrowser = PR_FALSE;
136
146
+    if (aStartupCheck)
137
147
+        mCheckedThisSession = PR_TRUE;
138
 
+    nsCStringArray command;
139
 
+    command.AppendCString( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" ));
 
148
+    nsTArray<nsCString> command;
 
149
+    command.AppendElement( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" ));
140
150
+    if( nsKDEUtils::command( command ))
141
151
+        *aIsDefaultBrowser = PR_TRUE;
142
152
+    return NS_OK;
143
153
+    }
144
154
+
145
155
+NS_IMETHODIMP
146
 
+nsKDEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
147
 
+                                       PRBool aForAllUsers)
 
156
+nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes,
 
157
+                                     bool aForAllUsers)
148
158
+    {
149
 
+    nsCStringArray command;
150
 
+    command.AppendCString( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" ));
151
 
+    command.AppendCString( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" ));
 
159
+    nsTArray<nsCString> command;
 
160
+    command.AppendElement( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" ));
 
161
+    command.AppendElement( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" ));
152
162
+    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
153
163
+    }
154
164
+
155
165
+NS_IMETHODIMP
156
 
+nsKDEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
 
166
+nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult)
157
167
+{
158
168
+  // If we've already checked, the browser has been started and this is a 
159
169
+  // new window open, and we don't want to check again.
174
184
+}
175
185
+
176
186
+NS_IMETHODIMP
177
 
+nsKDEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck)
 
187
+nsKDEShellService::SetShouldCheckDefaultBrowser(bool aShouldCheck)
178
188
+{
179
189
+  nsCOMPtr<nsIPrefBranch> prefs;
180
190
+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
189
199
+
190
200
+NS_IMETHODIMP
191
201
+nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, 
192
 
+                                          PRInt32 aPosition)
 
202
+                                        PRInt32 aPosition)
193
203
+    {
194
204
+    return NS_ERROR_NOT_IMPLEMENTED;
195
205
+    }
209
219
+NS_IMETHODIMP
210
220
+nsKDEShellService::OpenApplication(PRInt32 aApplication)
211
221
+    {
212
 
+    nsCStringArray command;
 
222
+    nsTArray<nsCString> command;
213
223
+    if( aApplication == APPLICATION_MAIL )
214
 
+        command.AppendCString( NS_LITERAL_CSTRING( "OPENMAIL" ));
 
224
+        command.AppendElement( NS_LITERAL_CSTRING( "OPENMAIL" ));
215
225
+    else if( aApplication == APPLICATION_NEWS )
216
 
+        command.AppendCString( NS_LITERAL_CSTRING( "OPENNEWS" ));
 
226
+        command.AppendElement( NS_LITERAL_CSTRING( "OPENNEWS" ));
217
227
+    else
218
228
+        return NS_ERROR_NOT_IMPLEMENTED;
219
229
+    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
222
232
+NS_IMETHODIMP
223
233
+nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI)
224
234
+    {
225
 
+    nsCStringArray command;
226
 
+    command.AppendCString( NS_LITERAL_CSTRING( "RUN" ));
 
235
+    nsTArray<nsCString> command;
 
236
+    command.AppendElement( NS_LITERAL_CSTRING( "RUN" ));
227
237
+    nsCString app;
228
238
+    nsresult rv = aApplication->GetNativePath( app );
229
239
+    NS_ENSURE_SUCCESS( rv, rv );
230
 
+    command.AppendCString( app );
231
 
+    command.AppendCString( aURI );
 
240
+    command.AppendElement( app );
 
241
+    command.AppendElement( aURI );
232
242
+    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
233
243
+    }
234
244
+
237
247
+    {
238
248
+    *_retval = nsnull;
239
249
+
240
 
+    nsCStringArray command;
241
 
+    command.AppendCString( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" ));
242
 
+    nsCStringArray output;
243
 
+    if( !nsKDEUtils::command( command, &output ) || output.Count() != 1 )
 
250
+    nsTArray<nsCString> command;
 
251
+    command.AppendElement( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" ));
 
252
+    nsTArray<nsCString> output;
 
253
+    if( !nsKDEUtils::command( command, &output ) || output.Length() != 1 )
244
254
+        return NS_ERROR_FAILURE;
245
255
+
246
256
+    nsCString path;
247
 
+    path = *output[ 0 ];
 
257
+    path = output[ 0 ];
248
258
+    if (path.IsEmpty())
249
259
+        return NS_ERROR_FAILURE;
250
260
+
256
266
+    rv = defaultReader->InitWithNativePath(path);
257
267
+    NS_ENSURE_SUCCESS(rv, rv);
258
268
+
259
 
+    PRBool exists;
 
269
+    bool exists;
260
270
+    rv = defaultReader->Exists(&exists);
261
271
+    NS_ENSURE_SUCCESS(rv, rv);
262
272
+    if (!exists)
265
275
+    NS_ADDREF(*_retval = defaultReader);
266
276
+    return NS_OK;
267
277
+    }
268
 
--- /dev/null
269
 
+++ b/browser/components/shell/src/nsKDEShellService.h
 
278
Index: mozilla/browser/components/shell/src/nsKDEShellService.h
 
279
===================================================================
 
280
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
281
+++ mozilla/browser/components/shell/src/nsKDEShellService.h    2011-12-21 01:00:23.133697213 +0000
270
282
@@ -0,0 +1,59 @@
271
283
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
272
284
+/* ***** BEGIN LICENSE BLOCK *****
327
339
+};
328
340
+
329
341
+#endif // nskdeshellservice_h____
330
 
--- /dev/null
331
 
+++ b/browser/components/shell/src/nsUnixShellService.cpp
 
342
Index: mozilla/browser/components/shell/src/nsUnixShellService.cpp
 
343
===================================================================
 
344
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
345
+++ mozilla/browser/components/shell/src/nsUnixShellService.cpp 2011-12-21 01:00:23.133697213 +0000
332
346
@@ -0,0 +1,52 @@
333
347
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
334
348
+/* ***** BEGIN LICENSE BLOCK *****
382
396
+        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
383
397
+    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
384
398
+}
385
 
--- /dev/null
386
 
+++ b/browser/components/shell/src/nsUnixShellService.h
 
399
Index: mozilla/browser/components/shell/src/nsUnixShellService.h
 
400
===================================================================
 
401
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
402
+++ mozilla/browser/components/shell/src/nsUnixShellService.h   2011-12-21 01:00:23.133697213 +0000
387
403
@@ -0,0 +1,45 @@
388
404
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
389
405
+/* ***** BEGIN LICENSE BLOCK *****