From 3d10c151ce9d0ef338eaf434f48a499e052fce60 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 25 May 2011 21:52:19 +0200 Subject: [PATCH] gnome-shell: update to 3.0.2. --- ...ling-of-AP-flags-and-enhance-for-802.patch | 80 ------------------- ...ff-by-one-when-incrementally-adding-.patch | 31 ------- srcpkgs/gnome-shell/template | 6 +- 3 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 srcpkgs/gnome-shell/patches/0001-network-fix-handling-of-AP-flags-and-enhance-for-802.patch delete mode 100644 srcpkgs/gnome-shell/patches/appDisplay-Fix-off-by-one-when-incrementally-adding-.patch diff --git a/srcpkgs/gnome-shell/patches/0001-network-fix-handling-of-AP-flags-and-enhance-for-802.patch b/srcpkgs/gnome-shell/patches/0001-network-fix-handling-of-AP-flags-and-enhance-for-802.patch deleted file mode 100644 index 2296d37c89..0000000000 --- a/srcpkgs/gnome-shell/patches/0001-network-fix-handling-of-AP-flags-and-enhance-for-802.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 101a07a3d79223cc153a6c65f22acd76cbae4818 Mon Sep 17 00:00:00 2001 -From: Dan Williams -Date: Tue, 3 May 2011 12:21:45 -0500 -Subject: [PATCH 1/3] network: fix handling of AP flags and enhance for 802.1x - -All WPA APs were getting set as WPA2 due to the check for privacy; -WPA/WPA2 APs *must* set the Privacy bit according to the standard, -so we'd never end up in the case for NMAccessPointSecurity.WPA. - -Fix that, and also add flags for WPA[2] Enterprise which we'll -use a bit later for the first-time connect case for 802.1x enabled -access points. ---- - js/ui/status/network.js | 38 +++++++++++++++++++++----------------- - 1 files changed, 21 insertions(+), 17 deletions(-) - -diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index bf8e272..6f0cdac 100644 ---- a/js/ui/status/network.js -+++ b/js/ui/status/network.js -@@ -33,8 +33,10 @@ const NMAccessPointSecurity = { - UNKNOWN: 0, - NONE: 1, - WEP: 2, -- WPA: 3, -- WPA2: 4 -+ WPA_PSK: 3, -+ WPA2_PSK: 4, -+ WPA_ENT: 5, -+ WPA2_ENT: 6 - }; - - // small optimization, to avoid using [] all the time -@@ -1129,26 +1131,28 @@ NMDeviceWireless.prototype = { - _getApSecurityType: function(accessPoint) { - if (accessPoint._secType) - return accessPoint._secType; -- // XXX: have this checked by someone familiar with IEEE 802.1x - - let flags = accessPoint.flags; - let wpa_flags = accessPoint.wpa_flags; - let rsn_flags = accessPoint.rsn_flags; - let type; -- if ( !(flags & NM80211ApFlags.PRIVACY) -- && (wpa_flags == NM80211ApSecurityFlags.NONE) -- && (rsn_flags == NM80211ApSecurityFlags.NONE)) -- type = NMAccessPointSecurity.NONE; -- else if ( (flags & NM80211ApFlags.PRIVACY) -- && (wpa_flags == NM80211ApSecurityFlags.NONE) -- && (rsn_flags == NM80211ApSecurityFlags.NONE)) -- type = NMAccessPointSecurity.WEP; -- else if ( !(flags & NM80211ApFlags.PRIVACY) -- && (wpa_flags != NM80211ApSecurity.NONE) -- && (rsn_flags != NM80211ApSecurity.NONE)) -- type = NMAccessPointSecurity.WPA; -- else -- type = NMAccessPointSecurity.WPA2; -+ if (rsn_flags != NM80211ApSecurityFlags.NONE) { -+ /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */ -+ if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X) -+ type = NMAccessPointSecurity.WPA2_ENT; -+ else if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK) -+ type = NMAccessPointSecurity.WPA2_PSK; -+ } else if (wpa_flags != NM80211ApSecurityFlags.NONE) { -+ if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X) -+ type = NMAccessPointSecurity.WPA_ENT; -+ else if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK) -+ type = NMAccessPointSecurity.WPA_PSK; -+ } else { -+ if (flags & NM80211ApFlags.PRIVACY) -+ type = NMAccessPointSecurity.WEP; -+ else -+ type = NMAccessPointSecurity.NONE; -+ } - - // cache the found value to avoid checking flags all the time - accessPoint._secType = type; --- -1.7.5 - diff --git a/srcpkgs/gnome-shell/patches/appDisplay-Fix-off-by-one-when-incrementally-adding-.patch b/srcpkgs/gnome-shell/patches/appDisplay-Fix-off-by-one-when-incrementally-adding-.patch deleted file mode 100644 index 4329abb501..0000000000 --- a/srcpkgs/gnome-shell/patches/appDisplay-Fix-off-by-one-when-incrementally-adding-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4e9ef93c0691dab6d90935353e6de981cbddac54 Mon Sep 17 00:00:00 2001 -From: Owen W. Taylor -Date: Wed, 27 Apr 2011 07:50:10 -0400 -Subject: [PATCH] appDisplay: Fix off-by-one when incrementally adding - application icons - -A "cosmetic" code arrangement I requested in code review resulted -in one too few items being removed from the queue for each incremental -chunk of icons added. Fix. - -https://bugzilla.gnome.org/show_bug.cgi?id=648739 ---- - js/ui/appDisplay.js | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js -index cd502ef..6fe12a4 100644 ---- a/js/ui/appDisplay.js -+++ b/js/ui/appDisplay.js -@@ -126,7 +126,7 @@ AlphabeticalView.prototype = { - if (currentTimeMillis - startTimeMillis > MAX_APPLICATION_WORK_MILLIS) - break; - } -- this._pendingAppIds.splice(0, i); -+ this._pendingAppIds.splice(0, i + 1); - if (this._pendingAppIds.length > 0) { - return true; - } else { --- -1.7.4.4 - diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 5f3a552a28..83a52328d7 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,15 +1,13 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.0.1 -revision=1 -patch_args="-Np1" +version=3.0.2 distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-schemas-install --disable-schemas-compile --localstatedir=/var --with-gconf-schema-file-dir=/usr/share/gconf/schemas" short_desc="GNOME core user interface" maintainer="Juan RP " -checksum=01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079 +checksum=a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95 long_desc=" GNOME Shell provides core user interface functions for the GNOME 3 desktop, like switching to windows and launching applications. GNOME Shell takes