summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-shell/Makefile4
-rw-r--r--x11/gnome-shell/files/patch-js_ui_extensionSystem.js82
-rw-r--r--x11/gnome-shell/files/patch-js_ui_main.js26
-rw-r--r--x11/gnome-shell/files/patch-js_ui_networkAgent.js10
-rw-r--r--x11/gnome-shell/files/patch-js_ui_panel.js23
5 files changed, 143 insertions, 2 deletions
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index df1579a00..0eac29601 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -3,12 +3,12 @@
# Whom: Pawel Worach <pawel.worach@gmail.com>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-shell/Makefile,v 1.45 2011/10/23 09:06:48 kwm Exp $
+# $MCom: ports/x11/gnome-shell/Makefile,v 1.46 2011/11/12 14:54:38 kwm Exp $
#
PORTNAME= gnome-shell
PORTVERSION= 3.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/x11/gnome-shell/files/patch-js_ui_extensionSystem.js b/x11/gnome-shell/files/patch-js_ui_extensionSystem.js
new file mode 100644
index 000000000..dc68dd1a2
--- /dev/null
+++ b/x11/gnome-shell/files/patch-js_ui_extensionSystem.js
@@ -0,0 +1,82 @@
+--- js/ui/extensionSystem.js.orig 2011-12-15 16:07:45.000000000 +0100
++++ js/ui/extensionSystem.js 2011-12-15 16:30:19.000000000 +0100
+@@ -8,7 +8,6 @@
+ const Gio = imports.gi.Gio;
+ const St = imports.gi.St;
+ const Shell = imports.gi.Shell;
+-const Soup = imports.gi.Soup;
+
+ const Config = imports.misc.config;
+ const FileUtils = imports.misc.fileUtils;
+@@ -37,15 +36,10 @@
+ const REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
+ const REPOSITORY_URL_INFO = REPOSITORY_URL_BASE + '/extension-info/';
+
+-const _httpSession = new Soup.SessionAsync();
+-
+ // The unfortunate state of gjs, gobject-introspection and libsoup
+ // means that I have to do a hack to add a feature.
+ // See: https://bugzilla.gnome.org/show_bug.cgi?id=655189 for context.
+
+-if (Soup.Session.prototype.add_feature != null)
+- Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
+-
+ function _getCertFile() {
+ let localCert = GLib.build_filenamev([global.userdatadir, 'extensions.gnome.org.crt']);
+ if (GLib.file_test(localCert, GLib.FileTest.EXISTS))
+@@ -54,8 +48,6 @@
+ return Config.SHELL_SYSTEM_CA_FILE;
+ }
+
+-_httpSession.ssl_ca_file = _getCertFile();
+-
+ // Maps uuid -> metadata object
+ const extensionMeta = {};
+ // Maps uuid -> importer object (extension directory tree)
+@@ -117,14 +109,6 @@
+ shell_version: Config.PACKAGE_VERSION,
+ api_version: API_VERSION.toString() };
+
+- let message = Soup.form_request_new_from_hash('GET', REPOSITORY_URL_INFO, params);
+-
+- _httpSession.queue_message(message,
+- function(session, message) {
+- let info = JSON.parse(message.response_body.data);
+- let dialog = new InstallExtensionDialog(uuid, version_tag, info.name);
+- dialog.open(global.get_current_time());
+- });
+ }
+
+ function uninstallExtensionFromUUID(uuid) {
+@@ -159,10 +143,6 @@
+ }
+
+ function gotExtensionZipFile(session, message, uuid) {
+- if (message.status_code != Soup.KnownStatusCode.OK) {
+- logExtensionError(uuid, 'downloading extension: ' + message.status_code);
+- return;
+- }
+
+ // FIXME: use a GFile mkstemp-type method once one exists
+ let fd, tmpzip;
+@@ -175,7 +155,6 @@
+
+ let stream = new Gio.UnixOutputStream({ fd: fd });
+ let dir = userExtensionsDir.get_child(uuid);
+- Shell.write_soup_message_to_stream(stream, message);
+ stream.close(null);
+ let [success, pid] = GLib.spawn_async(null,
+ ['unzip', '-uod', dir.get_path(), '--', tmpzip],
+@@ -519,12 +498,6 @@
+ api_version: API_VERSION.toString() };
+
+ let url = REPOSITORY_URL_DOWNLOAD.format(this._uuid);
+- let message = Soup.form_request_new_from_hash('GET', url, params);
+-
+- _httpSession.queue_message(message,
+- Lang.bind(this, function(session, message) {
+- gotExtensionZipFile(session, message, this._uuid);
+- }));
+
+ this.close(global.get_current_time());
+ }
diff --git a/x11/gnome-shell/files/patch-js_ui_main.js b/x11/gnome-shell/files/patch-js_ui_main.js
new file mode 100644
index 000000000..548ee0089
--- /dev/null
+++ b/x11/gnome-shell/files/patch-js_ui_main.js
@@ -0,0 +1,26 @@
+--- js/ui/main.js.orig 2011-12-15 15:54:58.000000000 +0100
++++ js/ui/main.js 2011-12-15 15:55:25.000000000 +0100
+@@ -27,7 +27,6 @@ const PlaceDisplay = imports.ui.placeDis
+ const RunDialog = imports.ui.runDialog;
+ const Layout = imports.ui.layout;
+ const LookingGlass = imports.ui.lookingGlass;
+-const NetworkAgent = imports.ui.networkAgent;
+ const NotificationDaemon = imports.ui.notificationDaemon;
+ const WindowAttentionHandler = imports.ui.windowAttentionHandler;
+ const Scripting = imports.ui.scripting;
+@@ -66,7 +65,6 @@ let xdndHandler = null;
+ let statusIconDispatcher = null;
+ let keyboard = null;
+ let layoutManager = null;
+-let networkAgent = null;
+ let _errorLogStack = [];
+ let _startDate;
+ let _defaultCssStylesheet = null;
+@@ -84,7 +82,6 @@ function _createUserSession() {
+ telepathyClient = new TelepathyClient.Client();
+ automountManager = new AutomountManager.AutomountManager();
+ autorunManager = new AutorunManager.AutorunManager();
+- networkAgent = new NetworkAgent.NetworkAgent();
+ }
+
+ function _createGDMSession() {
diff --git a/x11/gnome-shell/files/patch-js_ui_networkAgent.js b/x11/gnome-shell/files/patch-js_ui_networkAgent.js
new file mode 100644
index 000000000..19bc94dd6
--- /dev/null
+++ b/x11/gnome-shell/files/patch-js_ui_networkAgent.js
@@ -0,0 +1,10 @@
+--- js/ui/networkAgent.js.orig 2011-12-15 15:55:59.000000000 +0100
++++ js/ui/networkAgent.js 2011-12-15 15:56:24.000000000 +0100
+@@ -22,7 +22,6 @@
+ const Clutter = imports.gi.Clutter;
+ const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+-const NetworkManager = imports.gi.NetworkManager;
+ const NMClient = imports.gi.NMClient;
+ const Pango = imports.gi.Pango;
+ const Shell = imports.gi.Shell;
diff --git a/x11/gnome-shell/files/patch-js_ui_panel.js b/x11/gnome-shell/files/patch-js_ui_panel.js
new file mode 100644
index 000000000..1bd215d8f
--- /dev/null
+++ b/x11/gnome-shell/files/patch-js_ui_panel.js
@@ -0,0 +1,23 @@
+--- js/ui/panel.js.orig 2011-12-15 15:57:12.000000000 +0100
++++ js/ui/panel.js 2011-12-15 15:57:42.000000000 +0100
+@@ -27,7 +27,7 @@ const BUTTON_DND_ACTIVATION_TIMEOUT = 25
+ const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
+ const SPINNER_ANIMATION_TIME = 0.2;
+
+-const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery', 'userMenu'];
++const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'battery', 'userMenu'];
+ const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
+ 'a11y': imports.ui.status.accessibility.ATIndicator,
+ 'volume': imports.ui.status.volume.Indicator,
+@@ -39,11 +39,6 @@ const STANDARD_STATUS_AREA_SHELL_IMPLEME
+ if (Config.HAVE_BLUETOOTH)
+ STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
+
+-try {
+- STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
+-} catch(e) {
+- log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+-}
+
+ const GDM_STATUS_AREA_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'battery', 'powerMenu'];
+ const GDM_STATUS_AREA_SHELL_IMPLEMENTATION = {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 05:56:56 +0800