upd

3 files changed, 13 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e393e49c06a5..61917635e4bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Sep 14 07:56:22 UTC 2017
+# Wed Apr 11 11:28:56 UTC 2018
 pkgbase = slack-libpurple-git
 	pkgdesc = A purple-based (Pidgin) plugin for Slack.
-	pkgver = r83.d933332
+	pkgver = r150.b0f1550
 	pkgrel = 1
 	url = https://github.com/dylex/slack-libpurple.git
 	arch = i686
@@ -15,7 +15,7 @@ pkgbase = slack-libpurple-git
 	source = slack-libpurple::git+https://github.com/dylex/slack-libpurple.git
 	source = api-token-in-passwd.patch
 	sha256sums = SKIP
-	sha256sums = ee48127cd4d08643f72c6f6e0be9c86a9d7390d24c9a5aaa9d1ce05cf95cb3e9
+	sha256sums = de4d34ba2985fbd582695c281d98ea171971325d95f7d39fb80881ed2f3a84d7
 
 pkgname = slack-libpurple-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 682c9ea1eecc..ec044ccc2f13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=slack-libpurple-git
-pkgver=r83.d933332
+pkgver=r150.b0f1550
 pkgver() {
   cd "$srcdir/slack-libpurple/"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -15,7 +15,7 @@ depends=('libpurple' 'json-parser-git')
 source=('slack-libpurple::git+https://github.com/dylex/slack-libpurple.git'
 	'api-token-in-passwd.patch')
 sha256sums=('SKIP'
-            'ee48127cd4d08643f72c6f6e0be9c86a9d7390d24c9a5aaa9d1ce05cf95cb3e9')
+            'de4d34ba2985fbd582695c281d98ea171971325d95f7d39fb80881ed2f3a84d7')
 
 prepare() {
   cd "$srcdir/slack-libpurple/"
diff --git a/api-token-in-passwd.patch b/api-token-in-passwd.patch
index 570f5e17b73d..7301fad7554c 100644
--- a/api-token-in-passwd.patch
+++ b/api-token-in-passwd.patch
@@ -1,17 +1,15 @@
-diff --git a/slack.c b/slack.c
-index 0e03a0e..a3f434f 100644
---- a/slack.c
-+++ b/slack.c
-@@ -87,9 +87,13 @@ static void slack_login(PurpleAccount *account) {
- 	const gchar *token = purple_account_get_string(account, "api_token", NULL);
- 	if (!token || !*token)
- 	{
+diff -ur slack-libpurple/slack.c slack-libpurple.my/slack.c
+--- slack-libpurple/slack.c	2018-04-11 14:25:26.285284792 +0300
++++ slack-libpurple.my/slack.c	2018-04-11 14:24:53.674286197 +0300
+@@ -111,9 +111,12 @@
+ 		token = purple_account_get_password(account);
+ 	}
+ 	if (!token || !*token) {
 -		purple_connection_error_reason(gc,
 -			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, "API token required");
 -		return;
 +		token = purple_account_get_password(account);
-+		if (!token || !*token)
-+		{
++		if (!token || !*token) {
 +			purple_connection_error_reason(gc,
 +				PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, "API token required");
 +			return;