diff --git a/.github/workflows/natives.yml b/.github/workflows/natives.yml index 0b856b3a..37c99b3e 100644 --- a/.github/workflows/natives.yml +++ b/.github/workflows/natives.yml @@ -33,26 +33,26 @@ jobs: - uses: gradle/actions/wrapper-validation@v4 - - name: install libxt-dev and libgtk-3-dev + - name: install libxt-dev and libgtk-3-dev (Linux) if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-24.04-arm' - run: sudo apt install libxt-dev libgtk-3-dev + run: sudo apt-get install libxt-dev libgtk-3-dev - - name: Download libgtk-3.so for arm64 - if: matrix.os == 'ubuntu-latest' - working-directory: flatlaf-natives/flatlaf-natives-linux/lib/aarch64 - run: | - pwd - ls -l /usr/lib/x86_64-linux-gnu/libgtk* - wget --no-verbose https://ports.ubuntu.com/pool/main/g/gtk%2b3.0/libgtk-3-0_3.24.18-1ubuntu1_arm64.deb - ls -l - ar -x libgtk-3-0_3.24.18-1ubuntu1_arm64.deb data.tar.xz - tar -xvf data.tar.xz --wildcards --to-stdout "./usr/lib/aarch64-linux-gnu/libgtk-3.so.0.*" > libgtk-3.so - rm libgtk-3-0_3.24.18-1ubuntu1_arm64.deb data.tar.xz - ls -l +# - name: Download libgtk-3.so for arm64 (Linux) +# if: matrix.os == 'ubuntu-latest' +# working-directory: flatlaf-natives/flatlaf-natives-linux/lib/aarch64 +# run: | +# pwd +# ls -l /usr/lib/x86_64-linux-gnu/libgtk* +# wget --no-verbose https://ports.ubuntu.com/pool/main/g/gtk%2b3.0/libgtk-3-0_3.24.18-1ubuntu1_arm64.deb +# ls -l +# ar -x libgtk-3-0_3.24.18-1ubuntu1_arm64.deb data.tar.xz +# tar -xvf data.tar.xz --wildcards --to-stdout "./usr/lib/aarch64-linux-gnu/libgtk-3.so.0.*" > libgtk-3.so +# rm libgtk-3-0_3.24.18-1ubuntu1_arm64.deb data.tar.xz +# ls -l - - name: install g++-aarch64-linux-gnu - if: matrix.os == 'ubuntu-latest' - run: sudo apt install g++-aarch64-linux-gnu +# - name: install g++-aarch64-linux-gnu (Linux) +# if: matrix.os == 'ubuntu-latest' +# run: sudo apt-get install g++-aarch64-linux-gnu - name: Setup Java 11 uses: actions/setup-java@v4 @@ -98,9 +98,9 @@ jobs: security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH security list-keychains -d user -s $KEYCHAIN_PATH # sign code - codesign -s "$CERT_IDENTITY" -fv --timestamp \ + codesign --sign "$CERT_IDENTITY" --force --verbose --timestamp \ flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/libflatlaf-macos-*.dylib - codesign -d --verbose=4 flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/libflatlaf-macos-*.dylib + codesign --display --verbose=4 flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/libflatlaf-macos-*.dylib # cleanup security delete-keychain $KEYCHAIN_PATH diff --git a/flatlaf-natives/flatlaf-natives-linux/README.md b/flatlaf-natives/flatlaf-natives-linux/README.md index 3d4c2051..0054eefa 100644 --- a/flatlaf-natives/flatlaf-natives-linux/README.md +++ b/flatlaf-natives/flatlaf-natives-linux/README.md @@ -33,14 +33,16 @@ To build the library on Linux, some packages needs to be installed: ### Ubuntu ~~~ -sudo apt update -sudo apt install build-essential libxt-dev libgtk-3-dev +sudo apt-get update +sudo apt-get install build-essential libxt-dev libgtk-3-dev ~~~ -Only on x86_64 Linux for cross-compiling for arm64 architecture: +#### Cross-compile for arm64 architecture on x86_64 Linux + +Only needed on x86_64 Linux if you want cross-compile for arm64 architecture: ~~~ -sudo apt install g++-aarch64-linux-gnu +sudo apt-get install g++-aarch64-linux-gnu ~~~ Download `libgtk-3.so` for arm64 architecture: