diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8e3c6c..b00677c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,7 +107,11 @@ jobs: sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev pkg-config # Install cross-compilation tools for ARM64 if [[ "${{ matrix.arch }}" == "aarch64" ]]; then - sudo apt-get install -y gcc-aarch64-linux-gnu + sudo dpkg --add-architecture arm64 + sudo apt-get update + sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + sudo apt-get install -y libwebkit2gtk-4.1-dev:arm64 libgtk-3-dev:arm64 libayatana-appindicator3-dev:arm64 librsvg2-dev:arm64 + sudo apt-get install -y libglib2.0-dev:arm64 libcairo2-dev:arm64 libpango1.0-dev:arm64 libgdk-pixbuf2.0-dev:arm64 libatk1.0-dev:arm64 fi - name: Setup cross-compilation environment (Ubuntu ARM64 only) @@ -117,9 +121,9 @@ jobs: echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV - echo "PKG_CONFIG=aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV + echo "PKG_CONFIG_SYSROOT_DIR=/usr" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - name: Rust cache uses: swatinem/rust-cache@v2 diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 3673186..46be0ef 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -93,7 +93,11 @@ jobs: sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev pkg-config # Install cross-compilation tools for ARM64 if [[ "${{ matrix.arch }}" == "aarch64" ]]; then - sudo apt-get install -y gcc-aarch64-linux-gnu + sudo dpkg --add-architecture arm64 + sudo apt-get update + sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + sudo apt-get install -y libwebkit2gtk-4.1-dev:arm64 libgtk-3-dev:arm64 libayatana-appindicator3-dev:arm64 librsvg2-dev:arm64 + sudo apt-get install -y libglib2.0-dev:arm64 libcairo2-dev:arm64 libpango1.0-dev:arm64 libgdk-pixbuf2.0-dev:arm64 libatk1.0-dev:arm64 fi - name: Setup cross-compilation environment (Ubuntu ARM64 only) @@ -103,9 +107,9 @@ jobs: echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV - echo "PKG_CONFIG=aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV + echo "PKG_CONFIG_SYSROOT_DIR=/usr" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - name: Rust cache uses: swatinem/rust-cache@v2 diff --git a/.vscode/settings.json b/.vscode/settings.json index ab66d4b..9aafcea 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,6 +12,7 @@ "codegen", "devedition", "donutbrowser", + "dpkg", "dtolnay", "elif", "esbuild", @@ -23,7 +24,12 @@ "idletime", "KHTML", "launchservices", + "libatk", "libayatana", + "libcairo", + "libgdk", + "libglib", + "libpango", "librsvg", "libwebkit", "mountpoint", @@ -34,6 +40,7 @@ "ntlm", "objc", "osascript", + "pixbuf", "plasmohq", "propertylist", "reqwest",