Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
38.0.6 firefox38
authorWolfgang Rosenauer <wr@rosenauer.org>
Mon, 08 Jun 2015 08:23:10 +0200
branchfirefox38
changeset 854 74b775d6b911
parent 853 cf7e96afbe3a
child 855 1f860c829900
38.0.6 fix KDE integration: back button was broken
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/create-tar.sh file | annotate | diff | comparison | revisions
firefox-kde.patch file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Jun 03 18:54:11 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Jun 08 08:23:10 2015 +0200
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Sun Jun  7 07:09:12 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 38.0.6
+
+-------------------------------------------------------------------
 Sat May 23 21:13:49 UTC 2015 - wr@rosenauer.org
 
 - update to Firefox 38.0.5
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Jun 03 18:54:11 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Jun 08 08:23:10 2015 +0200
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 38
-%define mainver %major.0.5
+%define mainver %major.0.6
 %define update_channel release
-%define releasedate 2015052300
+%define releasedate 2015060500
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
--- a/MozillaFirefox/create-tar.sh	Wed Jun 03 18:54:11 2015 +0200
+++ b/MozillaFirefox/create-tar.sh	Mon Jun 08 08:23:10 2015 +0200
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_38_0_5_RELEASE"
-VERSION="38.0.5"
+RELEASE_TAG="FIREFOX_38_0_6_RELEASE"
+VERSION="38.0.6"
 
 # mozilla
 if [ -d mozilla ]; then
--- a/firefox-kde.patch	Wed Jun 03 18:54:11 2015 +0200
+++ b/firefox-kde.patch	Mon Jun 08 08:23:10 2015 +0200
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  db8f62578ee4614fc23c628b523e2bc7ae92ea04
+# Parent  14be97741eabce611c291418a4c1774cae8b29ff
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1302 @@
+@@ -0,0 +1,1311 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -738,9 +738,9 @@
 +             fullscreentoolbar="true" mode="icons" customizable="true"
 +             iconsize="small"
 +#ifdef MOZ_DEV_EDITION
-+             defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button"
++             defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button"
 +#else
-+             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button"
++             defaultset="urlbar-container,search-container,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button"
 +#endif
 +             customizationtarget="nav-bar-customization-target"
 +             overflowable="true"
@@ -890,6 +890,7 @@
 +                     oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
 +                     onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
 +                     onpopupshowing="BookmarkingUI.onPopupShowing(event);
++                                     BookmarkingUI.updatePocketItemVisibility('BMB_');
 +                                     BookmarkingUI.attachPlacesView(event, this);"
 +                     tooltip="bhTooltip" popupsinherittooltip="true">
 +            <menuitem id="BMB_viewBookmarksSidebar"
@@ -906,6 +907,11 @@
 +                      command="Browser:ShowAllBookmarks"
 +                      key="manBookmarkKb"/>
 +            <menuseparator/>
++            <menuitem id="BMB_pocket"
++                      class="menuitem-iconic bookmark-item subviewbutton"
++                      label="&pocketMenuitem.label;"
++                      oncommand="openUILink(Pocket.listURL, event);"/>
++            <menuseparator id="BMB_pocketSeparator"/>
 +            <menuitem id="BMB_subscribeToPageMenuitem"
 +#ifndef XP_MACOSX
 +                      class="menuitem-iconic subviewbutton"
@@ -1307,6 +1313,9 @@
 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
 +</deck>
 +
++<script type="application/javascript" src="chrome://browser/content/pocket/pktApi.js"/>
++<script type="application/javascript" src="chrome://browser/content/pocket/main.js"/>
++
 +</window>
 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
 --- a/browser/base/content/browser.xul
mozilla