init

3 files changed, 75 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..9bc36b03df6b
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,21 @@
+# Generated by mksrcinfo v8
+# Fri Aug 11 17:00:40 UTC 2017
+pkgbase = slack-libpurple-git
+	pkgdesc = A purple-based (Pidgin) plugin for Slack.
+	pkgver = r70.f1238fd
+	pkgrel = 1
+	url = https://github.com/dylex/slack-libpurple.git
+	arch = i686
+	arch = x86_64
+	license = GPL3
+	makedepends = git
+	depends = libpurple
+	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 = ee48127cd4d08643f72c6f6e0be9c86a9d7390d24c9a5aaa9d1ce05cf95cb3e9
+
+pkgname = slack-libpurple-git
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..0ed2a6ecc0c5
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,33 @@
+pkgname=slack-libpurple-git
+pkgver=r70.f1238fd
+pkgver() {
+  cd "$srcdir/slack-libpurple/"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+pkgrel=1
+pkgdesc="A purple-based (Pidgin) plugin for Slack."
+url='https://github.com/dylex/slack-libpurple.git'
+arch=('i686' 'x86_64')
+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'
+            'ee48127cd4d08643f72c6f6e0be9c86a9d7390d24c9a5aaa9d1ce05cf95cb3e9')
+
+prepare() {
+  cd "$srcdir/slack-libpurple/"
+  patch -p1 <"$srcdir"/api-token-in-passwd.patch
+}
+
+build() {
+  cd "$srcdir/slack-libpurple/"
+  make
+}
+
+package() {
+  cd "$srcdir/slack-libpurple/"
+  install -Dm755 libslack.so "$pkgdir/usr/lib/purple-2/libslack.so"
+}
diff --git a/api-token-in-passwd.patch b/api-token-in-passwd.patch
new file mode 100644
index 000000000000..570f5e17b73d
--- /dev/null
+++ b/api-token-in-passwd.patch
@@ -0,0 +1,21 @@
+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)
+ 	{
+-		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);