diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 42dd12405..e1042ba2a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -378,30 +378,37 @@ jobs: cd $LibrariesPath sudo cp -R openssl-cache/. / - - name: Libxkbcommon. - run: | - cd $LibrariesPath - - git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git - cd libxkbcommon - ./autogen.sh - make -j$(nproc) - sudo make install - cd .. - rm -rf libxkbcommon - - name: Libwayland. run: | cd $LibrariesPath git clone -b 1.16 https://gitlab.freedesktop.org/wayland/wayland cd wayland - ./autogen.sh --enable-static --disable-documentation --disable-dtd-validation + ./autogen.sh \ + --enable-static \ + --disable-documentation \ + --disable-dtd-validation make -j$(nproc) sudo make install cd .. rm -rf wayland + - name: Libxkbcommon. + run: | + cd $LibrariesPath + + git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git + cd libxkbcommon + ./autogen.sh \ + --disable-docs \ + --disable-wayland \ + --with-xkb-config-root=/usr/share/X11/xkb \ + --with-x-locale-root=/usr/share/X11/locale + make -j$(nproc) + sudo make install + cd .. + rm -rf libxkbcommon + - name: Qt 5.12.8 cache. id: cache-qt uses: actions/cache@v1 diff --git a/docs/building-cmake.md b/docs/building-cmake.md index aff7821fb..a19403987 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -211,18 +211,25 @@ Go to ***BuildPath*** and run sudo make install_sw cd .. - git clone https://github.com/xkbcommon/libxkbcommon.git - cd libxkbcommon - git checkout xkbcommon-0.8.4 - ./autogen.sh - make $MAKE_THREADS_CNT + git clone -b 1.16 https://gitlab.freedesktop.org/wayland/wayland + cd wayland + ./autogen.sh \ + --enable-static \ + --disable-documentation \ + --disable-dtd-validation + make -j$(nproc) sudo make install cd .. - git clone -b 1.16 https://gitlab.freedesktop.org/wayland/wayland - cd wayland - ./autogen.sh --enable-static --disable-documentation --disable-dtd-validation - make -j$(nproc) + git clone https://github.com/xkbcommon/libxkbcommon.git + cd libxkbcommon + git checkout xkbcommon-0.8.4 + ./autogen.sh \ + --disable-docs \ + --disable-wayland \ + --with-xkb-config-root=/usr/share/X11/xkb \ + --with-x-locale-root=/usr/share/X11/locale + make $MAKE_THREADS_CNT sudo make install cd ..