Merge remote-tracking branch #483 (VENOM-483) into release-0.5.4

naxuroqa · Jan 22, 2019 · 28df523 · 28df523
2 parents d65ca95 + 0ada75b
commit 28df523
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,9 +42,9 @@ jobs:
       - run:
           name: Build and install toxcore
           command: |
-            wget "https://github.com/TokTok/c-toxcore/archive/v0.2.8.tar.gz"
-            tar -xzf v0.2.8.tar.gz
-            cd c-toxcore-0.2.8
+            wget "https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz"
+            tar -xzf v0.2.9.tar.gz
+            cd c-toxcore-0.2.9
             cmake -DCMAKE_INSTALL_PREFIX=/usr
             make
             make install

diff --git a/Dockerfile b/Dockerfile
@@ -1,30 +1,41 @@
-FROM ubuntu:latest
+FROM ubuntu:18.04
+
+RUN \
+  apt update && \
+  apt install -y software-properties-common gnupg && \
+  add-apt-repository ppa:vala-team/ppa -y
 
 RUN \
   apt-get update && \
-  apt-get -y upgrade && \
   apt-get install -y \
-    build-essential \
+    clang \
     cmake \
-    libgtk-3-dev \
-    libjson-glib-dev \
+    libconfig-dev \
+    libgtest-dev \
     libopus-dev \
     libsodium-dev \
-    libsoup2.4-dev \
-    libsqlcipher-dev \
     libvpx-dev \
+    pkg-config \
     libgee-0.8-dev \
     libgspell-1-dev \
+    libgtk-3-dev \
+    libjson-glib-dev \
+    libsoup2.4-dev \
+    libsqlcipher-dev \
     libcanberra-dev \
-    meson \
+    libgstreamer1.0-dev \
+    libgstreamer-plugins-base1.0-dev \
     valac \
+    python3-pip \
     wget
 
+RUN pip3 install meson ninja
+
 RUN rm -rf /var/lib/apt/lists/*
 
-RUN wget "https://github.com/TokTok/c-toxcore/archive/v0.2.8.tar.gz" && \
-  tar -xzf v0.2.8.tar.gz && \
-  cd c-toxcore-0.2.8 && \
+RUN wget "https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz" && \
+  tar -xzf v0.2.9.tar.gz && \
+  cd c-toxcore-0.2.9 && \
   cmake -DCMAKE_INSTALL_PREFIX=/usr && \
   make && \
   make install && \

diff --git a/com.github.naxuroqa.venom.yml b/com.github.naxuroqa.venom.yml
@@ -33,8 +33,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/sqlcipher/sqlcipher
-        tag: v3.4.2
-        commit: c6f709fca81c910ba133aaf6330c28e01ccfe5f8
+        tag: v4.0.1
+        commit: 27d58453c6e56c3dd85e02bca379161bc69c746a
         disable-fsckobjects: true
       - type: script
         dest-filename: autogen.sh
@@ -44,8 +44,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/jedisct1/libsodium
-        tag: 1.0.16
-        commit: 675149b9b8b66ff44152553fb3ebf9858128363d
+        tag: 1.0.17
+        commit: b732443c442239c2e0184820e9b23cca0de0828c
   - name: toxcore
     buildsystem: cmake
     config-opts:
@@ -54,8 +54,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/toktok/c-toxcore
-        tag: v0.2.8
-        commit: 3f35a84968f100e1e6d3c9df467fd3c82a9ebb13
+        tag: v0.2.9
+        commit: 98b754e1f22220f10196760389371dba6d139c6f
   - name: libgee
     build-options:
       env:
@@ -69,8 +69,8 @@ modules:
   - name: enchant
     sources:
       - type: archive
-        url: https://github.com/AbiWord/enchant/releases/download/v2.1.3/enchant-2.1.3.tar.gz
-        sha256: 086f37cdecd42eacd0e1dc291f5410d9ca2c5ed2cd9cd9367729e3d2d18a8550
+        url: https://github.com/AbiWord/enchant/releases/download/v2.2.3/enchant-2.2.3.tar.gz
+        sha256: abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d
   - name: gspell
     sources:
       - type: git