[ci][linux] build client and manager for arm64

Signed-off-by: Vitalii Koshura <[email protected]>

Author: AenBleidd

.github/workflows/linux.yml

@@ -40,7 +40,28 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        type: [libs, client, apps, manager, libs-vcpkg, client-vcpkg, apps-vcpkg, libs-cmake, libs-arm64, apps-arm64, libs-vcpkg-arm64, apps-vcpkg-arm64, manager-with-webview-vcpkg, server, manager-with-webview, manager-without-webview, unit-test, integration-test, coverity]
+        type:
+            - apps
+            - apps-arm64
+            - apps-vcpkg
+            - apps-vcpkg-arm64
+            - client
+            - client-vcpkg
+            - client-vcpkg-arm64
+            - coverity
+            - integration-test
+            - libs
+            - libs-arm64
+            - libs-cmake
+            - libs-vcpkg
+            - libs-vcpkg-arm64
+            - manager
+            - manager-with-webview
+            - manager-with-webview-vcpkg
+            - manager-with-webview-vcpkg-arm64
+            - manager-without-webview
+            - server
+            - unit-test
       fail-fast: false
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
@@ -110,6 +131,13 @@ jobs:
             libssl-dev:arm64 \
             libzip-dev:arm64
 
+      - name: Install dependencies for client and manager arm64 vcpkg
+        if: success() && matrix.type == 'manager-with-webview-vcpkg-arm64'
+        run: |
+          sudo apt install -y \
+            libltdl-dev:arm64 \
+            python3-jinja2
+
       - name: Install dependencies for unit testing
         if: success() && matrix.type == 'unit-test'
         run: |
@@ -148,55 +176,55 @@ jobs:
         if: success() && matrix.type == 'libs'
         run: |
           ./configure --disable-server --disable-client --disable-manager --enable-boinczip
-          make
+          make -j $(nproc --all)
 
       - name: Build client
         if: success() && matrix.type == 'client'
         run: |
           ./configure --disable-server --enable-client --disable-manager
-          make
+          make -j $(nproc --all)
 
       - name: Build apps
         if: success() && matrix.type == 'apps'
         run: |
           ./configure --enable-apps --enable-apps-vbox --enable-apps-gui --disable-server --disable-client --disable-manager
-          make
+          make -j $(nproc --all)
 
       - name: Build manager
         if: success() && matrix.type == 'manager'
         run: |
           ./configure --disable-server --disable-client --enable-manager
-          make
+          make -j $(nproc --all)
 
       - name: Build libs with vcpkg
         if: success() && matrix.type == 'libs-vcpkg'
         run: |
-          linux/ci_configure_libs.sh
-          make
+          . ./linux/ci_configure_libs.sh
+          make -j $(nproc --all)
 
       - name: Build client with vcpkg
         if: success() && matrix.type == 'client-vcpkg'
         run: |
-          linux/ci_configure_client.sh
-          make
+          . ./linux/ci_configure_client.sh
+          make -j $(nproc --all)
 
       - name: Build apps with vcpkg
         if: success() && matrix.type == 'apps-vcpkg'
         run: |
-          linux/ci_configure_apps.sh
-          make
+          . ./linux/ci_configure_apps.sh
+          make -j $(nproc --all)
 
       - name: Build libs with cmake vcpkg
         if: success() && matrix.type == 'libs-cmake'
         run: |
-          linux/ci_configure_libs_cmake.sh
+          . ./linux/ci_configure_libs_cmake.sh
           cmake --build build
 
       - name: Build manager with webview and vcpkg
         if: success() && matrix.type == 'manager-with-webview-vcpkg'
         run: |
-          linux/ci_configure_manager.sh
-          make
+          . ./linux/ci_configure_manager.sh
+          make -j $(nproc --all)
 
       - name: Build server
         if: success() && matrix.type == 'server'
@@ -209,14 +237,14 @@ jobs:
         run: |
           ./3rdParty/buildLinuxDependencies.sh
           ./configure --disable-server --disable-client --with-wx-prefix=${GITHUB_WORKSPACE}/3rdParty/buildCache/linux
-          make
+          make -j $(nproc --all)
 
       - name: Build manager without webview
         if: success() && matrix.type == 'manager-without-webview'
         run: |
           ./3rdParty/buildLinuxDependencies.sh --disable-webview
           ./configure --disable-server --disable-client --with-wx-prefix=${GITHUB_WORKSPACE}/3rdParty/buildCache/linux
-          make
+          make -j $(nproc --all)
 
       - name: Build server for unit testing
         if: success() && matrix.type == 'unit-test'
