[arch-commits] Commit in networkmanager-pptp/trunk (2 files)

[Ionuț Mircea Bîru]

    Date: Tuesday, July 8, 2014 @ 17:05:14
  Author: ioni
Revision: 216632

update to 0.9.10.0

Modified:
  networkmanager-pptp/trunk/PKGBUILD
Deleted:
  networkmanager-pptp/trunk/gtk_table_to_gtk_grid.patch

-----------------------------+
 PKGBUILD                    |   17 +++++------------
 gtk_table_to_gtk_grid.patch |   40 ----------------------------------------
 2 files changed, 5 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-08 15:04:40 UTC (rev 216631)
+++ PKGBUILD	2014-07-08 15:05:14 UTC (rev 216632)
@@ -2,8 +2,8 @@
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=networkmanager-pptp
-pkgver=0.9.8.4
-pkgrel=3
+pkgver=0.9.10.0
+pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -10,19 +10,12 @@
 url="http://www.gnome.org/projects/NetworkManager/"
 _pppver=2.4.6
 depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring' "ppp=$_pppver")
-makedepends=('intltool')
+makedepends=('intltool' 'network-manager-applet')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
-        gtk_table_to_gtk_grid.patch)
-sha256sums=('97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8'
-            '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
+sha256sums=('564b16c9b2821a1d2ede06f56f4db5cb0d62ccb35f87c92ad6c636ed48e0af58')
 
-prepare() {
-  cd NetworkManager-pptp-${pkgver}
-  patch -Np1 -i ../gtk_table_to_gtk_grid.patch
-}
-
 build() {
   cd NetworkManager-pptp-${pkgver}
   ./configure --prefix=/usr \

Deleted: gtk_table_to_gtk_grid.patch
===================================================================
--- gtk_table_to_gtk_grid.patch	2014-07-08 15:04:40 UTC (rev 216631)
+++ gtk_table_to_gtk_grid.patch	2014-07-08 15:05:14 UTC (rev 216632)
@@ -1,40 +0,0 @@
-From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre at canonical.com>
-Subject: Port GtkTable uses to GtkGrid.
-
-Index: network-manager-pptp/auth-dialog/vpn-password-dialog.c
-===================================================================
---- network-manager-pptp.orig/auth-dialog/vpn-password-dialog.c	2012-02-15 11:24:03.803503000 -0500
-+++ network-manager-pptp/auth-dialog/vpn-password-dialog.c	2012-02-15 11:30:20.344710680 -0500
-@@ -124,8 +124,8 @@
- 	label = gtk_label_new_with_mnemonic (label_text);
- 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- 
--	gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, row, row + 1);
--	gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, row, row + 1);
-+	gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
-+	gtk_grid_attach (GTK_GRID (table), entry, 1, row, 1, 1);
- 
- 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
- }
-@@ -154,7 +154,7 @@
- 	if (priv->show_password_secondary)
- 		add_row (priv->table, row++, priv->secondary_password_label,  priv->password_entry_secondary);
- 
--	gtk_table_attach_defaults (GTK_TABLE (priv->table), priv->show_passwords_checkbox, 1, 2, row, row + 1);
-+	gtk_grid_attach (GTK_GRID (priv->table), priv->show_passwords_checkbox, 1, row, 1, 1);
- 
- 	gtk_widget_show_all (priv->table);
- }
-@@ -228,9 +228,9 @@
- 
- 	priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- 
--	priv->table = gtk_table_new (4, 2, FALSE);
--	gtk_table_set_col_spacings (GTK_TABLE (priv->table), 12);
--	gtk_table_set_row_spacings (GTK_TABLE (priv->table), 6);
-+	priv->table = gtk_grid_new ();
-+	gtk_grid_set_column_spacing (GTK_GRID (priv->table), 12);
-+	gtk_grid_set_row_spacing (GTK_GRID (priv->table), 6);
- 	gtk_container_add (GTK_CONTAINER (priv->table_alignment), priv->table);
- 
- 	priv->password_entry = gtk_entry_new ();