Merge branch 'master' of https://github.com/terranum-ch/ToolMap

.github/workflows/code-coverage.yml

@@ -31,7 +31,7 @@ jobs:
       uses: pat-s/[email protected]
       with:
         path: /home/runner/.conan
-        key: conan-osx
+        key: conan-codecov
 
     - name: Install Conan
       run: |
@@ -54,22 +54,22 @@ jobs:
         # lcov
         sudo apt-get install lcov
         
-        # GTK 3.0 libraries
+        # GTK 3.0 libraries & MySQL dependencies
         sudo apt-get install libgtk-3-0 libgtk-3-dev
-        sudo apt-get install libxcb-cursor0 libxcb-cursor-dev
-        sudo apt-get install libgnutlsxx28 libgnutls28-dev
-        sudo apt-get install libx11-xcb-dev libfontenc-dev libxaw7-dev libxmu-dev libxmuu-dev libxpm-dev libxres-dev libxss-dev
-        sudo apt-get install libxv-dev libxvmc-dev libxxf86vm-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev
+        sudo apt-get install libgnutls30 libgnutls28-dev
+        sudo apt-get install libxcb-cursor0 libxcb-cursor-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev
         sudo apt-get install libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev
-        sudo apt-get install libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-dri3-dev libxcb-util-dev
-
-        # needed for MySQL
-        sudo apt-get install libncurses5-dev libssl-dev libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev
-        sudo apt-get install libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxft-dev libxi-dev libxinerama-dev
-        sudo apt-get install libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev
-        sudo apt-get install libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev
-        sudo apt-get install libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev
-        sudo apt-get install libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev
+        sudo apt-get install libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-dri3-dev libxcb-util-dev libxcb-render0-dev
+        sudo apt-get install libxcb-dri2-0-dev libxcb-present-dev libxcb-glx0-dev libxcb-composite0-dev libxcb-xv0-dev 
+        sudo apt-get install libxcb-xvmc0-dev libxcb-xinput-dev libxcb-ewmh-dev libxcb-xf86dri0-dev libxcb-xrm-dev
+        sudo apt-get install libxcb-record0-dev libxcb-xtest0-dev libxcb-res0-dev
+        sudo apt-get install libx11-xcb-dev libx11-dev libfontenc-dev libxaw7-dev libxmu-dev libxmuu-dev libxpm-dev 
+        sudo apt-get install libxres-dev libxss-dev libxv-dev libxvmc-dev libxxf86vm-dev libxt-dev libxtst-dev
+        sudo apt-get install libncurses5-dev libssl-dev  libice-dev 
+        sudo apt-get install libsm-dev libxau-dev libxcomposite-dev libxcursor-dev libxdamage-dev 
+        sudo apt-get install libxdmcp-dev libxext-dev libxfixes-dev libxft-dev libxi-dev libxinerama-dev
+        sudo apt-get install libxkbfile-dev libxrandr-dev libxrender-dev 
+        sudo apt-get install xtrans-dev xkb-data uuid-dev libwebkit2gtk-4.1-dev
 
     - name: Install libraries
       run: |