@@ -227,26 +255,26 @@ jobs:
       - name: Build libraries for arm64 with vcpkg
         if: success() && matrix.type == 'libs-vcpkg-arm64'
         run: |
-          export CC=aarch64-linux-gnu-gcc
-          export CXX=aarch64-linux-gnu-g++
-          BUILD_DIR="$PWD/3rdParty/linux"
-          VCPKG_ROOT="$BUILD_DIR/vcpkg"
-          export VCPKG_DIR="$VCPKG_ROOT/installed/arm64-linux-release"
-          export CPPFLAGS="-I$VCPKG_DIR/include -I$VCPKG_DIR/include/"
-          ./linux/arm64/ci_configure_libs.sh
-          make
+          . ./linux/arm64/ci_configure_libs.sh
+          make -j $(nproc --all)
 
       - name: Build apps for arm64 with vcpkg
         if: success() && matrix.type == 'apps-vcpkg-arm64'
         run: |
-          export CC=aarch64-linux-gnu-gcc
-          export CXX=aarch64-linux-gnu-g++
-          BUILD_DIR="$PWD/3rdParty/linux"
-          VCPKG_ROOT="$BUILD_DIR/vcpkg"
-          export VCPKG_DIR="$VCPKG_ROOT/installed/arm64-linux-release"
-          export CPPFLAGS="-I$VCPKG_DIR/include -I$VCPKG_DIR/include/"
-          ./linux/arm64/ci_configure_apps.sh
-          make
+          . ./linux/arm64/ci_configure_apps.sh
+          make -j $(nproc --all)
+
+      - name: Build client for arm64 with vcpkg
+        if: success() && matrix.type == 'client-vcpkg-arm64'
+        run: |
+          . ./linux/arm64/ci_configure_client.sh
+          make -j $(nproc --all)
+
+      - name: Build manager with webview for arm64 with vcpkg
+        if: success() && matrix.type == 'manager-with-webview-vcpkg-arm64'
+        run: |
+          . ./linux/arm64/ci_configure_manager.sh
+          make -j $(nproc --all)
 
       - name: Build libraries for arm64
         if: success() && matrix.type == 'libs-arm64'
@@ -260,7 +288,7 @@ jobs:
           export RELEASE_ARCH=arm64
           export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
           ./configure --host=aarch64-linux --with-boinc-platform="aarch64-unknown-linux-gnu" --with-boinc-alt-platform="arm-unknown-linux-gnueabihf" --enable-boinczip --disable-server --disable-manager --disable-client --disable-shared --enable-static
-          make
+          make -j $(nproc --all)
 
       - name: Build apps for arm64
         if: success() && matrix.type == 'apps-arm64'
@@ -274,7 +302,7 @@ jobs:
           export RELEASE_ARCH=arm64
           export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
           ./configure --host=aarch64-linux --with-boinc-platform="aarch64-unknown-linux-gnu" --with-boinc-alt-platform="arm-unknown-linux-gnueabihf" --enable-apps --disable-server --disable-manager --disable-client --disable-shared --enable-static
-          make
+          make -j $(nproc --all)
 
       - name: Prepare for coverity scan
         if: success() && matrix.type == 'coverity' && github.ref == 'refs/heads/master' && github.event_name == 'schedule'
@@ -392,7 +420,7 @@ jobs:
           export LDFLAGS="-static-libstdc++ -s"
           export RELEASE_ARCH=x86_64
           ./configure --enable-apps --enable-apps-vbox --disable-server --disable-client --disable-manager --disable-shared --enable-static
-          make
+          make -j $(nproc --all)
 
       - name: Make x86 apps
         if: success() && matrix.type == 'apps-x86'
@@ -402,7 +430,7 @@ jobs:
           export LDFLAGS="-static-libstdc++ -s -m32"
           export RELEASE_ARCH=i686
           ./configure --host=i686-linux-gnu --enable-apps --enable-apps-vbox --disable-server --disable-client --disable-manager --disable-shared --enable-static
-          make
+          make -j $(nproc --all)
 
       - name: Make arm64 apps
         if: success() && matrix.type == 'apps-arm64'
@@ -416,7 +444,7 @@ jobs:
           export RELEASE_ARCH=arm64
           export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
           ./configure --host=aarch64-linux --with-boinc-platform="aarch64-unknown-linux-gnu" --with-boinc-alt-platform="arm-unknown-linux-gnueabihf" --enable-apps --disable-server --disable-manager --disable-client --disable-shared --enable-static
-          make
+          make -j $(nproc --all)
 
       - name: Prepare logs on failure
         if: ${{ failure() }}

