From e55323c98e891db41cb2c6c9651288d3298732cd Mon Sep 17 00:00:00 2001
From: naxuroqa <naxuroqa@gmail.com>
Date: Sun, 1 Mar 2020 11:01:52 +0100
Subject: [PATCH] VENOM-497: Fix compile errors

---
 .circleci/config.yml               | 24 ++++++-------
 .github/workflows/ci-workflow.yaml | 54 ++++++++++++++++++++++++++++++
 .travis.yml                        |  8 ++---
 src/tox/ToxSessionThread.vala      |  2 +-
 4 files changed, 71 insertions(+), 17 deletions(-)
 create mode 100644 .github/workflows/ci-workflow.yaml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9602682..aad4d80 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -78,9 +78,9 @@ commands:
       - run:
           name: Build and install toxcore
           command: |
-            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
+            wget "https://github.com/TokTok/c-toxcore/archive/v0.2.11.tar.gz"
+            tar -xzf v0.2.11.tar.gz
+            cd c-toxcore-0.2.11
             cmake -DCMAKE_INSTALL_PREFIX=/usr
             make
             make install
@@ -108,9 +108,9 @@ jobs:
       - debian-install-deps
       - install-toxcore
       - install-venom
-  "Ubuntu 18-10":
+  "Ubuntu 19-10":
     docker:
-      - image: ubuntu:18.10
+      - image: ubuntu:19.10
     steps:
       - checkout
       - debian-install-deps
@@ -133,17 +133,17 @@ jobs:
       - debian-install-deps
       - install-toxcore
       - install-venom
-  "Fedora 28":
+  "Fedora 30":
     docker:
-      - image: fedora:28
+      - image: fedora:30
     steps:
       - checkout
       - fedora-install-deps
       - install-toxcore
       - install-venom
-  "Fedora 29":
+  "Fedora 31":
     docker:
-      - image: fedora:29
+      - image: fedora:31
     steps:
       - checkout
       - fedora-install-deps
@@ -187,9 +187,9 @@ workflows:
   build:
     jobs:
       - "Ubuntu 18-04"
-      - "Ubuntu 18-10"
+      - "Ubuntu 19-10"
       - "Debian 9"
       - "Debian 10"
-      - "Fedora 28"
-      - "Fedora 29"
+      - "Fedora 30"
+      - "Fedora 31"
       - "Flatpak"
diff --git a/.github/workflows/ci-workflow.yaml b/.github/workflows/ci-workflow.yaml
new file mode 100644
index 0000000..1443f7c
--- /dev/null
+++ b/.github/workflows/ci-workflow.yaml
@@ -0,0 +1,54 @@
+name: VALA/C CI
+on: pull_request
+  push:
+    branches:
+      - develop
+      - master
+      - 'release-*'
+jobs:
+  native:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+    - name: Install meson
+      run: |
+        sudo python3 -m pip install --upgrade pip
+        sudo pip3 install meson ninja
+    - name: Install dependencies
+      run: >
+        sudo apt-get -qq install -y
+        clang
+        cmake
+        libconfig-dev
+        libgtest-dev
+        libopus-dev
+        libsodium-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
+        libgstreamer1.0-dev
+        libgstreamer-plugins-base1.0-dev
+        valac
+        wget
+    - name: Build and install ToxCore
+      run: |
+        wget "https://github.com/TokTok/c-toxcore/archive/v0.2.11.tar.gz"
+        tar -xzf v0.2.11.tar.gz
+        cd c-toxcore-0.2.11
+        cmake -DCMAKE_INSTALL_PREFIX=/usr
+        make
+        sudo make install
+        cd ..
+    - name: Build
+      run: meson build && ninja -C build
+    - name: Test
+      run: ninja -C build test
+    - name: Install
+      run: sudo ninja -C build install
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index d7be91d..705ae99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
   include:
   - name: "Ubuntu 18.04"
     env: DOCKER_IMAGE=ubuntu:18.04
-  - name: "Ubuntu 18.10"
+  - name: "Ubuntu 19.10"
     env: DOCKER_IMAGE=ubuntu:18.10
   - name: "Debian 10"
     env: DOCKER_IMAGE=debian:buster
@@ -52,9 +52,9 @@ install:
       wget
       > /dev/null
   - docker exec image pip3 install meson ninja
-  - docker exec image bash -c "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
+  - docker exec image bash -c "wget 'https://github.com/TokTok/c-toxcore/archive/v0.2.11.tar.gz'
+      && tar -xzf v0.2.11.tar.gz
+      && cd c-toxcore-0.2.11
       && cmake -DCMAKE_INSTALL_PREFIX=/usr
       && make
       && make install"
diff --git a/src/tox/ToxSessionThread.vala b/src/tox/ToxSessionThread.vala
index 89ecbbb..29f42e9 100644
--- a/src/tox/ToxSessionThread.vala
+++ b/src/tox/ToxSessionThread.vala
@@ -38,7 +38,7 @@ namespace Venom {
     protected GLib.MainContext worker_context;
     protected GLib.MainLoop worker_loop;
 
-    public ToxBaseThread(string name, Logger logger) {
+    protected ToxBaseThread(string name, Logger logger) {
       this.name = name;
       this.logger = logger;
     }