clean up, bump version

4 files changed, 12 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61917635e4bb..c931ca680801 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Apr 11 11:28:56 UTC 2018
 pkgbase = slack-libpurple-git
 	pkgdesc = A purple-based (Pidgin) plugin for Slack.
-	pkgver = r150.b0f1550
+	pkgver = r200.be97802
 	pkgrel = 1
 	url = https://github.com/dylex/slack-libpurple.git
 	arch = i686
@@ -13,9 +11,7 @@ pkgbase = slack-libpurple-git
 	depends = json-parser-git
 	options = !strip
 	source = slack-libpurple::git+https://github.com/dylex/slack-libpurple.git
-	source = api-token-in-passwd.patch
 	sha256sums = SKIP
-	sha256sums = de4d34ba2985fbd582695c281d98ea171971325d95f7d39fb80881ed2f3a84d7
 
 pkgname = slack-libpurple-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..ddb5d48ab0f4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/src/
+/*.pkg.tar*
+
+/slack-libpurple/
+
diff --git a/PKGBUILD b/PKGBUILD
index ec044ccc2f13..825a57f7da11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,8 @@
+# Maintainer: Vasilii Novikov <n1dr+cm3513git@yaaa.ru>  (replace "aaa" with a single "a")
+# Contributor: sergej@aur.archlinux.org
+
 pkgname=slack-libpurple-git
-pkgver=r150.b0f1550
+pkgver=r200.be97802
 pkgver() {
   cd "$srcdir/slack-libpurple/"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -12,15 +15,8 @@ license=('GPL3')
 makedepends=('git')
 options=(!strip)
 depends=('libpurple' 'json-parser-git')
-source=('slack-libpurple::git+https://github.com/dylex/slack-libpurple.git'
-	'api-token-in-passwd.patch')
-sha256sums=('SKIP'
-            'de4d34ba2985fbd582695c281d98ea171971325d95f7d39fb80881ed2f3a84d7')
-
-prepare() {
-  cd "$srcdir/slack-libpurple/"
-  patch -p1 <"$srcdir"/api-token-in-passwd.patch
-}
+source=('slack-libpurple::git+https://github.com/dylex/slack-libpurple.git')
+sha256sums=('SKIP')
 
 build() {
   cd "$srcdir/slack-libpurple/"
diff --git a/api-token-in-passwd.patch b/api-token-in-passwd.patch
deleted file mode 100644
index 7301fad7554c..000000000000
--- a/api-token-in-passwd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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) {
-+			purple_connection_error_reason(gc,
-+				PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, "API token required");
-+			return;
-+		}
- 	}
- 
- 	SlackAccount *sa = g_new0(SlackAccount, 1);