From 9e9aa60fe7cd469c92493864592e04eb9bb728eb Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sat, 27 Jun 2020 22:29:59 +0200
Subject: [PATCH 1/7] delete doubled emoji png

---
 application.qrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application.qrc b/application.qrc
index 5fc7a70..b5aa1a5 100644
--- a/application.qrc
+++ b/application.qrc
@@ -66,7 +66,6 @@
     <file>res/emoji/emoji1.png</file>
     <file>res/emoji/laughing.png</file>
     <file>res/emoji/money-mouth.png</file>
-    <file>res/emoji/sweet_smile.png</file>
     <file>res/emoji/joy.png</file>
     <file>res/emoji/innocent.png</file>
     <file>res/emoji/partying_face.png</file>

From dea0ecf12899b29da1c618c91063f205e7566869 Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sun, 28 Jun 2020 13:34:13 +0200
Subject: [PATCH 2/7] edit travis.yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c6ee33..3324770 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ matrix:
   include:
     # works on Precise and Trusty
     - os: linux
-    - dist: bionec
+    - dist: xenial
       compiler: clang
       addons:
         apt:
@@ -18,7 +18,7 @@ before_script:
 before_install:
  - rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu
  - gem install bundler
- - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly --profile=minimal
+ - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal
  - export PATH="$PATH:$HOME/.cargo/bin"
  - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic -y
  - sudo apt-get update -qq

From 0ec611ff9df3216a7504fa169ed5a18091ee308e Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sun, 28 Jun 2020 13:38:52 +0200
Subject: [PATCH 3/7] change travis to qt 5.14

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3324770..3db3dfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_install:
  - gem install bundler
  - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal
  - export PATH="$PATH:$HOME/.cargo/bin"
- - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-bionic -y
+ - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y
  - sudo apt-get update -qq
  - sudo apt-get install qt514base qt514websockets libgl1-mesa-dev
  - source /opt/qt514/bin/qt514-env.sh

From 485d2a0e39bf5fbc06a4920135196eebed18d448 Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sun, 28 Jun 2020 13:55:23 +0200
Subject: [PATCH 4/7] downgrade clang version travis

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3db3dfb..75c5a94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ matrix:
       compiler: clang
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-7']
-          packages: ['clang-7', 'g++-5']
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
+          packages: ['clang-3.7', 'g++-5']
 
 before_script:
   - export PATH="$PATH:$HOME/.cargo/bin"
@@ -22,6 +22,7 @@ before_install:
  - export PATH="$PATH:$HOME/.cargo/bin"
  - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y
  - sudo apt-get update -qq
+ - sudo apt-get install libsodium-dev pkg-config
  - sudo apt-get install qt514base qt514websockets libgl1-mesa-dev
  - source /opt/qt514/bin/qt514-env.sh
  - chmod +x res/libsodium/buildlibsodium.sh

From 8ddf1dc8666e0891061d7e12279f6861583f2674 Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sun, 28 Jun 2020 14:10:49 +0200
Subject: [PATCH 5/7] define rust version in travis.yml

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 75c5a94..6a96b6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: rust
+rust:
+  - 1.41.0
 
 matrix:
   include:

From 333922e2a8d7158d80e90d5f173767358d83d1db Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sun, 28 Jun 2020 14:17:04 +0200
Subject: [PATCH 6/7] delete rustup from travis

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6a96b6e..688002b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ before_script:
 
 
 before_install:
- - rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu
  - gem install bundler
  - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal
  - export PATH="$PATH:$HOME/.cargo/bin"

From 362e93f0b32249d7862aaf168ac5999e7c5bb71a Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sun, 28 Jun 2020 14:32:43 +0200
Subject: [PATCH 7/7] fmt for travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 688002b..6cded8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ before_script:
 
 
 before_install:
+ - rustup component add rustfmt --toolchain 1.41.0-x86_64-unknown-linux-gnu
  - gem install bundler
  - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=stable --profile=minimal
  - export PATH="$PATH:$HOME/.cargo/bin"