Speed up build by using accelerated gcc and pch

deploy.sh

@@ -2,5 +2,5 @@
 
 clang-format -i src/**/*.{cpp,h}
 
-docker exec sailsdk mb2 -t SailfishOS-3.0.2.8-armv7hl build
+docker exec sailsdk2 bash -c "cd build && mb2 -t SailfishOS-3.0.3.8-armv7hl build"
 scp RPMS/harbour-spoon-0.1-1.armv7hl.rpm xperia: && ssh xperia devel-su -c pkcon -y install-local harbour-spoon-0.1-1.armv7hl.rpm

meson.build

@@ -28,6 +28,7 @@ threads_dep = dependency('threads')
 
 deps = [qt5_dep, zlib_dep, olm_dep, matrix_dep, json_dep, ssl_dep, sailfish_dep, threads_dep, boost_dep, networkstate_dep]
 defines = ['-DBOOST_MPL_LIMIT_LIST_SIZE=30', '-DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS=1', '-DBOOST_ASIO_DISABLE_EPOLL']
+extra_flags = ['-ftime-report', '-Winvalid-pch', '-H']
 
 moc_files = qt5.preprocess(moc_headers :
 	[
@@ -62,7 +63,8 @@ executable('harbour-spoon',
 	sources, moc_files,
 	include_directories: inc,
 	dependencies : deps,
-	cpp_args : defines,
+	cpp_args : defines + extra_flags,
+    cpp_pch : 'src/pch/pch.h',
     install_rpath: '/usr/share/harbour-spoon/lib',
 	install: true)
 

requirements.txt

@@ -3,4 +3,4 @@ https://gitlab.matrix.org/matrix-org/olm/-/archive/3.1.0/olm-3.1.0.zip -DBUILD_S
 nlohmann/json
 gabime/spdlog -DSPDLOG_BUILD_BENCH=OFF -DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_TESTS=OFF
 boost,https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2 --cmake boost -DBOOST_WITH_ATOMIC=1 -DBOOST_WITH_ATOMIC=1 -DBOOST_WITH_CHRONO=1 -DBOOST_WITH_DATE_TIME=1 -DBOOST_WITH_IOSTREAMS=1 -DBOOST_WITH_RANDOM=1 -DBOOST_WITH_REGEX=1 -DBOOST_WITH_SYSTEM=1 -DBOOST_WITH_THREAD=1 -DBUILD_SHARED_LIBS=OFF
-Nheko-Reborn/mtxclient@0.3.0-dev -DBUILD_LIB_EXAMPLES=off -DBUILD_LIB_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
+deepbluev7/mtxclient@0.3.0-dev -DBUILD_LIB_EXAMPLES=off -DBUILD_LIB_TESTS=OFF -DBUILD_SHARED_LIBS=OFF

rpm/harbour-spoon.spec

@@ -32,7 +32,6 @@ BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(statefs-qt5)
 BuildRequires:  pkgconfig(contextkit-statefs)
-BuildRequires:  opt-gcc6
 BuildRequires:  cmake
 BuildRequires:  ninja
 BuildRequires:  desktop-file-utils
@@ -56,23 +55,18 @@ export CFLAGS="${CFLAGS} -fPIC -Og"
 #export CFLAGS="${CFLAGS} -fno-omit-frame-pointer -fsanitize=address"
 export CXXFLAGS="${CXXFLAGS} -fPIC -Og -DBOOST_ASIO_DISABLE_EPOLL"
 #export CXXFLAGS="${CXXFLAGS} -fno-omit-frame-pointer -fsanitize=address"
-export LDFLAGS="${LDFLAGS} -L/opt/gcc6/lib -static-libstdc++ -static-libasan"
-export CXX=/opt/gcc6/bin/g++
-export CC=/opt/gcc6/bin/gcc
+#export LDFLAGS="${LDFLAGS} -static-libasan"
 
 #~/.local/bin/cget remove -p %{bdir}/%{name}-cget -y Nheko-Reborn/mtxclient
 #rm -Rf %{bdir}/%{name}-cget
 
-~/.local/bin/cget install -DCMAKE_CXX_COMPILER=/opt/gcc6/bin/g++ -DCMAKE_C_COMPILER=/opt/gcc6/bin/gcc -DCMAKE_SHARED_LINKER_FLAGS="-L/opt/gcc6/lib -static-libstdc++ -static-libasan" -p %{bdir}/%{name}-cget -DCMAKE_BUILD_TYPE=DEBUG
+~/.local/bin/cget install -p %{bdir}/%{name}-cget -DCMAKE_BUILD_TYPE=DEBUG
 
-export CMAKE_PREFIX_PATH=%{bdir}/%{name}-cget/lib/cmake/
 export BOOST_ROOT=%{bdir}/%{name}-cget/
 
-export LDFLAGS="${LDFLAGS} -lstdc++"
-
 #rm -rf %{bdir}/build
-~/.local/bin/meson --prefix=/usr -Dcpp_args=-Og %{bdir}/build
-~/.local/bin/meson configure --prefix=/usr -Dcpp_args=-Og -Db_sanitize=address %{bdir}/build
+~/.local/bin/meson --prefix=/usr -Dcpp_args=-Og -Dcmake_prefix_path=%{bdir}/%{name}-cget/ %{bdir}/build
+~/.local/bin/meson configure --prefix=/usr -Dcpp_args=-Og -Dcmake_prefix_path=%{bdir}/%{name}-cget/ %{bdir}/build
 ninja -C %{bdir}/build
 
 # << build pre
@@ -91,16 +85,6 @@ DESTDIR=%{buildroot} ninja -C %{bdir}/build install
 # << install pre
 
 # >> install post
-mkdir -p %{buildroot}%{_datadir}/%{name}/lib
-
-cp /opt/gcc6/lib/libstdc++.so.6.0.22 %{buildroot}%{_datadir}/%{name}/lib/libstdc++.so.6
-cp /opt/gcc6/lib/libgcc_s.so.1 %{buildroot}%{_datadir}/%{name}/lib/libgcc_s.so.1
-cp /opt/gcc6/lib/libgcc_s.so %{buildroot}%{_datadir}/%{name}/lib/libgcc_s.so
-#cp /opt/gcc6/lib/libasan.so.3 %{buildroot}%{_datadir}/%{name}/lib/libasan.so.3
-#cp /opt/gcc6/lib/libasan.so %{buildroot}%{_datadir}/%{name}/lib/libasan.so
-#cp %{bdir}/%{name}-cget/lib/libboost* %{buildroot}%{_datadir}/%{name}/lib/
-#
-#for f in %{buildroot}%{_datadir}/%{name}/lib/libboost*.so.*; do patchelf --force-rpath --set-rpath '/usr/share/%{name}/lib:' $f; done;
 
 # << install post
 

rpm/harbour-spoon.yaml

@@ -32,7 +32,7 @@ PkgConfigBR:
 # PkgBR:
 #   - package-needed-to-build
 PkgBR:
-  - opt-gcc6
+  #  - opt-gcc6
   - cmake
   - ninja
 

src/pch/pch.h

+#include <mtx.hpp>
+#include <mtxclient/http/client.hpp>
+
+#include <QAbstractListModel>
+#include <QDebug>
+#include <QString>
+
+#include <map>
+#include <string>
+#include <vector>