← Back to branch summary

~ubuntu-branches/ubuntu/natty/firefox/natty-security

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-03-10 00:55:12 UTC
  • mfrom: (1.2.5)
  • Revision ID: package-import@ubuntu.com-20120310005512-allechvwtduwk67a
Tags: 11.0+build1-0ubuntu0.11.04.1
https://launchpad.net/bugs/951250
https://launchpad.net/bugs/898883
https://launchpad.net/bugs/913357
https://launchpad.net/bugs/898883
https://launchpad.net/bugs/915895
https://launchpad.net/bugs/926495
https://launchpad.net/bugs/926495
* New upstream stable release (FIREFOX_11_0_BUILD1)
  - see LP: #951250 for USN information

* Update globalmenu-extension to 2.0.3
* Ensure that the crash reporter is disabled if rebuilt by Ubuntu
  derivatives, as there will be no crash symbols for those
  - update debian/rules
* Only add "Ubuntu" to the UA string when being built for Ubuntu
  - update debian/rules
* Temporarily disable ipdl tests due to build failures. These aren't
  enabled upstream, anyway
  - update debian/config/mozconfig.in
* Always set the update channel - not setting it at build-time on release
  builds breaks the extensions.checkCompatibility pref. The only things
  using it at runtime are nsBlocklistService, Test Pilot (beta + aurora)
  and the about dialog (where the channel is hidden anyway)
  - update debian/rules
  - update debian/firefox.install.in
* Fix LP: #898883 - IPC xpcshell tests hang the buildd's. Give all
  xpcshell tests an X display, as plugin-container won't work without one
  - update debian/build/testsuite.mk
* Turn on all IPC xpcshell tests again
  - update debian/build/testsute.mk
* Ship Test Pilot as a distribution addon, like upstream. This means
  that the addon manager can update it. It does also mean that it will
  remain installed in users profiles if they try the beta or aurora
  builds, but the Feedback button is disabled on release builds
  - update debian/firefox.install.in
  - fixes LP: #913357
* Drop patches fixed upstream
  - remove debian/patches/fix-cursor-handling.patch
  - update debian/patches/series
* Call xvfb-run with "-a" in case there are other servers running on the
  builder
  - update debian/build/testsuite.mk
* Really fix LP: #898883 - IPC xpcshell tests hang the build. What was
  actually happening is plugin-container would fail to start because all
  available X connections had been used up by many instances of dbus-launch,
  spawned each time an xpcshell tried to talk to the session bus. Because
  we run all of the xpcshell tests with one Xvfb instance, the buses
  accumulate until the available X connections all run out. To fix this, run
  all tests requiring a display inside dbus-launch, so we create just a
  single bus for all xpcshell tests
  - update debian/build/testsuite.mk
  - update debian/control{,.in}
* Add Ligurian to locale blacklist, as we don't support this in Ubuntu
  - update debian/config/locales.blacklist
* Refresh patches
  - update debian/patches/ubuntu-ua-string-changes.patch
  - update debian/patches/mozilla-kde.patch
  - update debian/patches/firefox-kde.patch
* Fix LP: #915895 - Just set autoDisableScopes to 0. Other distributions
  are already doing this, and we already made this feature pretty much
  useless by allowing extensions in the application directory, so that our
  language packs aren't disabled by default
  - update debian/vendor.js
* Drop the solid white separators from the addressbar autocomplete dropdown,
  and increase padding so that it doesn't look so bad with dark themes
  - add debian/patches/autocomplete-theme-tweak.patch
  - update debian/patches/series
* Fix LP: #926495 - Add patch based on one from bmo: #691898 to enable
  building on ppc again
  - add debian/patches/fix-build-failure-without-yarr-jit.patch
  - update debian/patches/series
* Fix LP: #926495 - Disable the SPS profiler on unsupported architectures
  - add debian/patches/no-sps-profiler-on-unsupported-archs.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
 
Index: mozilla/browser/base/content/browser-kde.xul
10
 
===================================================================
11
 
--- mozilla.orig/browser/base/content/browser-kde.xul   2012-01-13 10:45:33.000000000 +0000
12
 
+++ mozilla/browser/base/content/browser-kde.xul        2012-01-13 10:58:03.547808616 +0000
13
 
