Date: Saturday, November 17, 2012 @ 06:07:54 Author: ibiru Revision: 171363
fix auth dialog path FS#32730 Added: networkmanager-pptp/trunk/fix-path-to-auth-dialog.patch networkmanager-pptp/trunk/gtk_table_to_gtk_grid.patch Modified: networkmanager-pptp/trunk/PKGBUILD -------------------------------+ PKGBUILD | 12 +++++++++--- fix-path-to-auth-dialog.patch | 26 ++++++++++++++++++++++++++ gtk_table_to_gtk_grid.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-11-17 09:56:22 UTC (rev 171362) +++ PKGBUILD 2012-11-17 11:07:54 UTC (rev 171363) @@ -3,7 +3,7 @@ pkgname=networkmanager-pptp pkgver=0.9.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64') license=('GPL') @@ -13,11 +13,17 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4') +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz + fix-path-to-auth-dialog.patch + gtk_table_to_gtk_grid.patch) +sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4' + '35f9c2cb4d046c8f215617e1a0bfd8551965bd0655af0cd25f89c17ea5e9081a' + '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215') build() { cd NetworkManager-pptp-${pkgver} + patch -Np1 -i ../fix-path-to-auth-dialog.patch + patch -Np1 -i ../gtk_table_to_gtk_grid.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ Added: fix-path-to-auth-dialog.patch =================================================================== --- fix-path-to-auth-dialog.patch (rev 0) +++ fix-path-to-auth-dialog.patch 2012-11-17 11:07:54 UTC (rev 171363) @@ -0,0 +1,26 @@ +From a2f52d4455bd81732b6b3c16bdab206c56818c07 Mon Sep 17 00:00:00 2001 +From: Clemens Buchacher <dri...@aon.at> +Date: Sun, 1 Jul 2012 18:35:50 +0200 +Subject: [PATCH] fix path to auth-dialog + + +Signed-off-by: Clemens Buchacher <dri...@aon.at> +--- + nm-pptp-service.name.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in +index 9ee79b8..ea5f0e5 100644 +--- a/nm-pptp-service.name.in ++++ b/nm-pptp-service.name.in +@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.pptp + program=@LIBEXECDIR@/nm-pptp-service + + [GNOME] +-auth-dialog=nm-pptp-auth-dialog ++auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog + properties=libnm-pptp-properties + supports-external-ui-mode=true +-- +1.7.11.1 + Added: gtk_table_to_gtk_grid.patch =================================================================== --- gtk_table_to_gtk_grid.patch (rev 0) +++ gtk_table_to_gtk_grid.patch 2012-11-17 11:07:54 UTC (rev 171363) @@ -0,0 +1,40 @@ +From: Mathieu Trudel-Lapierre <mathieu.trudel-lapie...@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 ();