Skip to content

Commit

Permalink
Try to fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
SkyzohKey committed Mar 20, 2017
1 parent 5905126 commit fc1baa5
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 3 deletions.
1 change: 1 addition & 0 deletions .bzrignore
Expand Up @@ -3,6 +3,7 @@ build/*
build-*/*
.buildconfig
*.proj
.tags

# Glade temp files.
*.ui~
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -3,6 +3,7 @@ build/*
build-*/*
.buildconfig
*.proj
.tags

# Glade temp files.
*.ui~
Expand Down
48 changes: 47 additions & 1 deletion misc/build-linux.sh
Expand Up @@ -4,17 +4,63 @@ function install_deps {
sudo add-apt-repository -y ppa:vala-team/ppa
sudo add-apt-repository -y ppa:rebuntu16/glade-3.19+-trusty
sudo apt-get update

# Packages needed for building, linting, etc...
sudo apt-get install -y build-essential vala-0.30 valac libgtk-3-dev libjson-glib-dev libsoup2.4-dev
sudo apt-get install -y libtool autotools-dev checkinstall check git yasm
sudo apt-get install -y libgdbm-dev libncurses5-dev automake libtool bison libffi-dev

install_ruby
install_libsodium
install_libvpx
install_libopus
install_libtoxcore
}

function install_ruby {
# Ruby is needed to lint code.
sudo apt-get install libgdbm-dev libncurses5-dev automake libtool bison libffi-dev
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
curl -sSL https://get.rvm.io | bash -s stable
source ~/.rvm/scripts/rvm
rvm install 2.4.0
rvm use 2.4.0 --default
ruby -v
}
function install_libsodium {
git clone https://github.com/jedisct1/libsodium.git
cd libsodium
git checkout tags/1.0.11
./autogen.sh
./configure && make check
sudo checkinstall --install --pkgname libsodium --pkgversion 1.0.0 --nodoc
sudo ldconfig
cd ..
}
function install_libvpx {
git clone https://chromium.googlesource.com/webm/libvpx
cd libvpx
./configure
make -j3
sudo make install
cd ..
}
function install_libopus {
wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
tar xvzf opus-1.0.3.tar.gz
cd opus-1.0.3
./configure
make -j3
sudo make install
cd ..
}
function install_libtoxcore {
git clone https://github.com/TokTok/c-toxcore.git c-toxcore
cd c-toxcore
autoreconf -i
./configure
make
sudo make install
}

function build {
mkdir -p build/
Expand Down
4 changes: 3 additions & 1 deletion src/gui/widgets/WelcomeView.vala
Expand Up @@ -34,9 +34,11 @@ namespace Konv.Gui.Widgets {
[GtkChild] private Gtk.Image image_left_arrow;

private string user_name { get; private set; default = ""; }
private string welcome_text { get; private set; default = ""; }

public WelcomeView (string user_name) {
this.user_name = user_name;
this.welcome_text = this.label_welcome_user.label;

this.init_widgets ();
this.connect_signals ();
Expand All @@ -62,7 +64,7 @@ namespace Konv.Gui.Widgets {
}

public void set_welcome_sentence () {
string welcome = this.label_welcome_user.label;
string welcome = this.welcome_text;
this.label_welcome_user.set_text (welcome.printf (this.user_name));
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/MainWindow.vala
Expand Up @@ -262,7 +262,7 @@ public class Konv.Gui.Windows.MainWindow : Gtk.ApplicationWindow {
version: "%s-%s".printf (Konv.Constants.VERSION, Konv.Constants.VERSION_INFO),
license: "TODO: MIT License.",
wrap_license: true,
copyright: "Copyright © 2017 SkyzohKey <skyzohkey@konv.im>",
copyright: _("Copyright © 2017 SkyzohKey <skyzohkey@konv.im>"),
authors: new string[] {
"SkyzohKey <skyzohkey@konv.im>"
},
Expand Down

0 comments on commit fc1baa5

Please sign in to comment.