Make the gnome-keyring patch actually work.

3 files changed, 78 insertions, 71 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 7c9fa09..7f244a5 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA256
 
 AUX pidgin-2.8.0-finch-icq.patch 602 RMD160 7aa3168c557985ef2f6f4381ff0b60d3bd9c4fd1 SHA1 1d1aaf53ef0a46d486c9746cff22cc0bfa855158 SHA256 15caf0a737fb9d1e6f02dbf567107abe7121bc79f18568c2216539b80dbc7d04
-AUX pidgin-gnome-keyring-1.patch 7457 RMD160 0d8345675a073c8585bf0be7678f52d63d14ec95 SHA1 b3dd0d336e4773578cc6e20dc9b317b27f383077 SHA256 f56bc4a1a678ad749848108ecef76f4bb2b16501908197bb645518e1a3027619
+AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221
 DIST pidgin-2.8.0.tar.bz2 9921362 RMD160 92bed10284e2d88e18dbabaa2eac214c938c9adb SHA1 c5b4f06fc88d57054953044c75563a473bb352fd SHA256 71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78
-EBUILD pidgin-2.8.0-r1.ebuild 7019 RMD160 91f4eed8a8132c4cf74268da2de9b9d82bfb192c SHA1 6bf3a1167b58935d504e8cf4b752f486b65877af SHA256 786de94f196e221b397e9d505c544cfc72b7a4662c349d6fcbe14d6a97d65d74
+EBUILD pidgin-2.8.0-r1.ebuild 7052 RMD160 3a0d0b52fe9f4017323e3c7bcec680ceebe996a0 SHA1 541cd1b1b606d02ec487cc438f2e30f11bc18a71 SHA256 9da15149b7003cd1554a55e9076429e37d06e0a4e4ef35bcbf0b3594e14a293b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN/gCJAAoJEHy/RO9cNQiDay4P/3FH28N9snDtnYfr+5VpRQRa
-jrmj7BVRYWYffnIP6cahY0Huc2Ony1uGLe1GRf+OKT2txVk922Pqm637IoVAVS4A
-gPkUrME0AneowYZeyt59T3pm0+ql/YHZYAdxna9fot23CeQs3s5jJrK6eiIjy9c0
-+lxblQC1M8oca+0AU0NJn/WHHG1W2vulFCHbOyoVSvh4hNnsQirD/qNi0YVm31Oh
-LoJOmBnJpJmQC0aHQZ3A834VLPzOjMot3F2xnqw8/cSptAzzVtNauD/8qtW6QETq
-OXPiggBbfebSxqgZrV+W6MjXDuR7eqksOCjTh3fTh9UTsjihgQxUtssXOLHzDQSG
-rnz+U6EaSECQFF98WpdKMh4A6uKIOcgjA87xvYiTraSahaArOvOVjfcaMSBJrKUk
-/AKwNGWQpzPT8O7l6fKgG1mtwcrZchZUHHHCKEJXtgclX24Urb0kiPbPSQgDF+Gw
-3WanXCTd4yh9VaolqrfEtp9Si+jhq1CMKj4vJ+NkC8ZaOC0FR40uFEfHfMiJsnKT
-eDCLE7W8W9G8OM60nLDvBLZO2NQezz/b+A9Llki10A73lam7tgYY+60EHqQWaPp+
-3pcovqRl868sOQ5Om8mg5j8Yuc8AXYb9IAeHGzdUOH+dKw4SjrzbTEwUBr+gKvRU
-nQw/cos6pPiiCCXBnSQ5
-=rNrw
+iQIcBAEBCAAGBQJN/1nDAAoJEHy/RO9cNQiDHF0P/3A59L+TG88ab8hBNs5IiUvM
+Vy03bV6+4M66PlwjoQvfuq8A9R+waWi+/1lHDP3+58Uf61ghN4te5myEqSbX41xZ
+Wz3Ys46m58uV80bT9rNGv4GBBL68V6DlERIuBF/cVVQfbnGMNC4SXxj2wzha/Hi7
+1rEQG2GjDEZq1LY9DPokxUb1O+ysK39YukhqmeMVEJKasMgWLcEidsvjPNKiq138
+eyf0Nnc3vwRVIXRBxxIbWCcgpzyBZY20TBV8yakvP1N0AUlmjc7CeEDyGPZbCq7P
+3BMiok/sP529L93Lqd7Fw3zIkzvu7vEMhuqNnk0ow0M6Hpjs8WsTd5BVAZE6I1Hm
+6bpLSjqzXbtauERLQkx6Xa20UpWs0cr+5LOBaIIhdh4h+PXk71TEDCdoFu70QTaM
+xSTRcjEGEgAz/WnRxF1minJRMdXq9Fnp3Qh93TRevttrzoVuVR4ceHPEPSNYGrou
+guw4rjs0ZoPmffS47+QJsHSmrwJZ2KSgM0NY1UrWet5B/qBLLrGSNvj06464LWZ/
+Kuihl5GK+GqPpr/4/GyGFWyVBA5MuTWaEdj39f9PNQv3fYya0S/QhXdAYJHNCXIH
+M8tn9B42rbuZ0Gcrl2nhpiuGodOahC004WvteDs09EOoabfBVyq2QZk9eGDsVcp2
+AvIANrqb7cUdCM/ryGGf
+=EtYT
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-gnome-keyring-1.patch b/net-im/pidgin/files/pidgin-gnome-keyring-2.patch
index fec338e..a15633c 100644
--- a/net-im/pidgin/files/pidgin-gnome-keyring-1.patch
+++ b/net-im/pidgin/files/pidgin-gnome-keyring-2.patch
@@ -1,7 +1,7 @@
-diff -ur pidgin-2.7.1.orig/configure.ac pidgin-2.7.1/configure.ac
---- pidgin-2.7.1.orig/configure.ac	2010-05-29 21:23:56.000000000 -0400
-+++ pidgin-2.7.1/configure.ac	2010-07-20 23:25:59.520998076 -0400
-@@ -2393,6 +2393,20 @@
+diff -ur pidgin-2.8.0.orig//configure.ac pidgin-2.8.0/configure.ac
+--- pidgin-2.8.0.orig//configure.ac	2011-06-07 04:44:40.000000000 -0400
++++ pidgin-2.8.0/configure.ac	2011-06-20 10:16:33.000000000 -0400
+@@ -2379,6 +2379,20 @@
  	LDFLAGS="$orig_LDFLAGS"
  fi
  
