--- a/firefox-kde.patch Sat May 03 10:14:44 2014 +0200
+++ b/firefox-kde.patch Wed May 28 22:17:03 2014 +0200
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1213 @@
+@@ -0,0 +1,1197 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -554,7 +554,7 @@
+ iconsize="small"
+ aria-label="&tabsToolbar.label;"
+ context="toolbar-context-menu"
-+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
++ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button"
+ collapsed="true">
+
+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
@@ -605,13 +605,6 @@
+ </menupopup>
+ </toolbarbutton>
+
-+ <toolbarbutton id="tabs-closebutton"
-+ class="close-button tabs-closebutton close-icon"
-+ command="cmd_close"
-+ label="&closeTab.label;"
-+ cui-areatype="toolbar"
-+ tooltiptext="&closeTab.label;"/>
-+
+#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
+ <hbox class="private-browsing-indicator" skipintoolbarset="true"/>
+#endif
@@ -651,7 +644,7 @@
+
+ <hbox id="nav-bar-customization-target" flex="1">
+ <toolbaritem id="urlbar-container" flex="400" persist="width"
-+ forwarddisabled="true" title="&locationItem.title;" removable="false"
++ title="&locationItem.title;" removable="false"
+ cui-areatype="toolbar"
+ class="chromeclass-location" overflows="false">
+ <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -661,21 +654,14 @@
+ onclick="checkForMiddleClick(this, event);"
+ tooltip="back-button-tooltip"
+ context="backForwardMenu"/>
-+ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-+ label="&forwardCmd.label;"
-+ command="Browser:ForwardOrForwardDuplicate"
-+ cui-areatype="toolbar"
-+ onclick="checkForMiddleClick(this, event);"
-+ tooltip="forward-button-tooltip"
-+ context="backForwardMenu"/>
-+ <dummyobservertarget hidden="true"
-+ onbroadcast="if (this.getAttribute('disabled') == 'true')
-+ this.parentNode.setAttribute('forwarddisabled', 'true');
-+ else
-+ this.parentNode.removeAttribute('forwarddisabled');">
-+ <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
-+ </dummyobservertarget>
-+ <hbox id="urlbar-wrapper" flex="1" align="center">
++ <hbox id="urlbar-wrapper" flex="1">
++ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++ label="&forwardCmd.label;"
++ command="Browser:ForwardOrForwardDuplicate"
++ cui-areatype="toolbar"
++ onclick="checkForMiddleClick(this, event);"
++ tooltip="forward-button-tooltip"
++ context="backForwardMenu"/>
+ <textbox id="urlbar" flex="1"
+ placeholder="&urlbar.placeholder2;"
+ type="autocomplete"
@@ -713,6 +699,8 @@
+ <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
++ <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
++ <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/>
+ </box>
+ <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag events.
@@ -810,6 +798,12 @@
+ oncommand="toggleSidebar('viewBookmarksSidebar');">
+ <observes element="viewBookmarksSidebar" attribute="checked"/>
+ </menuitem>
++ <!-- NB: temporary solution for bug 985024, this should go away soon. -->
++ <menuitem id="BMB_bookmarksShowAllTop"
++ class="menuitem-iconic subviewbutton"
++ label="&showAllBookmarks2.label;"
++ command="Browser:ShowAllBookmarks"
++ key="manBookmarkKb"/>
+ <menuseparator/>
+ <menuitem id="BMB_subscribeToPageMenuitem"
+#ifndef XP_MACOSX
@@ -961,7 +955,6 @@
+ collapsed="true"
+ customizable="true">
+ <toolbaritem id="personal-bookmarks"
-+ flex="1"
+ title="&bookmarksToolbarItem.label;"
+ cui-areatype="toolbar"
+ removable="true">
@@ -1064,7 +1057,7 @@
+ <sidebarheader id="sidebar-header" align="center">
+ <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
+ <image id="sidebar-throbber"/>
-+ <toolbarbutton class="tabs-closebutton close-icon" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
++ <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
+ </sidebarheader>
+ <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
+ style="min-width: 14em; width: 18em; max-width: 36em;"/>
@@ -1191,22 +1184,13 @@
+
+ <svg:svg height="0">
+#include tab-shape.inc.svg
-+
++ <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
+#ifndef XP_MACOSX
-+ <svg:clipPath id="keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
-+ <svg:path d="m 0,0 c .3,.25 .3,.75, 0,1 l 1,0 0,-1 z"/>
-+ </svg:clipPath>
-+ <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
-+ <svg:path d="m 0,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/>
++ <svg:path d="m 1,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/>
++#else
++ <svg:path d="M -11,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
++#endif
+ </svg:clipPath>
-+#else
-+ <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse">
-+ <svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
-+ </svg:clipPath>
-+ <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
-+ <svg:path d="M -12,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
-+ </svg:clipPath>
-+#endif
+ </svg:svg>
+
+</vbox>
@@ -1219,7 +1203,7 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -66,16 +66,18 @@ browser.jar:
+@@ -65,16 +65,18 @@ browser.jar:
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
@@ -1233,11 +1217,11 @@
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul)
content/browser/content.js (content/content.js)
+ content/browser/fonts/ClearSans-Regular.woff (content/fonts/ClearSans-Regular.woff)
+ content/browser/fonts/FiraSans-Regular.woff (content/fonts/FiraSans-Regular.woff)
+ content/browser/fonts/FiraSans-Light.woff (content/fonts/FiraSans-Light.woff)
content/browser/newtab/newTab.xul (content/newtab/newTab.xul)
* content/browser/newtab/newTab.js (content/newtab/newTab.js)
- content/browser/newtab/newTab.css (content/newtab/newTab.css)
- content/browser/newtab/preloaderContent.js (content/newtab/preloaderContent.js)
- * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -1301,7 +1285,7 @@
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
-@@ -24,16 +24,22 @@ var gAdvancedPane = {
+@@ -25,16 +25,22 @@ var gAdvancedPane = {
if (extraArgs && extraArgs["advancedTab"]){
advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
} else {
@@ -1324,7 +1308,7 @@
// when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open.
-@@ -903,14 +909,25 @@ var gAdvancedPane = {
+@@ -884,14 +890,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser.
*/
setDefaultBrowser: function()
@@ -1801,7 +1785,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
-@@ -641,19 +641,21 @@
+@@ -643,19 +643,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js