3rdParty/vcpkg_ports/configs/manager/linux/vcpkg.json

@@ -26,6 +26,8 @@
         {
           "name": "libzip",
           "default-features": false
-        }
+        },
+        "libnotify",
+        "xcb-util"
     ]
 }

3rdParty/vcpkg_ports/ports/at-spi2-core/portfile.cmake

@@ -0,0 +1,45 @@
+if(VCPKG_TARGET_IS_LINUX)
+    message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n    libxi-dev\n    libxtst-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libxtst-dev")
+endif()
+
+vcpkg_from_gitlab(
+    OUT_SOURCE_PATH SOURCE_PATH
+    GITLAB_URL https://gitlab.gnome.org
+    REPO GNOME/at-spi2-core
+    REF AT_SPI2_CORE_2_44_1
+    SHA512 4e98b76e019f33af698a5e2b7ae7ce17ce0ff57784b4d505fe4bad58b097080899c1ca82b443502068c5504b60886e2d4a341bba833e0279ebef352211bf3813
+)
+
+vcpkg_configure_meson(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -Dintrospection=no
+    ADDITIONAL_BINARIES
+        glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
+        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
+)
+
+vcpkg_install_meson()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_pkgconfig()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/atspi-2.pc"
+        "-DG_LOG_DOMAIN=\"dbind\"" ""
+    )
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/atspi-2.pc"
+        "-DG_LOG_DOMAIN=\"dbind\"" ""
+    )
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/defaults")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()

3rdParty/vcpkg_ports/ports/at-spi2-core/vcpkg.json

@@ -0,0 +1,26 @@
+{
+  "name": "at-spi2-core",
+  "version": "2.44.1",
+  "port-version": 3,
+  "description": "Base DBus XML interfaces for accessibility, the accessibility registry daemon, and atspi library.",
+  "homepage": "https://www.gtk.org/",
+  "license": null,
+  "supports": "linux",
+  "dependencies": [
+    {
+      "name": "dbus",
+      "platform": "linux"
+    },
+    "glib",
+    {
+      "name": "glib",
+      "host": true
+    },
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    },
+    "libxi",
+    "libxtst"
+  ]
+}

3rdParty/vcpkg_ports/ports/cairo/fix_clang-cl_build.patch

@@ -0,0 +1,37 @@
+diff --git a/util/cairo-script/cairo-script-objects.c b/util/cairo-script/cairo-script-objects.c
+index 2d7937be3..4d55ca848 100644
+--- a/util/cairo-script/cairo-script-objects.c	
++++ b/util/cairo-script/cairo-script-objects.c
+@@ -127,7 +127,7 @@ csi_array_append (csi_t *ctx,
+     return _csi_stack_push (ctx, &array->stack, csi_object_reference (obj));
+ }
+ 
+-inline csi_status_t
++csi_status_t
+ _csi_array_execute (csi_t *ctx, csi_array_t *array)
+ {
+     csi_integer_t i;
+diff --git a/meson.build b/meson.build
+index 7b20c0c48..9cb4a82ba 100644
+--- a/meson.build	
++++ b/meson.build
+@@ -38,7 +38,7 @@ cc = meson.get_compiler('c')
+ 
+ # Compiler flags
+ cflags = []
+-if cc.get_id() != 'msvc'
++if cc.get_argument_syntax() != 'msvc'
+   cflags += [
+     '-Wmissing-declarations',
+     '-Werror-implicit-function-declaration',
+@@ -159,8 +159,7 @@ check_headers = [
+ 
+ check_types = [
+   ['uint64_t', {'headers': ['stdint.h']}],
+-  ['uint128_t', {'headers': ['stdint.h']}],
+-  ['__uint128_t']
++  ['uint128_t', {'headers': ['stdint.h']}]
+ ]
+ 
+ check_funcs = [
+ 

3rdParty/vcpkg_ports/ports/cairo/msvc-convenience.diff

@@ -0,0 +1,15 @@
+diff --git a/src/win32/cairo-win32-private.h b/src/win32/cairo-win32-private.h
+index d457b78..0b1b4ed 100644
+--- a/src/win32/cairo-win32-private.h
++++ b/src/win32/cairo-win32-private.h
+@@ -53,6 +53,10 @@
+ 
+ #define WIN32_FONT_LOGICAL_SCALE 32
+ 
++#ifdef _MSC_VER 
++#pragma comment(lib, "MSImg32.Lib")
++#endif
++
+ CAIRO_BEGIN_DECLS
+ 
+ /* Surface DC flag values */