Updated version of GCC to 8.
This commit is contained in:
parent
911f138bf8
commit
b2f821d3de
|
@ -31,8 +31,8 @@ addons:
|
|||
- dpatch
|
||||
- equivs
|
||||
- fakeroot
|
||||
- g++-7
|
||||
- gcc-7
|
||||
- g++-8
|
||||
- gcc-8
|
||||
- git
|
||||
- gnome-common
|
||||
- gobject-introspection
|
||||
|
@ -56,8 +56,8 @@ addons:
|
|||
- yasm
|
||||
|
||||
before_install:
|
||||
- export CXX="g++-7" CC="gcc-7"
|
||||
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7
|
||||
- export CXX="g++-8" CC="gcc-8"
|
||||
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-8
|
||||
- sudo update-alternatives --config gcc
|
||||
- g++ --version
|
||||
|
||||
|
|
|
@ -358,7 +358,7 @@ GtkFileDialog::GtkFileDialog(QWidget *parent, const QString &caption, const QStr
|
|||
d.reset(new QGtkDialog(Libs::gtk_file_chooser_dialog_new("", nullptr,
|
||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_OK, GTK_RESPONSE_OK, NULL)));
|
||||
GTK_STOCK_OK, GTK_RESPONSE_OK, nullptr)));
|
||||
connect(d.data(), SIGNAL(accept()), this, SLOT(onAccepted()));
|
||||
connect(d.data(), SIGNAL(reject()), this, SLOT(onRejected()));
|
||||
|
||||
|
|
|
@ -23,6 +23,8 @@
|
|||
'-Wno-missing-field-initializers',
|
||||
'-Wno-sign-compare',
|
||||
'-Wno-attributes',
|
||||
'-Wno-error=class-memaccess',
|
||||
'-Wno-error=parentheses',
|
||||
],
|
||||
},
|
||||
'conditions': [
|
||||
|
|
|
@ -10,7 +10,7 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
|
|||
|
||||
### Install software and required packages
|
||||
|
||||
You will need GCC 7.2 and CMake 3.2 installed. To install them and all the required dependencies run
|
||||
You will need GCC 8.1 and CMake 3.2 installed. To install them and all the required dependencies run
|
||||
|
||||
sudo apt-get install software-properties-common -y && \
|
||||
sudo apt-get install git libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libicu-dev libdee-dev libdrm-dev dh-autoreconf autoconf automake build-essential libass-dev libfreetype6-dev libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev libxrender-dev libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libx11-xcb-dev libffi-dev libncurses5-dev pkg-config texi2html zlib1g-dev yasm cmake xutils-dev bison python-xcbgen -y && \
|
||||
|
@ -18,9 +18,9 @@ You will need GCC 7.2 and CMake 3.2 installed. To install them and all the requi
|
|||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
|
||||
sudo add-apt-repository ppa:george-edison55/cmake-3.x -y && \
|
||||
sudo apt-get update && \
|
||||
sudo apt-get install gcc-7 g++-7 cmake -y && \
|
||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 && \
|
||||
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 60 && \
|
||||
sudo apt-get install gcc-8 g++-8 cmake -y && \
|
||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 && \
|
||||
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60 && \
|
||||
sudo update-alternatives --config gcc && \
|
||||
sudo add-apt-repository --remove ppa:ubuntu-toolchain-r/test -y && \
|
||||
sudo add-apt-repository --remove ppa:george-edison55/cmake-3.x -y
|
||||
|
|
Loading…
Reference in New Issue