From 09f8a96085587f0d32d1d5bc71b3f829a4abeb4b Mon Sep 17 00:00:00 2001
From: Nick Thomas <me@ur.gs>
Date: Mon, 7 May 2018 01:44:30 +0100
Subject: [PATCH] Get CI working

---
 .gitattributes                      |  2 ++
 .gitignore                          |  5 +++++
 .gitlab-ci.yml                      | 18 +++++++++++++++++-
 README.md                           | 13 +++++++------
 vendor/deltachat-core-master.tar.gz |  3 +++
 vendor/libetpan-1.8.tar.gz          |  3 +++
 6 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 vendor/deltachat-core-master.tar.gz
 create mode 100644 vendor/libetpan-1.8.tar.gz

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..7ae8c20
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+vendor/libetpan-1.8.tar.gz filter=lfs diff=lfs merge=lfs -text
+vendor/deltachat-core-master.tar.gz filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
index 60739e7..98e2c81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 /libdelta.so
+/libetpan.so
+/libdeltachat.so
+/libnetpgp.so
+/vendor/deltachat-core-master
+/vendor/libetpan-1.8
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c9f91a..489ff26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,24 @@ Debian 9:
   image: debian:stretch
   script:
     - apt update
-    - apt install --no-install-recommends -yy build-essential libpurple-dev
+    # libetpan
+    # FIXME: libetpan 1.16 is available in Debian, but we need 1.17+: https://github.com/deltachat/deltachat-core/issues/157
+    # TODO: it can take libcurl as well. Do we need it?
+    - apt install --no-install-recommends -yy build-essential autoconf automake libtool libdb-dev libexpat1-dev libsasl2-dev libssl1.0-dev
+    - cd vendor && tar -xvzf libetpan-1.8.tar.gz && cd libetpan-1.8 && ./autogen.sh && ./configure && make && make install && cd ../..
+    - cp /usr/local/lib/libetpan.so libetpan.so
+    # deltachat-core
+    - apt install --no-install-recommends -yy meson ninja-build pkg-config zlib1g-dev libsqlite3-dev libsasl2-dev libssl1.0-dev libbz2-dev
+    - cd vendor && tar -xvzf deltachat-core-master.tar.gz && cd deltachat-core-master && mkdir builddir && cd builddir && meson && ninja && ninja install && cd ../../..
+    - cp /usr/local/lib/x86_64-linux-gnu/libdeltachat.so libdeltachat.so
+    - cp /usr/local/lib/x86_64-linux-gnu/libnetpgp.so libnetpgp.so
+    # purple-plugin-delta
+    - apt install --no-install-recommends -yy libpurple-dev libsoup2.4-dev libglib2.0-dev
     - make
   artifacts:
     paths:
+      - libetpan.so
+      - libdeltachat.so
+      - libnetpgp.so
       - libdelta.so
+
diff --git a/README.md b/README.md
index 6490268..5737590 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,10 @@ Very basic instructions at present. First, `deltachat-core` isn't packaged, so
 you'll need to build and install it according to
 [these instructions](https://github.com/deltachat/deltachat-core/blob/master/README.md#build).
 
-Now, you'll need the libpurple build dependencies:
+Now, you'll need some other build dependencies:
 
 ```
-sudo apt install libpurple-dev build-essential
+sudo apt install build-essential libpurple-dev libsoup2.4-dev libglib2.0-dev
 ```
 
 Finally, run `make` to create a `libdelta.so` file.
@@ -30,6 +30,11 @@ The easiest way to use this is to copy the `libdelta.so` file into
 `~/.purple/plugins`. When running pidgin, you'll now have the option to add
 a "Delta Chat" account.
 
+If it doesn't show up, chances are pidgin can't find the various shared
+libraries the .so depends on. You can run `ldd ~/.purple/plugins/libdelta.so`
+to confirm. I'll document fixing this after the build and install system is
+settled.
+
 At present, the "Username" and "Password" account fields correspond to email
 address and password, respectively. Many important settings also show up on the
 "Advanced" tab - if left blank, the plugin will attempt to automatically detect
@@ -40,9 +45,5 @@ Run pidgin with `--debug` to see interesting output.
 
 ## Limitations
 
-NOTHING IS DONE YET.
-
-Once that's fixed:
-
 There's no facility at present to import account keys, so sharing an email
 address between your mobile and desktop isn't amazing. It's high on the agenda.
diff --git a/vendor/deltachat-core-master.tar.gz b/vendor/deltachat-core-master.tar.gz
new file mode 100644
index 0000000..97ad98c
--- /dev/null
+++ b/vendor/deltachat-core-master.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd4628f680b06ca702bec2dc8953f66e97f4a39d2bec07b46674b0d248a663ee
+size 3041849
diff --git a/vendor/libetpan-1.8.tar.gz b/vendor/libetpan-1.8.tar.gz
new file mode 100644
index 0000000..dc45da0
--- /dev/null
+++ b/vendor/libetpan-1.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e67a7b4abadcf3cc16fa16e1621a68e54d489dadfd9a7d1f960c172e953b6eb
+size 6188927