Accepting request 501743 from GNOME:Factory
1 OBS-URL: https://build.opensuse.org/request/show/501743 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=128
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
723a0bdc2f
64
gnome-shell-portalhelper-fixes.patch
Normal file
64
gnome-shell-portalhelper-fixes.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From d104ebf6120a9396df4977763ebaf3624deeb6cb Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 18 May 2017 18:13:12 +0200
|
||||
Subject: portalHelper: Don't go through proxies for captive portals
|
||||
|
||||
When using an SSH tunnel (through a SOCKS proxy) to funnel all
|
||||
the outgoing traffic, we need the captive portal to not go through that
|
||||
proxy, otherwise we can't go through the proxy because we're not
|
||||
connected to the Internet and we can't go through the portal because
|
||||
we're not connected through the proxy.
|
||||
|
||||
This fixes a blank captive portal window and no error reporting in that
|
||||
particular configuration.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=769692
|
||||
---
|
||||
js/portalHelper/main.js | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
|
||||
index b721f6a..39e0c2b 100644
|
||||
--- a/js/portalHelper/main.js
|
||||
+++ b/js/portalHelper/main.js
|
||||
@@ -143,6 +143,7 @@ const PortalWindow = new Lang.Class({
|
||||
|
||||
this._webContext = WebKit.WebContext.new_ephemeral();
|
||||
this._webContext.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER);
|
||||
+ this._webContext.set_network_proxy_settings(WebKit.NetworkProxyMode.NO_PROXY, null);
|
||||
|
||||
this._webView = WebKit.WebView.new_with_context(this._webContext);
|
||||
this._webView.connect('decide-policy', Lang.bind(this, this._onDecidePolicy));
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
|
||||
From aa08bd75d086d275aab41f829e3ea40dbce7e9e9 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 31 May 2017 16:03:16 +0200
|
||||
Subject: portalHelper: Fix auth URI not being passed to window
|
||||
|
||||
Gjs-Message: JS WARNING: [resource:///org/gnome/shell/portalHelper/main.js 360]: reference to undefined property top.uri
|
||||
is caused by the URI variable actually being called "url".
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=783286
|
||||
---
|
||||
js/portalHelper/main.js | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
|
||||
index 39e0c2b..31ae969 100644
|
||||
--- a/js/portalHelper/main.js
|
||||
+++ b/js/portalHelper/main.js
|
||||
@@ -357,7 +357,7 @@ const WebPortalHelper = new Lang.Class({
|
||||
if (top.window != null)
|
||||
return;
|
||||
|
||||
- top.window = new PortalWindow(this, top.uri, top.timestamp, Lang.bind(this, function(result) {
|
||||
+ top.window = new PortalWindow(this, top.url, top.timestamp, Lang.bind(this, function(result) {
|
||||
this._dbusImpl.emit_signal('Done', new GLib.Variant('(ou)', [top.connection, result]));
|
||||
}));
|
||||
},
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 6 22:56:30 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Add gnome-shell-portalhelper-fixes.patch:
|
||||
+ Don't go through proxies for captive portals (bgo#769692).
|
||||
+ Fix auth URI not being passed to window (bgo#783286).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 11 15:32:55 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
@ -15,14 +22,14 @@ Thu May 11 15:32:55 UTC 2017 - zaitor@opensuse.org
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 26 02:22:44 UTC 2017 - qzheng@suse.com
|
||||
|
||||
- Add gnome-shell-login-fix-session-button-can-be-clicked.patch:
|
||||
Disable session selection button when it's hidden in user switch
|
||||
- Add gnome-shell-login-fix-session-button-can-be-clicked.patch:
|
||||
Disable session selection button when it's hidden in user switch
|
||||
dialog (bsc#1034584, bsc#1034827, bgo#781482).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 25 02:52:28 UTC 2017 - qzheng@suse.com
|
||||
|
||||
- rebase gnome-shell-gdm-login-applet.patch.
|
||||
- rebase gnome-shell-gdm-login-applet.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 15 21:50:44 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
@ -58,6 +58,8 @@ Patch11: gs-fate318433-prevent-same-account-multi-logins.patch
|
||||
Patch12: gnome-shell-sle-theme.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-login-fix-session-button-can-be-clicked.patch bsc#1034584 bsc#1034827 bgo#781482 xwang@suse.com -- Disable session selection button function when it does not display.
|
||||
Patch13: gnome-shell-login-fix-session-button-can-be-clicked.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-portalhelper-fixes.patch bgo#769692 bgo#783286 zaitor@opensuse.org -- Portalhelper fixes from upstream git
|
||||
Patch14: gnome-shell-portalhelper-fixes.patch
|
||||
## NOTE: Keep SLE Classic pathes at bottom.
|
||||
## NOTE: Keep SLE Classic pathes at bottom.
|
||||
# PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support
|
||||
@ -206,6 +208,7 @@ into GNOME Shell calendar.
|
||||
%endif
|
||||
%endif
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%if !0%{?is_opensuse}
|
||||
%patch1000 -p1
|
||||
translation-update-upstream
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user