@@ -200,7 +200,7 @@
 
9
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 
10
--- a/browser/base/content/browser-kde.xul
 
11
+++ b/browser/base/content/browser-kde.xul
 
12
@@ -197,17 +197,17 @@
 
13
                     class="editBookmarkPanelHeaderButton"
 
14
                     oncommand="StarUI.removeBookmarkButtonCommand();"
 
15
                     accesskey="&editBookmark.removeBookmark.accessKey;"/>
 
16
           </hbox>
 
17
         </vbox>
14
18
       </row>
15
19
       <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
16
20
       <hbox id="editBookmarkPanelBottomButtons" pack="end">
19
23
         <button id="editBookmarkPanelDoneButton"
20
24
                 class="editBookmarkPanelBottomButton"
21
25
                 label="&editBookmark.done.label;"
22
 
Index: mozilla/browser/base/jar.mn
23
 
===================================================================
24
 
--- mozilla.orig/browser/base/jar.mn    2012-01-12 10:03:36.000000000 +0000
25
 
+++ mozilla/browser/base/jar.mn 2012-01-13 10:58:03.547808616 +0000
26
 
@@ -28,6 +28,8 @@
 
26
                 default="true"
 
27
                 oncommand="StarUI.panel.hidePopup();"/>
 
28
         <button id="editBookmarkPanelDeleteButton"
 
29
                 class="editBookmarkPanelBottomButton"
 
30
                 label="&editBookmark.cancel.label;"
 
31
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 
32
--- a/browser/base/jar.mn
 
33
+++ b/browser/base/jar.mn
 
34
@@ -23,16 +23,18 @@ browser.jar:
 
35
         content/browser/aboutHome-restore-icon-small.png    (content/aboutHome-restore-icon-small.png)
 
36
         content/browser/aboutHome-snippet1.png        (content/aboutHome-snippet1.png)
 
37
         content/browser/aboutHome-snippet2.png        (content/aboutHome-snippet2.png)
 
38
         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
 
39
         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
27
40
 *       content/browser/browser.css                   (content/browser.css)
28
41
 *       content/browser/browser.js                    (content/browser.js)
29
42
 *       content/browser/browser.xul                   (content/browser.xul)
32
45
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
33
46
 *       content/browser/content.js                    (content/content.js)
34
47
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
35
 
Index: mozilla/browser/components/build/nsModule.cpp
36
 
===================================================================
37
 
--- mozilla.orig/browser/components/build/nsModule.cpp  2012-01-12 10:03:40.000000000 +0000
38
 
+++ mozilla/browser/components/build/nsModule.cpp       2012-01-13 11:00:50.767805644 +0000
39
 
@@ -46,7 +46,7 @@
 
48
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
 
49
 *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 
50
 *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
 
51
 *       content/browser/pageinfo/pageInfo.xml         (content/pageinfo/pageInfo.xml)
 
52
 *       content/browser/pageinfo/feeds.js             (content/pageinfo/feeds.js)
 
53
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 
54
--- a/browser/components/build/nsModule.cpp
 
55
+++ b/browser/components/build/nsModule.cpp
 
56
@@ -41,17 +41,17 @@
 
57
 #include "nsBrowserCompsCID.h"
 
58
 #include "DirectoryProvider.h"
 
59
 
 
60
 #if defined(XP_WIN)
 
61
 #include "nsWindowsShellService.h"
40
62
 #elif defined(XP_MACOSX)
41
63
 #include "nsMacShellService.h"
42
64
 #elif defined(MOZ_WIDGET_GTK2)
45
67
 #endif
46
68
 
47
69
 #include "nsProfileMigrator.h"
48
 
@@ -76,8 +76,6 @@
 
70
 #if defined(XP_WIN) && !defined(__MINGW32__)
 
71
 #include "nsIEProfileMigrator.h"
 
72
 #elif defined(XP_MACOSX)
 
73
 #include "nsSafariProfileMigrator.h"
 
74
 #endif
 
75
@@ -68,18 +68,16 @@ using namespace mozilla::browser;
 
76
 
 
77
 /////////////////////////////////////////////////////////////////////////////
 
78
 
 
79
 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
 
80
 #if defined(XP_WIN)
49
81
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
50
82
 #elif defined(XP_MACOSX)