@@ -21,29 +21,11 @@ diff -ur pidgin-2.7.1.orig/configure.ac pidgin-2.7.1/configure.ac
 +
  AC_MSG_CHECKING(for me pot o' gold)
  AC_MSG_RESULT(no)
- AC_CHECK_FUNCS(gethostid lrand48)
-diff -ur pidgin-2.7.1.orig/libpurple/Makefile.am pidgin-2.7.1/libpurple/Makefile.am
---- pidgin-2.7.1.orig/libpurple/Makefile.am	2010-05-29 21:23:57.000000000 -0400
-+++ pidgin-2.7.1/libpurple/Makefile.am	2010-07-20 23:25:59.529007791 -0400
-@@ -307,6 +307,7 @@
- 	$(DBUS_LIBS) \
- 	$(GLIB_LIBS) \
- 	$(LIBXML_LIBS) \
-+	$(PIDGIN_KEYRING_LIBS) \
- 	$(NETWORKMANAGER_LIBS) \
- 	$(INTLLIBS) \
- 	$(FARSIGHT_LIBS) \
-@@ -323,6 +324,7 @@
- 	$(GLIB_CFLAGS) \
- 	$(DEBUG_CFLAGS) \
- 	$(DBUS_CFLAGS) \
-+	$(PIDGIN_KEYRING_CFLAGS) \
- 	$(LIBXML_CFLAGS) \
- 	$(FARSIGHT_CFLAGS) \
- 	$(GSTREAMER_CFLAGS) \
-diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
---- pidgin-2.7.1.orig/libpurple/account.c	2010-05-29 21:23:57.000000000 -0400
-+++ pidgin-2.7.1/libpurple/account.c	2010-07-20 23:25:59.528013217 -0400
+ AC_CHECK_FUNCS(gethostid lrand48 timegm)
+Only in pidgin-2.8.0: configure.ac.orig
+diff -ur pidgin-2.8.0.orig//libpurple/account.c pidgin-2.8.0/libpurple/account.c
+--- pidgin-2.8.0.orig//libpurple/account.c	2011-06-07 04:44:40.000000000 -0400
++++ pidgin-2.8.0/libpurple/account.c	2011-06-20 10:19:17.000000000 -0400
 @@ -49,6 +49,13 @@
  #define PURPLE_ACCOUNT_GET_PRIVATE(account) \
  	((PurpleAccountPrivate *) (account->priv))
@@ -51,19 +33,19 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
 +#ifdef PIDGIN_ENABLE_KEYRING
 +#include <gnome-keyring.h>
 +
-+static char * gaim_account_get_password_from_keyring (const char *_prpl, const char *_user);
-+static gboolean gaim_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *password);
++static char * pidgin_account_get_password_from_keyring (const char *_prpl, const char *_user);
++static gboolean pidgin_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *password);
 +#endif
 +
  /* TODO: Should use PurpleValue instead of this?  What about "ui"? */
  typedef struct
  {
-@@ -378,8 +385,13 @@
+@@ -379,8 +386,13 @@
  	if (purple_account_get_remember_password(account) &&
  		((tmp = purple_account_get_password(account)) != NULL))
  	{
 +#ifdef PIDGIN_ENABLE_KEYRING
-+                gaim_account_set_password_in_keyring( purple_account_get_protocol_id(account),
++                pidgin_account_set_password_in_keyring(purple_account_get_protocol_id(account),
 +                                          purple_account_get_username(account), tmp);
 +#else
  		child = xmlnode_new_child(node, "password");
@@ -72,7 +54,7 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
  	}
  
  	if ((tmp = purple_account_get_alias(account)) != NULL)
-@@ -828,17 +840,30 @@
+@@ -875,17 +887,30 @@
  	}
  
  	ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
@@ -89,7 +71,7 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
 -	}
 +        gboolean got_pwd = FALSE;
 +#ifdef PIDGIN_ENABLE_KEYRING
