diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index e303f8e..da9cc7f 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jun 7 07:09:12 UTC 2015 - wr@rosenauer.org + +- update to Firefox 38.0.6 + * fixes bmo#1171730 which is not really relevant to oS builds +- fix KDE regression from 38.0.5 builds (bsc#933439) + ------------------------------------------------------------------- Sat May 23 21:13:49 UTC 2015 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 7d73b7c..4ebf1c0 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -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" diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index 47d8053..c9faeb6 100644 --- a/compare-locales.tar.xz +++ b/compare-locales.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c1fe834d0444ca621c835ee88d49fdb052e7fcf91c6e221183dfbaabdb4ddc8 -size 28420 +oid sha256:0cbb10f35168010d25744cee97c8cebfa0346f6fbd864b54b28e8be0cdc2c6f8 +size 28472 diff --git a/create-tar.sh b/create-tar.sh index af3bb09..3f1655d 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -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 diff --git a/firefox-38.0.5-source.tar.xz b/firefox-38.0.5-source.tar.xz deleted file mode 100644 index 2de8ccc..0000000 --- a/firefox-38.0.5-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d629054a89fd1365267493c1b19d51e112143bab89c13b6b69c032596bb1a4e0 -size 155461356 diff --git a/firefox-38.0.6-source.tar.xz b/firefox-38.0.6-source.tar.xz new file mode 100644 index 0000000..b6e82f9 --- /dev/null +++ b/firefox-38.0.6-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbd312631111b1cbee2b503161e8244849d5cdd613904fd9b6cd3ee66532e9b1 +size 155466612 diff --git a/firefox-kde.patch b/firefox-kde.patch index f9bdf26..2658c9a 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -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 + +# -*- Mode: HTML -*- @@ -738,9 +738,9 @@ new file mode 100644 + 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 @@ new file mode 100644 + 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"> + + ++ ++ + + ++