--- a/firefox-kde.patch Wed Feb 05 07:13:27 2014 +0100
+++ b/firefox-kde.patch Fri Feb 07 22:10:42 2014 +0100
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1184 @@
+@@ -0,0 +1,1177 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -30,19 +30,19 @@
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
-+ title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
-+ title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
++ title="&mainWindow.title;"
++ title_normal="&mainWindow.title;"
+#ifdef XP_MACOSX
-+ title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
-+ titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
++ title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
++ titledefault="&mainWindow.title;"
+ titlemodifier=""
+ titlemodifier_normal=""
+ titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
+#else
-+ title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
-+ titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
-+ titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
-+ titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
++ title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
++ titlemodifier="&mainWindow.titlemodifier;"
++ titlemodifier_normal="&mainWindow.titlemodifier;"
++ titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
+#endif
+ titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
+ lightweightthemes="true"
@@ -143,7 +143,6 @@
+ footertype="promobox"
+ orient="vertical"
+ ignorekeys="true"
-+ consumeoutsideclicks="true"
+ hidden="true"
+ onpopupshown="StarUI.panelShown(event);"
+ aria-labelledby="editBookmarkPanelTitle">
@@ -192,7 +191,6 @@
+ <panel id="UITourTooltip"
+ type="arrow"
+ hidden="true"
-+ consumeoutsideclicks="false"
+ noautofocus="true"
+ align="start"
+ orient="vertical"
@@ -207,7 +205,6 @@
+ <panel id="socialActivatedNotification"
+ type="arrow"
+ hidden="true"
-+ consumeoutsideclicks="true"
+ align="start"
+ orient="horizontal"
+ role="alert">
@@ -238,7 +235,6 @@
+ orient="horizontal"
+ onpopupshowing="SocialShare.onShowing()"
+ onpopuphidden="SocialShare.onHidden()"
-+ consumeoutsideclicks="true"
+ hidden="true">
+ <vbox class="social-share-toolbar">
+ <vbox id="social-share-provider-buttons" flex="1"/>
@@ -259,7 +255,6 @@
+ hidden="true"
+ flip="slide"
+ rolluponmousewheel="true"
-+ consumeoutsideclicks="false"
+ noautofocus="true"
+ position="topcenter topright"/>
+
@@ -317,7 +312,6 @@
+ type="arrow"
+ hidden="true"
+ noautofocus="true"
-+ consumeoutsideclicks="true"
+ onpopupshown="if (event.target == this)
+ gIdentityHandler.onPopupShown(event);"
+ orient="vertical"
@@ -1106,7 +1100,6 @@
+ <vbox id="browser-bottombox" layer="true">
+ <notificationbox id="global-notificationbox"/>
+ <toolbar id="developer-toolbar"
-+ class="devtools-toolbar"
+ hidden="true">
+#ifdef XP_MACOSX
+ <toolbarbutton id="developer-toolbar-closebutton"
@@ -1324,13 +1317,13 @@
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
-@@ -8,10 +8,12 @@ USE_STATIC_LIBS = 1
+@@ -2,10 +2,12 @@
+ # 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
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
- DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
- -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\"
-
CXXFLAGS += $(TK_CFLAGS)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
@@ -1340,7 +1333,7 @@
diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
--- a/browser/components/shell/src/moz.build
+++ b/browser/components/shell/src/moz.build
-@@ -12,16 +12,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+@@ -10,16 +10,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
@@ -1349,12 +1342,12 @@
elif CONFIG['MOZ_WIDGET_GTK']:
SOURCES += [
'nsGNOMEShellService.cpp',
-+ 'nsKDEShellService.cpp',
-+ 'nsUnixShellService.cpp'
++ 'nsKDEShellService.cpp',
++ 'nsUnixShellService.cpp',
]
if SOURCES:
- LIBRARY_NAME = 'shellservice_s'
+ FINAL_LIBRARY = 'browsercomps'
EXTRA_COMPONENTS += [
'nsSetDefaultBrowser.js',
@@ -1772,7 +1765,7 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -613,19 +613,21 @@
+@@ -640,19 +640,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js