-+        data = gaim_account_get_password_from_keyring(protocol_id, name);
++        data = pidgin_account_get_password_from_keyring(protocol_id, name);
 +        if (data)
 +        {
 +                got_pwd = TRUE;
@@ -114,14 +96,14 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
  
  	/* Read the alias */
  	child = xmlnode_get_child(node, "alias");
-@@ -3064,3 +3089,61 @@
+@@ -3245,3 +3270,61 @@
  	purple_signals_disconnect_by_handle(handle);
  	purple_signals_unregister_by_instance(handle);
  }
 +
 +#ifdef PIDGIN_ENABLE_KEYRING
 +static char *
-+gaim_account_get_password_from_keyring(const char *_prpl, const char *_user)
++pidgin_account_get_password_from_keyring(const char *_prpl, const char *_user)
 +{
 +  GnomeKeyringNetworkPasswordData *found_item;
 +  GnomeKeyringResult               result;
@@ -156,7 +138,7 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
 +}
 +
 +static gboolean
-+gaim_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *_password)
++pidgin_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *_password)
 +{
 +  GnomeKeyringResult result;
 +  guint32            item_id;
@@ -176,28 +158,30 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
 +  return result == GNOME_KEYRING_RESULT_OK;
 +}
 +#endif
-diff -ur pidgin-2.7.1.orig/pidgin/Makefile.am pidgin-2.7.1/pidgin/Makefile.am
---- pidgin-2.7.1.orig/pidgin/Makefile.am	2010-05-29 21:24:00.000000000 -0400
-+++ pidgin-2.7.1/pidgin/Makefile.am	2010-07-20 23:25:59.530998309 -0400
-@@ -161,6 +161,7 @@
- 	$(GTKSPELL_LIBS) \
- 	$(STARTUP_NOTIFICATION_LIBS) \
+Only in pidgin-2.8.0/libpurple: account.c.orig
+diff -ur pidgin-2.8.0.orig//libpurple/Makefile.am pidgin-2.8.0/libpurple/Makefile.am
+--- pidgin-2.8.0.orig//libpurple/Makefile.am	2011-06-07 04:44:40.000000000 -0400
++++ pidgin-2.8.0/libpurple/Makefile.am	2011-06-20 10:16:33.000000000 -0400
+@@ -305,6 +305,7 @@
+ 	$(DBUS_LIBS) \
+ 	$(GLIB_LIBS) \
  	$(LIBXML_LIBS) \
 +	$(PIDGIN_KEYRING_LIBS) \
- 	$(GTK_LIBS) \
- 	$(top_builddir)/libpurple/libpurple.la
- 
-@@ -181,6 +182,7 @@
- 	$(GSTREAMER_CFLAGS) \
+ 	$(NETWORKMANAGER_LIBS) \
+ 	$(INTLLIBS) \
+ 	$(FARSIGHT_LIBS) \
+@@ -322,6 +323,7 @@
+ 	$(GLIB_CFLAGS) \
  	$(DEBUG_CFLAGS) \
- 	$(GTK_CFLAGS) \
-+	$(PIDGIN_KEYRING_CFLAGS) \
  	$(DBUS_CFLAGS) \
