From 984905dc48b8e383b6600433cb64564b476f5fab Mon Sep 17 00:00:00 2001 From: Tigro Date: Thu, 5 May 2016 08:30:45 +0300 Subject: [PATCH] update to 46.0.1 --- .abf.yml | 2 +- firefox-45-kde.patch => firefox-46-kde.patch | 87 +++----------- firefox.spec | 6 +- mozilla-45-kde.patch => mozilla-46-kde.patch | 118 ++++++++++--------- 4 files changed, 82 insertions(+), 131 deletions(-) rename firefox-45-kde.patch => firefox-46-kde.patch (96%) rename mozilla-45-kde.patch => mozilla-46-kde.patch (97%) diff --git a/.abf.yml b/.abf.yml index 35f84ce..7749ae5 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - firefox-45.0.2.source.tar.xz: a4ca00cba9e351534b9c15b091deb10ed011fd30 + firefox-46.0.1.source.tar.xz: 6705d7d1561dfa156ddd3277dc4a901c4c982d82 diff --git a/firefox-45-kde.patch b/firefox-46-kde.patch similarity index 96% rename from firefox-45-kde.patch rename to firefox-46-kde.patch index 1f2048d..9671051 100644 --- a/firefox-45-kde.patch +++ b/firefox-46-kde.patch @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 25d63ce139ad6e957d2565e3b83d01dfa36ea314 +# Parent fd5629206dcf3f64d85ab177be6bc6076f0f1619 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,1181 @@ +@@ -0,0 +1,1175 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -16,7 +16,7 @@ new file mode 100644 + + + -+ ++ + + + @@ -617,9 +617,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,pocket-button,downloads-button,home-button,loop-button" ++ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button" +#else -+ defaultset="urlbar-container,search-container,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button" ++ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button" +#endif + customizationtarget="nav-bar-customization-target" + overflowable="true" @@ -795,7 +795,6 @@ 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"> + + -+ -+ + prefs; -+ nsCOMPtr pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); -+ if (pserve) -+ pserve->GetBranch("", getter_AddRefs(prefs)); -+ -+ if (prefs) -+ prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); -+ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsKDEShellService::SetShouldCheckDefaultBrowser(bool aShouldCheck) -+{ -+ nsCOMPtr prefs; -+ nsCOMPtr pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); -+ if (pserve) -+ pserve->GetBranch("", getter_AddRefs(prefs)); -+ -+ if (prefs) -+ prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); -+ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP +nsKDEShellService::GetCanSetDesktopBackground(bool* aResult) +{ + *aResult = true; @@ -1605,7 +1551,7 @@ diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/s new file mode 100644 --- /dev/null +++ b/browser/components/shell/nsKDEShellService.h -@@ -0,0 +1,29 @@ +@@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* 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 @@ -1614,16 +1560,17 @@ new file mode 100644 +#ifndef nskdeshellservice_h____ +#define nskdeshellservice_h____ + -+#include "nsIShellService.h" ++#include "nsIGNOMEShellService.h" +#include "nsStringAPI.h" +#include "mozilla/Attributes.h" + -+class nsKDEShellService final : public nsIShellService ++class nsKDEShellService final : public nsIGNOMEShellService +{ +public: + nsKDEShellService() : mCheckedThisSession(false) { } + + NS_DECL_ISUPPORTS ++ NS_DECL_NSIGNOMESHELLSERVICE + NS_DECL_NSISHELLSERVICE + + nsresult Init(); @@ -1676,7 +1623,7 @@ new file mode 100644 +#ifndef nsunixshellservice_h____ +#define nsunixshellservice_h____ + -+#include "nsIShellService.h" ++#include "nsIGNOMEShellService.h" + +NS_METHOD +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); @@ -1685,9 +1632,9 @@ new file mode 100644 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 -@@ -705,16 +705,17 @@ +@@ -703,16 +703,17 @@ + @RESPATH@/greprefs.js @RESPATH@/defaults/autoconfig/prefcalls.js - @RESPATH@/browser/defaults/profile/prefs.js @RESPATH@/browser/defaults/permissions ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) diff --git a/firefox.spec b/firefox.spec index 170a00e..05762ac 100644 --- a/firefox.spec +++ b/firefox.spec @@ -7,7 +7,7 @@ # This also means only STABLE upstream releases, NO betas. # This is a discussed topic. Please, do not flame it again. -%define major 45.0.2 +%define major 46.0.1 %define ff_epoch 0 # (tpg) set version HERE !!! %define realver %{major} @@ -46,8 +46,8 @@ Source9: kde.js Source1000: README.urpmi Patch10: firefox-3.5.3-default-mail-handler.patch # Patches for kde integration of FF -Patch11: firefox-45-kde.patch -Patch12: mozilla-45-kde.patch +Patch11: firefox-46-kde.patch +Patch12: mozilla-46-kde.patch #Patch13: mozilla-kde-background.patch Patch34: xulrunner_nojit.patch Patch35: firefox-37-build-with-time-independent-uuids.patch diff --git a/mozilla-45-kde.patch b/mozilla-46-kde.patch similarity index 97% rename from mozilla-45-kde.patch rename to mozilla-46-kde.patch index cd17990..6fcd8d1 100644 --- a/mozilla-45-kde.patch +++ b/mozilla-46-kde.patch @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 797d5f17b080f54439602f107ecaf6b09a0ef5c1 +# Parent 61cdc9af8ceaf75083e751e0d6497feddc26f7ba Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -9,7 +9,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp -@@ -30,16 +30,17 @@ +@@ -31,16 +31,17 @@ #include "nsIZipReader.h" #include "nsPrefBranch.h" #include "nsXPIDLString.h" @@ -27,7 +27,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp #include "prefread.h" #include "prefapi_private_data.h" -@@ -1136,16 +1137,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1135,16 +1136,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -62,7 +62,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp return NS_OK; bool hasMore; -@@ -1161,17 +1180,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1160,17 +1179,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp { nsZipItemPtr manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1265,26 +1284,38 @@ static nsresult pref_InitInitialObjects( +@@ -1264,24 +1283,36 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -91,9 +91,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp #elif defined(XP_UNIX) "unix.js" + , "" // placeholder for KDE (empty is otherwise harmless) - #if defined(VMS) - , "openvms.js" - #elif defined(_AIX) + #if defined(_AIX) , "aix.js" #endif #elif defined(XP_BEOS) @@ -189,7 +187,7 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build -@@ -65,15 +65,16 @@ if not CONFIG['MOZ_SUITE']: +@@ -64,15 +64,16 @@ if not CONFIG['MOZ_SUITE']: 'nsDownloadManagerUI.js', 'nsDownloadManagerUI.manifest', ] @@ -278,31 +276,31 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -64,29 +64,33 @@ toolkit.jar: +@@ -72,29 +72,33 @@ toolkit.jar: content/global/viewZoomOverlay.js - *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) + content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) content/global/bindings/browser.xml (widgets/browser.xml) content/global/bindings/button.xml (widgets/button.xml) content/global/bindings/checkbox.xml (widgets/checkbox.xml) content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml) - *+ content/global/bindings/dialog.xml (widgets/dialog.xml) -+*+ content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml) + * content/global/bindings/dialog.xml (widgets/dialog.xml) ++* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml) +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde content/global/bindings/editor.xml (widgets/editor.xml) content/global/bindings/expander.xml (widgets/expander.xml) - * content/global/bindings/filefield.xml (widgets/filefield.xml) - *+ content/global/bindings/findbar.xml (widgets/findbar.xml) + content/global/bindings/filefield.xml (widgets/filefield.xml) + * content/global/bindings/findbar.xml (widgets/findbar.xml) content/global/bindings/general.xml (widgets/general.xml) content/global/bindings/groupbox.xml (widgets/groupbox.xml) - *+ content/global/bindings/listbox.xml (widgets/listbox.xml) + content/global/bindings/listbox.xml (widgets/listbox.xml) content/global/bindings/menu.xml (widgets/menu.xml) content/global/bindings/menulist.xml (widgets/menulist.xml) content/global/bindings/notification.xml (widgets/notification.xml) content/global/bindings/numberbox.xml (widgets/numberbox.xml) content/global/bindings/popup.xml (widgets/popup.xml) - *+ content/global/bindings/preferences.xml (widgets/preferences.xml) -+*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml) + * content/global/bindings/preferences.xml (widgets/preferences.xml) ++* content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml) +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde content/global/bindings/progressmeter.xml (widgets/progressmeter.xml) content/global/bindings/radio.xml (widgets/radio.xml) @@ -316,7 +314,7 @@ diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/di new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,460 @@ +@@ -0,0 +1,463 @@ + +