enable building on 20.04.3 LTS

.gitignore

@@ -1,6 +1,6 @@
 build
 RPM-GPG-KEY-diveboard
-3rd-party/boost_1_68_0
+3rd-party/boost_1_77_0
 3rd-party/curl-7.47.0
 3rd-party/irda_mac/libirda.dylib
 3rd-party/lib-32
@@ -10,4 +10,4 @@ RPM-GPG-KEY-diveboard
 3rd-party/libiconv-1.14
 3rd-party/openssl-1.0.1h
 3rd-party/rapidjson
-3rd-party/wxWidgets-3.1.1
+3rd-party/wxWidgets-3.1.2

3rd-party/lin-build-boost.sh

@@ -2,14 +2,15 @@
 CURRENTPATH=`pwd`
 arch_flags=""
 set -e
-LIBBOOST="boost_1_68_0"
+LIBBOOST="boost_1_77_0"
 if [ -e "${CURRENTPATH}/${LIBBOOST}" ]; then
 	rm -rf "${CURRENTPATH}/${LIBBOOST}"
 fi
-tar xjf ${LIBBOOST}.tar.bz2 --exclude doc/html
+tar xjf ${LIBBOOST}-src.tar.bz2 --exclude doc/html
+tar xjf ${LIBBOOST}-libs.tar.bz2 --exclude doc/html
 cd "${CURRENTPATH}/${LIBBOOST}"
 ./bootstrap.sh
-./b2 install --prefix="${CURRENTPATH}/lib-32" link=static --without-context --without-coroutine --without-atomic --without-chrono --without-date_time --without-exception --without-filesystem --without-graph --without-graph_parallel --without-iostreams --without-locale --without-log --without-math --without-mpi --without-python --without-program_options --without-random --without-regex --without-serialization --without-signals --without-test --without-timer --without-wave
+./b2 install --prefix="${CURRENTPATH}/lib-32" link=static --without-context --without-coroutine --without-atomic --without-chrono --without-date_time --without-exception --without-filesystem --without-graph --without-graph_parallel --without-iostreams --without-locale --without-log --without-math --without-mpi --without-python --without-program_options --without-random --without-regex --without-serialization --without-test --without-timer --without-wave
 cd ${CURRENTPATH}
 echo "Done"
 

3rd-party/mac-build-boost.sh

@@ -2,14 +2,15 @@
 CURRENTPATH=`pwd`
 arch_flags="-arch i386"
 set -e
-LIBBOOST="boost_1_68_0"
+LIBBOOST="boost_1_77_0"
 if [ -e "${CURRENTPATH}/${LIBBOOST}" ]; then
 	rm -rf "${CURRENTPATH}/${LIBBOOST}"
 fi
-tar xjf ${LIBBOOST}.tar.bz2
+tar xjf ${LIBBOOST}-src.tar.bz2 --exclude doc/html
+tar xjf ${LIBBOOST}-libs.tar.bz2 --exclude doc/html
 cd "${CURRENTPATH}/${LIBBOOST}"
 ./bootstrap.sh
-./b2 install --prefix="${CURRENTPATH}/lib-32" link=static cflags="$arch_flags" cxxflags="$arch_flags -stdlib=libstdc++" linkflags="$arch_flags -stdlib=libstdc++" --without-coroutine --without-atomic --without-chrono --without-date_time --without-exception --without-filesystem --without-graph --without-graph_parallel --without-iostreams --without-locale --without-log --without-math --without-mpi --without-python --without-program_options --without-random --without-regex --without-serialization --without-signals --without-test --without-timer --without-wave 
+./b2 install --prefix="${CURRENTPATH}/lib-32" link=static cflags="$arch_flags" cxxflags="$arch_flags -stdlib=libstdc++" linkflags="$arch_flags -stdlib=libstdc++" --without-coroutine --without-atomic --without-chrono --without-date_time --without-exception --without-filesystem --without-graph --without-graph_parallel --without-iostreams --without-locale --without-log --without-math --without-mpi --without-python --without-program_options --without-random --without-regex --without-serialization --without-test --without-timer --without-wave 
 cd ${CURRENTPATH}
 echo "Done"
 

3rd-party/win-build-boost.sh

@@ -2,12 +2,12 @@
 CURRENTPATH=`pwd`
 arch_flags=""
 set -e
-LIBBOOST="boost_1_68_0"
+LIBBOOST="boost_1_77_0"
 if [ -e "${CURRENTPATH}/${LIBBOOST}" ]; then
 	rm -rf "${CURRENTPATH}/${LIBBOOST}"
 fi
-tar xjf ${LIBBOOST}.tar.bz2 --exclude doc/html
-
+tar xjf ${LIBBOOST}-src.tar.bz2 --exclude doc/html
+tar xjf ${LIBBOOST}-libs.tar.bz2 --exclude doc/html
 cd "${CURRENTPATH}/${LIBBOOST}"
 ./bootstrap.sh
 echo "using gcc : 4.4 : i686-w64-mingw32-g++