- 	$(GTKSPELL_CFLAGS) \
- 	$(STARTUP_NOTIFICATION_CFLAGS) \
-diff -ur pidgin-2.7.1.orig/pidgin/gtkmain.c pidgin-2.7.1/pidgin/gtkmain.c
---- pidgin-2.7.1.orig/pidgin/gtkmain.c	2010-05-29 21:24:00.000000000 -0400
-+++ pidgin-2.7.1/pidgin/gtkmain.c	2010-07-20 23:25:59.529007791 -0400
++	$(PIDGIN_KEYRING_CFLAGS) \
+ 	$(LIBXML_CFLAGS) \
+ 	$(FARSIGHT_CFLAGS) \
+ 	$(GSTREAMER_CFLAGS) \
+Only in pidgin-2.8.0/libpurple: Makefile.am.orig
+diff -ur pidgin-2.8.0.orig//pidgin/gtkmain.c pidgin-2.8.0/pidgin/gtkmain.c
+--- pidgin-2.8.0.orig//pidgin/gtkmain.c	2011-06-07 04:44:41.000000000 -0400
++++ pidgin-2.8.0/pidgin/gtkmain.c	2011-06-20 10:16:33.000000000 -0400
 @@ -70,6 +70,10 @@
  #include "pidginstock.h"
  #include "gtkwhiteboard.h"
@@ -209,7 +193,7 @@ diff -ur pidgin-2.7.1.orig/pidgin/gtkmain.c pidgin-2.7.1/pidgin/gtkmain.c
  #ifdef HAVE_SIGNAL_H
  # include <signal.h>
  #endif
-@@ -793,6 +797,12 @@
+@@ -742,6 +746,12 @@
  	gtk_rc_add_default_file(search_path);
  	g_free(search_path);
  
@@ -222,3 +206,24 @@ diff -ur pidgin-2.7.1.orig/pidgin/gtkmain.c pidgin-2.7.1/pidgin/gtkmain.c
  	gui_check = gtk_init_check(&argc, &argv);
  	if (!gui_check) {
  		char *display = gdk_get_display();
+Only in pidgin-2.8.0/pidgin: gtkmain.c.orig
+diff -ur pidgin-2.8.0.orig//pidgin/Makefile.am pidgin-2.8.0/pidgin/Makefile.am
+--- pidgin-2.8.0.orig//pidgin/Makefile.am	2011-06-07 04:44:41.000000000 -0400
++++ pidgin-2.8.0/pidgin/Makefile.am	2011-06-20 10:16:33.000000000 -0400
+@@ -157,6 +157,7 @@
+ 	$(INTLLIBS) \
+ 	$(GTKSPELL_LIBS) \
+ 	$(LIBXML_LIBS) \
++	$(PIDGIN_KEYRING_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(top_builddir)/libpurple/libpurple.la
+ 
+@@ -177,6 +178,7 @@
+ 	$(GSTREAMER_CFLAGS) \
+ 	$(DEBUG_CFLAGS) \
+ 	$(GTK_CFLAGS) \
++	$(PIDGIN_KEYRING_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(GTKSPELL_CFLAGS) \
+ 	$(LIBXML_CFLAGS) \
+Only in pidgin-2.8.0/pidgin: Makefile.am.orig
diff --git a/net-im/pidgin/pidgin-2.8.0-r1.ebuild b/net-im/pidgin/pidgin-2.8.0-r1.ebuild
index dca1a5a..b0db163 100644
--- a/net-im/pidgin/pidgin-2.8.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.8.0-r1.ebuild
@@ -131,7 +131,8 @@ src_prepare() {
 	# http://developer.pidgin.im/viewmtn/revision/diff/9e7616dbab2878bcc9f4b412bca1f55c903a337e/with/aebefd6d98382ce0f7b42b41e4bf2611044d4182/pidgin/plugins/gevolution/gevolution.c
 	sed 's:\<GTK_POLICY_AUTO\>:GTK_POLICY_AUTOMATIC:' -i pidgin/plugins/gevolution/gevolution.c || die
 	epatch "${FILESDIR}/${P}-finch-icq.patch"
-	epatch "${FILESDIR}"/${PN}-gnome-keyring-1.patch
+
+	epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
 	eautoreconf
 }
 
@@ -188,6 +189,7 @@ src_configure() {
 		$(use_enable dbus) \
 		$(use_enable meanwhile) \
 		$(use_enable gstreamer) \
+		$(use_enable gnome-keyring) \
 		$(use_enable gstreamer farsight) \
 		$(use_enable gstreamer vv) \
 		$(use_enable sasl cyrus-sasl ) \