Skip to content

Commit 7683619

Browse files
committed
VENOM-497: Fix compile errors
1 parent 9c79659 commit 7683619

File tree

2 files changed

+50
-1
lines changed

2 files changed

+50
-1
lines changed

.github/workflows/ci-workflow.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: VALA/C CI
2+
on: [push, pull_request]
3+
jobs:
4+
native:
5+
runs-on: ubuntu-18.04
6+
steps:
7+
- uses: actions/checkout@v2
8+
- uses: actions/setup-python@v1
9+
- name: Install meson
10+
run: |
11+
sudo python3 -m pip install --upgrade pip
12+
sudo pip3 install meson ninja
13+
- name: Install dependencies
14+
run: >
15+
sudo apt-get -qq install -y
16+
clang
17+
cmake
18+
libconfig-dev
19+
libgtest-dev
20+
libopus-dev
21+
libsodium-dev
22+
libvpx-dev
23+
pkg-config
24+
libgee-0.8-dev
25+
libgspell-1-dev
26+
libgtk-3-dev
27+
libjson-glib-dev
28+
libsoup2.4-dev
29+
libsqlcipher-dev
30+
libcanberra-dev
31+
libgstreamer1.0-dev
32+
libgstreamer-plugins-base1.0-dev
33+
valac
34+
wget
35+
- name: Build and install ToxCore
36+
run: |
37+
wget "https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz"
38+
tar -xzf v0.2.9.tar.gz
39+
cd c-toxcore-0.2.9
40+
cmake -DCMAKE_INSTALL_PREFIX=/usr
41+
make
42+
sudo make install
43+
cd ..
44+
- name: Build
45+
run: meson build && ninja -C build
46+
- name: Test
47+
run: ninja -C build test
48+
- name: Install
49+
run: sudo ninja -C build install

src/tox/ToxSessionThread.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace Venom {
3838
protected GLib.MainContext worker_context;
3939
protected GLib.MainLoop worker_loop;
4040

41-
public ToxBaseThread(string name, Logger logger) {
41+
protected ToxBaseThread(string name, Logger logger) {
4242
this.name = name;
4343
this.logger = logger;
4444
}

0 commit comments

Comments
 (0)