@@ -16,7 +16,7 @@ echo "using gcc : 4.4 : i686-w64-mingw32-g++
         <archiver>i686-w64-mingw32-ar
         <address-model>32
 ;" > user-config.jam
-./b2 address-model=32 toolset=gcc target-os=windows variant=release threading=multi threadapi=win32 --prefix="${CURRENTPATH}/lib-32" link=static --without-context --without-coroutine --without-atomic --without-chrono --without-date_time --without-exception --without-filesystem --without-graph --without-graph_parallel --without-iostreams --without-locale --without-log --without-math --without-mpi --without-python --without-program_options --without-random --without-regex --without-serialization --without-signals --without-test --without-timer --without-wave --user-config=user-config.jam install
+./b2 address-model=32 toolset=gcc target-os=windows variant=release threading=multi threadapi=win32 --prefix="${CURRENTPATH}/lib-32" link=static --without-context --without-coroutine --without-atomic --without-chrono --without-date_time --without-exception --without-filesystem --without-graph --without-graph_parallel --without-iostreams --without-locale --without-log --without-math --without-mpi --without-python --without-program_options --without-random --without-regex --without-serialization --without-test --without-timer --without-wave --user-config=user-config.jam install
 cd ${CURRENTPATH}
 mv lib-32/lib/libboost_thread_win32.a lib-32/lib/libboost_thread.a
 echo "Done"

README

@@ -68,7 +68,7 @@ HOW TO BUILD ON LINUX
 
 1) install package
 
-  sudo apt-get install dpkg-sig imagemagick rpm mesa-common-dev freeglut3-dev libwebkitgtk-3.0-dev cmake imagemagick rpm dpkg-sig autoconf libtool libjpeg-dev libtiff-dev libconfig++-dev
+  sudo apt-get install dpkg-sig imagemagick rpm mesa-common-dev freeglut3-dev cmake imagemagick rpm dpkg-sig autoconf libtool libjpeg-dev libtiff-dev libconfig++-dev libwebkit2gtk-4.0-dev libusb-1.0-0-dev libbluetooth-dev libcurl4-openssl-dev
 
   //ONLY ON UBUNTU
   sudo apt-get install libappindicator3-dev

makeDebPkg.sh

@@ -31,7 +31,7 @@ Version: $VERSION
 Section: web
 Priority: optional
 Architecture: $ARCHITECTURE
-Depends: libc6 (>= 2.11), libconfig9, libcurl3|libcurl4, libjpeg8, libpng12-0|libpng16-16, libssl1.1, libtiff5, libwebkitgtk-3.0-0, zlib1g (>= 1.1.4)
+Depends: libc6 (>= 2.11), libconfig9, libcurl3|libcurl4, libjpeg8, libpng12-0|libpng16-16, libssl1.1, libtiff5, libwebkit2gtk-4.0-37, zlib1g (>= 1.1.4)
 Replaces: diveboard (<= 1.1.1)
 Maintainer: Diveboard <support@diveboard.com>
 Installed-Size: $INSTALLED_SIZE

makeRpmPkg.sh

@@ -72,7 +72,8 @@ rpmbuild --clean "$SPECFILE"
 rpmbuild -bp "$SPECFILE"
 rpmbuild -bc --short-circuit "$SPECFILE"
 rpmbuild -bi --short-circuit "$SPECFILE"
-rpmbuild -ba --short-circuit "$SPECFILE" --sign
+rpmbuild -ba --short-circuit "$SPECFILE"
+echo rpmbuild --sign is no longer supported, use rpmsign instead
 
 mkdir -p $DIR/build/packages
 cp ~/rpmbuild/RPMS/*/diveboard-agent-$VERSION*$ARCH.rpm $DIR/build/packages

platforms/windows/projectDef.cmake

@@ -72,7 +72,7 @@ find_library(LIBCURL curl)
 
 include_directories("${3rd_party_ROOT}/include")
 
-message("fixing include directoryies")
+message("FIXING include directories")
 get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
 foreach(dir ${dirs})
 # make replace twice becouse of cmake bug

platforms/x11/projectDef.cmake

@@ -90,6 +90,8 @@ ELSE()
 	include_directories(${Cairo_INCLUDE_DIR})
 	set(Cairo_INCLUDE_DIR "/usr/include/cairo")
 	include_directories(${Cairo_INCLUDE_DIR})
+	set(Harfbuzz_INCLUDE_DIR "/usr/include/harfbuzz")
+	include_directories(${Harfbuzz_INCLUDE_DIR})
 	set(Pango_INCLUDE_DIR "/usr/include/pango-1.0")
 	include_directories(${Pango_INCLUDE_DIR})
 	set(Gdkconfig_INCLUDE_DIR "/usr/lib/x86_64-linux-gnu/gtk-3.0/include")
@@ -107,7 +109,7 @@ ENDIF()
 
 include_directories("${3rd_party_ROOT}/include")
 
-message("FIXING include directoryies")
+message("FIXING include directories")
 get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
 foreach(dir ${dirs})
 # make replace twice because of cmake bug