[arch-commits] Commit in network-manager-applet/trunk (2 files)

[Jan Steffens]

    Date: Thursday, March 3, 2011 @ 12:44:39
  Author: heftig
Revision: 112075

upgpkg: network-manager-applet 0.8.3.997-1
Update to 0.8.3.997

Modified:
  network-manager-applet/trunk/PKGBUILD
Deleted:
  network-manager-applet/trunk/0001-editor-fix-usage-of-nm_connection_update_secrets.patch

-------------------------------------------------------------+
 0001-editor-fix-usage-of-nm_connection_update_secrets.patch |   27 ----------
 PKGBUILD                                                    |   13 +---
 2 files changed, 4 insertions(+), 36 deletions(-)

Deleted: 0001-editor-fix-usage-of-nm_connection_update_secrets.patch
===================================================================
--- 0001-editor-fix-usage-of-nm_connection_update_secrets.patch	2011-03-03 17:44:23 UTC (rev 112074)
+++ 0001-editor-fix-usage-of-nm_connection_update_secrets.patch	2011-03-03 17:44:39 UTC (rev 112075)
@@ -1,27 +0,0 @@
-From abba62fe1c22422bb84f12875fd3612b90ead434 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw at redhat.com>
-Date: Mon, 28 Feb 2011 08:14:30 -0600
-Subject: [PATCH] editor: fix usage of nm_connection_update_secrets()
-
-It takes the string:GValue hash of one settings' secrets, not
-the hash of all settings.  Use it correctly.
----
- src/connection-editor/ce-page.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
-index 79730b0..b97e8c0 100644
---- a/src/connection-editor/ce-page.c
-+++ b/src/connection-editor/ce-page.c
-@@ -210,7 +210,7 @@ ce_page_complete_init (CEPage *self,
- 	/* Update the connection with the new secrets */
- 	if (nm_connection_update_secrets (self->connection,
- 	                                  setting_name,
--	                                  secrets,
-+	                                  setting_hash,
- 	                                  &update_error)) {
- 		/* Success */
- 		emit_initialized (self, NULL);
--- 
-1.7.4.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-03 17:44:23 UTC (rev 112074)
+++ PKGBUILD	2011-03-03 17:44:39 UTC (rev 112075)
@@ -6,8 +6,8 @@
 # Contributor: Will Rea <sillywilly at gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.8.3.996
-pkgrel=2
+pkgver=0.8.3.997
+pkgrel=1
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,17 +19,12 @@
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool')
 install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-${pkgver}.tar.bz2
-        0001-editor-fix-usage-of-nm_connection_update_secrets.patch)
-sha256sums=('717d8a6fb905e8759978d2e77828300edf7145240f65bc2a5d80adabc349510e'
-            'da41e8b7d36f35cb8adab03874601c90f08d3ac22401839fc77b954588c9d38a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('fa20ab72bd3d3a52824f0b89ffaa4cb9f70d7e915c57b4fc30bf43a84498b180')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Fix editing system connections
-  patch -Np1 -i "$srcdir/0001-editor-fix-usage-of-nm_connection_update_secrets.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib/networkmanager \