51
83
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
53
85
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
54
86
 #endif
55
87
 
56
 
 #if !defined(XP_OS2)
57
 
@@ -119,7 +117,7 @@
 
88
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
 
89
 #if defined(XP_WIN) && !defined(__MINGW32__)
 
90
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
 
91
 #elif defined(XP_MACOSX)
 
92
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
 
93
 #endif
 
94
@@ -105,17 +103,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR
 
95
 #endif
 
96
 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
 
97
 
 
98
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
 
99
     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
58
100
 #if defined(XP_WIN)
59
101
     { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
60
102
 #elif defined(MOZ_WIDGET_GTK2)
63
105
 #endif
64
106
     { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
65
107
     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
66
 
Index: mozilla/browser/components/shell/src/Makefile.in
67
 
===================================================================
68
 
--- mozilla.orig/browser/components/shell/src/Makefile.in       2012-01-12 10:04:14.000000000 +0000
69
 
+++ mozilla/browser/components/shell/src/Makefile.in    2012-01-13 10:58:03.547808616 +0000
70
 
@@ -57,7 +57,8 @@
 
108
     { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor },
 
109
 #if defined(XP_WIN) && !defined(__MINGW32__)
 
110
     { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
 
111
 #elif defined(XP_MACOSX)
 
112
     { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
 
113
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
 
114
--- a/browser/components/shell/src/Makefile.in
 
115
+++ b/browser/components/shell/src/Makefile.in
 
116
@@ -51,17 +51,18 @@ endif
 
117
 
 
118
 ifeq ($(OS_ARCH),WINNT)
 
119
 CPPSRCS = nsWindowsShellService.cpp
 
120
 else
 
121
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
71
122
 CPPSRCS = nsMacShellService.cpp
72
123
 else
73
124
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
77
128
 endif
78
129
 endif
79
130
 endif
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  2012-01-13 10:58:03.547808616 +0000
 
131
 
 
132
 ifdef CPPSRCS
 
133
 LIBRARY_NAME = shellservice_s
 
134
 endif
 
135
 
 
136
diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
 
137
new file mode 100644
 
138
--- /dev/null
 
139
+++ b/browser/components/shell/src/nsKDEShellService.cpp
84
140
@@ -0,0 +1,258 @@
85
141
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
86
142
+/* ***** BEGIN LICENSE BLOCK *****
340
396
+    NS_ADDREF(*_retval = defaultReader);
341
397
+    return NS_OK;
342
398
+    }
343
 
Index: mozilla/browser/components/shell/src/nsKDEShellService.h
344
 
===================================================================
345
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
346
 
+++ mozilla/browser/components/shell/src/nsKDEShellService.h    2012-01-13 10:58:03.547808616 +0000
 
399
diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
 
400
new file mode 100644
 
401
--- /dev/null
 
402
+++ b/browser/components/shell/src/nsKDEShellService.h
347
403
@@ -0,0 +1,59 @@
348
404
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
349
405
+/* ***** BEGIN LICENSE BLOCK *****
404
460
+};
405
461
+
406
462
+#endif // nskdeshellservice_h____
407
 
Index: mozilla/browser/components/shell/src/nsUnixShellService.cpp
408
 
===================================================================
409
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
410
 
+++ mozilla/browser/components/shell/src/nsUnixShellService.cpp 2012-01-13 10:58:03.547808616 +0000
 
463
diff --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp
 
464
new file mode 100644
 
465
--- /dev/null
 
466
+++ b/browser/components/shell/src/nsUnixShellService.cpp
411
467
@@ -0,0 +1,52 @@
412
468
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
413
469
+/* ***** BEGIN LICENSE BLOCK *****
461
517
+        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
462
518
+    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
463
519
+}
464
 
Index: mozilla/browser/components/shell/src/nsUnixShellService.h
465
 
===================================================================
466
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
467
 
+++ mozilla/browser/components/shell/src/nsUnixShellService.h   2012-01-13 10:58:03.551808616 +0000
 
520
diff --git a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h
 
521
new file mode 100644
 
522
--- /dev/null
 
523
+++ b/browser/components/shell/src/nsUnixShellService.h
468
524
@@ -0,0 +1,45 @@
469
525
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
470
526
+/* ***** BEGIN LICENSE BLOCK *****