From 1ab1b0624c7cbb8869bfd23fa6203316ba0e22fd Mon Sep 17 00:00:00 2001 From: El Salvador Date: Tue, 7 Jan 2025 16:09:42 +0100 Subject: [PATCH] build: Updated Lazarus to 3.6 (#196) Co-authored-by: Matteo Salvi --- .github/workflows/main.yml | 30 ++++++++++++++-------------- .github/workflows/main_release.yml | 32 +++++++++++++++--------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7d153351..61001900 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ env: FPC_URL: 'gitlab' FPC_BRANCH: 'release_3_2_2' LAZ_URL: 'gitlab' - LAZ_BRANCH: 'lazarus_3_4' + LAZ_BRANCH: 'lazarus_3_6' LAZ_REVISION_2_4: '' LAZ_DIR: 'fpcLaz' BUILD_MODE: 'Debug_GH_Action' @@ -44,7 +44,7 @@ jobs: - os: windows-latest name: 'Windows 64' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-win64.exe' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-win64.exe' lazbuild: 'fpcLaz/lazarus/lazbuild.exe' dbg2mab: 'dbg2mab.exe' build-widgetset: 'win32' @@ -53,7 +53,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 GTK2' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'gtk2' @@ -62,7 +62,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 GTK3' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'gtk3' @@ -71,7 +71,7 @@ jobs: - os: ubuntu-20.04 name: 'Linux 64 QT5' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'qt5' @@ -80,7 +80,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 QT6' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'qt6' @@ -109,22 +109,22 @@ jobs: - name: Install Dependencies (Ubuntu - only QT5) if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-20.04') && matrix.config.build-widgetset == 'qt5' run: | - wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas1_2.15-1_amd64.deb - wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas-dev_2.15-1_amd64.deb + wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.16/libqt5pas1_2.16-4_amd64.deb + wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.16/libqt5pas-dev_2.16-4_amd64.deb sudo apt-get update sudo apt-get -m -y install qt5-qmake qtbase5-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev - sudo apt-get -m -y install ./libqt5pas1_2.15-1_amd64.deb - sudo apt-get -m -y install ./libqt5pas-dev_2.15-1_amd64.deb + sudo apt-get -m -y install ./libqt5pas1_2.16-4_amd64.deb + sudo apt-get -m -y install ./libqt5pas-dev_2.16-4_amd64.deb - name: Install Dependencies (Ubuntu - only QT6) if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6' run: | - wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6_6.2.7-1_amd64.deb - wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6-dev_6.2.7-1_amd64.deb + wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.10/libqt6pas6_6.2.10-1_amd64.deb + wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.10/libqt6pas6-dev_6.2.10-1_amd64.deb sudo apt-get update sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev - sudo apt-get -m -y install ./libqt6pas6_6.2.7-1_amd64.deb - sudo apt-get -m -y install ./libqt6pas6-dev_6.2.7-1_amd64.deb + sudo apt-get -m -y install ./libqt6pas6_6.2.10-1_amd64.deb + sudo apt-get -m -y install ./libqt6pas6-dev_6.2.10-1_amd64.deb - name: Generate Cache Hash run: echo "${{ matrix.config.fpcup-url }}${{ env.FPCUP_OPT }}${{ env.FPC_URL }}${{ env.FPC_BRANCH }}${{ env.LAZ_URL }}${{ env.LAZ_BRANCH }}${{ env.LAZ_REVISION_2_4 }}${{ env.LAZ_PATCH}}${{ matrix.config.name }}" > .cache @@ -170,6 +170,6 @@ jobs: - name: Upload the Build Artifact uses: actions/upload-artifact@v4.5.0 with: - name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }} + name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.name }} path: | ${{ env.ASUITE_SOURCE}}/bin diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml index edbfe3a4..284131db 100644 --- a/.github/workflows/main_release.yml +++ b/.github/workflows/main_release.yml @@ -15,11 +15,11 @@ env: FPC_URL: 'gitlab' FPC_BRANCH: 'release_3_2_2' LAZ_URL: 'gitlab' - LAZ_BRANCH: 'lazarus_3_4' + LAZ_BRANCH: 'lazarus_3_6' LAZ_REVISION_2_4: '' LAZ_DIR: 'fpcLaz' BUILD_MODE: 'Debug_GH_Action' - FPCUP_OPT: '--lazopt="-g -gl" --fpcopt="-g -gl"' + FPCUP_OPT: '' LAZ_PATCH: '' #'/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2 ASUITE_SOURCE: 'asuite_src' @@ -40,7 +40,7 @@ jobs: - os: windows-latest name: 'Windows 64' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-win64.exe' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-win64.exe' lazbuild: 'fpcLaz/lazarus/lazbuild.exe' dbg2mab: 'dbg2mab.exe' build-widgetset: 'win32' @@ -49,7 +49,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 GTK2' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'gtk2' @@ -58,7 +58,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 GTK3' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'gtk3' @@ -67,7 +67,7 @@ jobs: - os: ubuntu-20.04 name: 'Linux 64 QT5' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'qt5' @@ -76,7 +76,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 QT6' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0f/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'qt6' @@ -105,22 +105,22 @@ jobs: - name: Install Dependencies (Ubuntu - only QT5) if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-20.04') && matrix.config.build-widgetset == 'qt5' run: | - wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas1_2.15-1_amd64.deb - wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas-dev_2.15-1_amd64.deb + wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.16/libqt5pas1_2.16-4_amd64.deb + wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.16/libqt5pas-dev_2.16-4_amd64.deb sudo apt-get update sudo apt-get -m -y install qt5-qmake qtbase5-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev - sudo apt-get -m -y install ./libqt5pas1_2.15-1_amd64.deb - sudo apt-get -m -y install ./libqt5pas-dev_2.15-1_amd64.deb + sudo apt-get -m -y install ./libqt5pas1_2.16-4_amd64.deb + sudo apt-get -m -y install ./libqt5pas-dev_2.16-4_amd64.deb - name: Install Dependencies (Ubuntu - only QT6) if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6' run: | - wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6_6.2.7-1_amd64.deb - wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6-dev_6.2.7-1_amd64.deb + wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.10/libqt6pas6_6.2.10-1_amd64.deb + wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.10/libqt6pas6-dev_6.2.10-1_amd64.deb sudo apt-get update sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev - sudo apt-get -m -y install ./libqt6pas6_6.2.7-1_amd64.deb - sudo apt-get -m -y install ./libqt6pas6-dev_6.2.7-1_amd64.deb + sudo apt-get -m -y install ./libqt6pas6_6.2.10-1_amd64.deb + sudo apt-get -m -y install ./libqt6pas6-dev_6.2.10-1_amd64.deb - name: Generate Cache Hash run: echo "${{ matrix.config.fpcup-url }}${{ env.FPCUP_OPT }}${{ env.FPC_URL }}${{ env.FPC_BRANCH }}${{ env.LAZ_URL }}${{ env.LAZ_BRANCH }}${{ env.LAZ_REVISION_2_4 }}${{ env.LAZ_PATCH}}${{ matrix.config.name }}" > .cache @@ -166,6 +166,6 @@ jobs: - name: Upload the Build Artifact uses: actions/upload-artifact@v4.5.0 with: - name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }} + name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.name }} path: | ${{ env.ASUITE_SOURCE}}/bin