1 |
commit: 7d45fdaa97c80a7f8af89ac3d42b3b2e64ac98c7 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Sun Feb 20 16:14:19 2022 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 22 18:58:23 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d45fdaa |
7 |
|
8 |
www-client/seamonkey: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/24285 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../files/seamonkey-2.53.7-ownertab.patch | 236 --------------------- |
16 |
1 file changed, 236 deletions(-) |
17 |
|
18 |
diff --git a/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch b/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch |
19 |
deleted file mode 100644 |
20 |
index c0ae11ff076b..000000000000 |
21 |
--- a/www-client/seamonkey/files/seamonkey-2.53.7-ownertab.patch |
22 |
+++ /dev/null |
23 |
@@ -1,236 +0,0 @@ |
24 |
---- seamonkey-2.53.7/comm/suite/app/profile/suite-prefs.js |
25 |
-+++ seamonkey-2.53.7/comm/suite/app/profile/suite-prefs.js |
26 |
-@@ -225,16 +225,17 @@ pref("browser.tabs.autoHide", false); |
27 |
- pref("browser.tabs.forceHide", false); |
28 |
- pref("browser.tabs.closeWindowWithLastTab", true); |
29 |
- pref("browser.tabs.warnOnClose", true); |
30 |
- pref("browser.tabs.warnOnCloseOther", true); |
31 |
- pref("browser.tabs.warnOnOpen", true); |
32 |
- pref("browser.tabs.maxOpenBeforeWarn", 15); |
33 |
- pref("browser.tabs.insertRelatedAfterCurrent", true); |
34 |
- pref("browser.tabs.insertAllTabsAfterCurrent", false); |
35 |
-+pref("browser.tabs.selectOwnerOnClose", true); |
36 |
- |
37 |
- // For future use |
38 |
- pref("browser.tabs.loadBookmarksInBackground", false); |
39 |
- |
40 |
- // how many browsers can be saved in the DOM (by the tabbed browser) |
41 |
- pref("browser.tabs.max_tabs_undo", 3); |
42 |
- // should popups by saved in the DOM (by the tabbed browser) |
43 |
- pref("browser.tabs.cache_popups", false); |
44 |
---- seamonkey-2.53.7/comm/suite/base/content/utilityOverlay.js |
45 |
-+++ seamonkey-2.53.7/comm/suite/base/content/utilityOverlay.js |
46 |
-@@ -1624,21 +1624,23 @@ function openLinkIn(url, where, params) |
47 |
- // forces tab to be focused |
48 |
- loadInBackground = true; |
49 |
- // fall through |
50 |
- case "tabshifted": |
51 |
- loadInBackground = !loadInBackground; |
52 |
- // fall through |
53 |
- case "tab": |
54 |
- var browser = w.getBrowser(); |
55 |
-+ var owner = loadInBackground ? null : browser.selectedTab; |
56 |
- var tab = browser.addTab(url, { |
57 |
- referrerURI: aReferrerURI, |
58 |
- referrerPolicy: aReferrerPolicy, |
59 |
- charset: aCharset, |
60 |
- postData: aPostData, |
61 |
-+ ownerTab: owner, |
62 |
- allowThirdPartyFixup: aAllowThirdPartyFixup, |
63 |
- relatedToCurrent: aRelatedToCurrent, |
64 |
- allowMixedContent: aAllowMixedContent, |
65 |
- noReferrer: aNoReferrer, |
66 |
- userContextId: aUserContextId, |
67 |
- originPrincipal: aPrincipal, |
68 |
- triggeringPrincipal: aTriggeringPrincipal, |
69 |
- }); |
70 |
---- seamonkey-2.53.7/comm/suite/browser/tabbrowser.xml |
71 |
-+++ seamonkey-2.53.7/comm/suite/browser/tabbrowser.xml |
72 |
-@@ -1151,16 +1151,28 @@ |
73 |
- newBrowser.docShellIsActive = this.mCurrentTab.linkedBrowser.docShellIsActive; |
74 |
- if (this.mCurrentBrowser) { |
75 |
- this.mCurrentBrowser.droppedLinkHandler = null; |
76 |
- this.mCurrentBrowser.docShellIsActive = false; |
77 |
- this.mCurrentBrowser.removeAttribute("primary"); |
78 |
- this.finder.mListeners.forEach(l => this.mCurrentBrowser.finder.removeResultListener(l)); |
79 |
- } |
80 |
- |
81 |
-+ var oldTab = this.mCurrentTab; |
82 |
-+ |
83 |
-+ // Preview mode should not reset the owner |
84 |
-+ if (!this._previewMode && !oldTab.selected) |
85 |
-+ oldTab.owner = null; |
86 |
-+ |
87 |
-+ let lastRelatedTab = this.mLastRelatedIndex ? this.tabs[this.mLastRelatedIndex] : null; |
88 |
-+ if (lastRelatedTab) { |
89 |
-+ if (!lastRelatedTab.selected) |
90 |
-+ lastRelatedTab.owner = null; |
91 |
-+ } |
92 |
-+ |
93 |
- newBrowser.setAttribute("primary", "true"); |
94 |
- this.mCurrentBrowser = newBrowser; |
95 |
- this.mCurrentTab = this.selectedTab; |
96 |
- this.mCurrentTab.removeAttribute("unread"); |
97 |
- this.finder.mListeners.forEach(l => this.mCurrentBrowser.finder.addResultListener(l)); |
98 |
- |
99 |
- var tabListener = this.mTabListeners[this.tabContainer.selectedIndex]; |
100 |
- |
101 |
-@@ -1445,16 +1457,19 @@ |
102 |
- opener: null, |
103 |
- }; |
104 |
- } |
105 |
- |
106 |
- params.focusNewTab = params.inBackground != null ? |
107 |
- !params.inBackground : |
108 |
- !Services.prefs.getBoolPref("browser.tabs.loadInBackground"); |
109 |
- |
110 |
-+ if (params.focusNewTab) |
111 |
-+ params.ownerTab = this.selectedTab; |
112 |
-+ |
113 |
- return this.addTab(aURI, params); |
114 |
- ]]> |
115 |
- </body> |
116 |
- </method> |
117 |
- |
118 |
- <method name="loadTabs"> |
119 |
- <parameter name="aURIs"/> |
120 |
- <parameter name="aLoadInBackground"/> |
121 |
-@@ -1556,43 +1571,49 @@ |
122 |
- <parameter name="aPostData"/> |
123 |
- <parameter name="aFocusNewTab"/> |
124 |
- <parameter name="aAllowThirdPartyFixup"/> |
125 |
- <body> |
126 |
- <![CDATA[ |
127 |
- var aTriggeringPrincipal; |
128 |
- var aReferrerPolicy; |
129 |
- var aFromExternal; |
130 |
-+ var aOwner; |
131 |
- var aRelatedToCurrent; |
132 |
- var aAllowMixedContent; |
133 |
- var aNoReferrer; |
134 |
- var aUserContextId; |
135 |
- var aOriginPrincipal; |
136 |
- var aOpener; |
137 |
- if (arguments.length == 2 && |
138 |
- arguments[1] != null && |
139 |
- typeof arguments[1] == "object" && |
140 |
- !(arguments[1] instanceof Ci.nsIURI)) { |
141 |
- let params = arguments[1]; |
142 |
- aTriggeringPrincipal = params.triggeringPrincipal; |
143 |
- aReferrerURI = params.referrerURI; |
144 |
- aReferrerPolicy = params.referrerPolicy; |
145 |
- aCharset = params.charset; |
146 |
- aPostData = params.postData; |
147 |
-+ aOwner = params.ownerTab; |
148 |
- aFocusNewTab = params.focusNewTab; |
149 |
- aAllowThirdPartyFixup = params.allowThirdPartyFixup; |
150 |
- aFromExternal = params.fromExternal; |
151 |
- aRelatedToCurrent = params.relatedToCurrent; |
152 |
- aAllowMixedContent = params.allowMixedContent; |
153 |
- aNoReferrer = params.noReferrer; |
154 |
- aUserContextId = params.userContextId; |
155 |
- aOriginPrincipal = params.originPrincipal; |
156 |
- aOpener = params.opener; |
157 |
- } |
158 |
- |
159 |
-+ // if we're adding tabs, we're past interrupt mode, ditch the owner |
160 |
-+ if (this.mCurrentTab.owner) |
161 |
-+ this.mCurrentTab.owner = null; |
162 |
-+ |
163 |
- this._browsers = null; // invalidate cache |
164 |
- |
165 |
- var t = this.referenceTab.cloneNode(true); |
166 |
- |
167 |
- var blank = !aURI || aURI == "about:blank"; |
168 |
- |
169 |
- if (!blank) |
170 |
- t.setAttribute("label", aURI); |
171 |
-@@ -1640,16 +1661,20 @@ |
172 |
- |
173 |
- // We start our browsers out as inactive. |
174 |
- b.docShellIsActive = false; |
175 |
- |
176 |
- this.mStrip.collapsed = false; |
177 |
- |
178 |
- Services.prefs.setBoolPref("browser.tabs.forceHide", false); |
179 |
- |
180 |
-+ // If this new tab is owned by another, assert that relationship |
181 |
-+ if (aOwner) |
182 |
-+ t.owner = aOwner; |
183 |
-+ |
184 |
- // wire up a progress listener for the new browser object. |
185 |
- var position = this.tabs.length - 1; |
186 |
- var tabListener = this.mTabProgressListener(t, b, blank); |
187 |
- const filter = Cc["@mozilla.org/appshell/component/browser-status-filter;1"] |
188 |
- .createInstance(Ci.nsIWebProgress); |
189 |
- filter.addProgressListener(tabListener, Ci.nsIWebProgress.NOTIFY_ALL); |
190 |
- b.webProgress.addProgressListener(filter, Ci.nsIWebProgress.NOTIFY_ALL); |
191 |
- this.mTabListeners[position] = tabListener; |
192 |
-@@ -1689,16 +1714,20 @@ |
193 |
- // aReferrerURI is null or undefined if the tab is opened from |
194 |
- // an external application or bookmark, i.e. somewhere other |
195 |
- // than the current tab. |
196 |
- if ((aRelatedToCurrent || aReferrerURI || |
197 |
- Services.prefs.getBoolPref("browser.tabs.insertAllTabsAfterCurrent")) && |
198 |
- Services.prefs.getBoolPref("browser.tabs.insertRelatedAfterCurrent")) { |
199 |
- var lastRelatedIndex = this.mLastRelatedIndex || |
200 |
- this.tabContainer.selectedIndex; |
201 |
-+ if (this.mLastRelatedIndex) |
202 |
-+ this.tabs[this.mLastRelatedIndex].owner = null; |
203 |
-+ else |
204 |
-+ t.owner = this.selectedTab; |
205 |
- this.moveTabTo(t, ++lastRelatedIndex); |
206 |
- this.mLastRelatedIndex = lastRelatedIndex; |
207 |
- } |
208 |
- |
209 |
- if (aFocusNewTab) { |
210 |
- var parentTab = this.selectedTab; |
211 |
- this.selectedTab = t; |
212 |
- this.mPreviousTab = parentTab; |
213 |
-@@ -2007,16 +2036,23 @@ |
214 |
- oldBrowser.webProgress.removeProgressListener(filter); |
215 |
- filter.removeProgressListener(this.mTabListeners[index]); |
216 |
- this.mTabFilters.splice(index, 1); |
217 |
- this.mTabListeners.splice(index, 1); |
218 |
- |
219 |
- // We are no longer the primary content area |
220 |
- oldBrowser.removeAttribute("primary"); |
221 |
- |
222 |
-+ // Remove this tab as the owner of any other tabs, since it's going away. |
223 |
-+ for (let tab of this.tabs) { |
224 |
-+ if ("owner" in tab && tab.owner == aTab) |
225 |
-+ // |tab| is a child of the tab we're removing, make it an orphan |
226 |
-+ tab.owner = null; |
227 |
-+ } |
228 |
-+ |
229 |
- // Now select the new tab before nuking the old one. |
230 |
- var currentIndex = this.tabContainer.selectedIndex; |
231 |
- |
232 |
- var newIndex = -1; |
233 |
- if (currentIndex > index) |
234 |
- newIndex = currentIndex - 1; |
235 |
- else if (currentIndex < index) |
236 |
- newIndex = currentIndex; |
237 |
-@@ -2033,17 +2069,21 @@ |
238 |
- this._browsers = null; |
239 |
- |
240 |
- // Clean up before/afterselected attributes before removing the tab |
241 |
- aTab._selected = false; |
242 |
- aTab.remove(); |
243 |
- |
244 |
- // When the current tab is removed select a new tab |
245 |
- // and fire select events on tabpanels and tabs |
246 |
-- if (this.mPreviousTab && (aTab == this.mCurrentTab)) |
247 |
-+ if (aTab.owner && !aTab.owner.hidden && !aTab.owner.closing && |
248 |
-+ Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")) { |
249 |
-+ this.selectedTab = aTab.owner; |
250 |
-+ } |
251 |
-+ else if (this.mPreviousTab && (aTab == this.mCurrentTab)) |
252 |
- this.selectedTab = this.mPreviousTab; |
253 |
- else { |
254 |
- this.tabContainer.selectedIndex = newIndex; |
255 |
- |
256 |
- // We need to explicitly clear this, because updateCurrentBrowser |
257 |
- // doesn't get called for a background tab |
258 |
- this.mPreviousTab = null; |
259 |
- } |