Merge pull request #7175 from Beep6581/release-5.11

5.11 Release Candidate 1

.github/workflows/appimage.yml

@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
 
 env:
-  publish_pre_dev_labels: '["Beep6581:wbrefinement"]'
+  publish_pre_dev_labels: '[]'
 
 jobs:
   build:
@@ -26,7 +26,7 @@ jobs:
         build_type: [release, debug]
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -35,11 +35,24 @@ jobs:
           echo "Running apt update."
           sudo apt update
           echo "Installing dependencies with apt."
-          DEBIAN_FRONTEND=noninteractive sudo apt install -y cmake libgtk-3-dev libgtkmm-3.0-dev liblensfun-dev librsvg2-dev liblcms2-dev libfftw3-dev libiptcdata0-dev libtiff5-dev libcanberra-gtk3-dev liblensfun-bin libexpat1-dev libbrotli-dev zlib1g-dev libinih-dev
+          DEBIAN_FRONTEND=noninteractive sudo apt install -y cmake libgtk-3-dev libgtkmm-3.0-dev liblensfun-dev librsvg2-dev liblcms2-dev libfftw3-dev libiptcdata0-dev libtiff5-dev libcanberra-gtk3-dev liblensfun-bin libexpat1-dev libbrotli-dev zlib1g-dev libinih-dev adwaita-icon-theme-full gettext libarchive-tools zstd libgif-dev libwebp-dev libwebpdemux2
+
+      - name: Install makedeb
+        run: |
+          echo "Installing makedeb..."
+          curl -Ss -qgb "" -fLC - --retry 3 --retry-delay 3 -o makedeb.deb \
+            "https://github.com/makedeb/makedeb/releases/download/v16.1.0-beta1/makedeb-beta_16.1.0-beta1_amd64_focal.deb"
+          DEBIAN_FRONTEND=noninteractive sudo dpkg -i makedeb.deb
+
+      - name: Install libjxl
+        working-directory: tools/makedeb
+        run: |
+          echo "Building and installing libjxl..."
+          makedeb -si --no-confirm -p PKGBUILD.libjxl
 
       - name: Install Exiv2
         run: |
-          EXIV2_VERSION='v0.28.1'
+          EXIV2_VERSION='v0.28.3'
           echo "Cloning Exiv2 $EXIV2_VERSION."
           git clone --depth 1 --branch "$EXIV2_VERSION" https://github.com/Exiv2/exiv2.git ext/exiv2
 
@@ -51,6 +64,26 @@ jobs:
           echo "Building and installing."
           sudo make -j$(nproc) install
 
+      - name: Install Librsvg required min. version
+      # Required min. version is not available for Ubuntu 20.04 LTS (but is for 22.04 LTS) so needs to be built manually
+        run: |
+          LIBRSVG2_VERSION='2.52.2'
+          echo "Cloning Librsvg2 $LIBRSVG2_VERSION."
+          git clone --depth 1 --branch "$LIBRSVG2_VERSION" https://gitlab.gnome.org/GNOME/librsvg.git ext/librsvg2
+
+          echo "Installing required dependencies with apt."
+          DEBIAN_FRONTEND=noninteractive sudo apt install -y rustc cargo gtk-doc-tools libgirepository1.0-dev
+
+          echo "Updating PATH."
+          export PATH="$PATH:/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0"
+
+          echo "Configuring build."
+          cd ext/librsvg2
+          sh autogen.sh
+
+          echo "Building and installing."
+          sudo make install
+
       - name: Configure build
         run: |
           export REF_NAME_FILTERED="$(echo '${{github.ref_name}}' | sed 's/[^A-z0-9_.-]//g')"
@@ -107,9 +140,30 @@ jobs:
           echo "Copying Lensfun database to the build directory."
           cp -R ~/.local/share/lensfun/updates/* build/AppDir/usr/share/lensfun/
 
+      - name: Include Adwaita icon theme (partial)
+        run: |
+          mkdir build/AppDir/usr/bin/icons/Adwaita
+          icons_dir=('actions' 'devices' 'mimetypes' 'places' 'status' 'ui' 'devices')
+          for dir in "${icons_dir[@]}"; do
+            find_res=$(find /usr/share/icons/Adwaita -name "${dir}" -type d)
+            if [ -z "$find_res" ]
+            then
+              echo "-Warning: Icons folder '"${dir}"' not found in Adwaita theme."
+            else
+              new_dir=($(echo "$find_res" | awk -F/ '{print $(NF-1)"/"$NF}'))
+              for d in "${new_dir[@]}"; do
+                echo "-Copying '"${d}"' into 'AppDir/usr/bin/icons/Adwaita'."
+                mkdir -p "build/AppDir/usr/bin/icons/Adwaita/${d}"
+                cp -R "/usr/share/icons/Adwaita/${d}/." "build/AppDir/usr/bin/icons/Adwaita/${d}"
+              done
+            fi
+          done
+          echo "-Copying 'index.theme' into 'AppDir/usr/bin/icons/Adwaita'."
+          cp /usr/share/icons/Adwaita/index.theme build/AppDir/usr/bin/icons/Adwaita
+
       - name: Restore AppImage tools from cache
         id: appimage-tools-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: appimage-tools-1
           path: |
@@ -162,7 +216,7 @@ jobs:
           echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{env.ARTIFACT_NAME}}.AppImage
           path: ${{github.workspace}}/build/${{env.ARTIFACT_NAME}}.AppImage
@@ -184,7 +238,7 @@ jobs:
           echo "PUBLISH_NAME=$PUBLISH_NAME" >> $GITHUB_ENV
 
       - name: Publish artifacts
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: ${{github.ref_type == 'tag' || github.ref_name == 'dev'}}
         with:
           tag_name: nightly-github-actions
@@ -214,10 +268,11 @@ jobs:
           echo "PUBLISH_NAME=$PUBLISH_NAME" >> $GITHUB_ENV
 
       - name: Publish pre-dev artifacts
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: ${{steps.prepare-publish-pre-dev.outcome == 'success'}}
         with:
           tag_name: pre-dev-github-actions
+          repository: Beep6581/RawTherapee
           files: |
             ${{env.PUBLISH_NAME}}.AppImage
             ${{env.PUBLISH_NAME}}-AppImage-AboutThisBuild.txt

.github/workflows/codeql.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -41,7 +41,17 @@ jobs:
           echo "Running apt update."
           sudo apt update
           echo "Installing dependencies with apt."
-          DEBIAN_FRONTEND=noninteractive sudo apt install -y cmake libgtk-3-dev libgtkmm-3.0-dev liblensfun-dev librsvg2-dev liblcms2-dev libfftw3-dev libiptcdata0-dev libtiff5-dev libcanberra-gtk3-dev liblensfun-bin libexiv2-dev
+          DEBIAN_FRONTEND=noninteractive sudo apt install -y cmake libgtk-3-dev libgtkmm-3.0-dev liblensfun-dev librsvg2-dev liblcms2-dev libfftw3-dev libiptcdata0-dev libtiff5-dev libcanberra-gtk3-dev liblensfun-bin libexiv2-dev libtcmalloc-minimal4 libhwy0 libhwy-dev
+
+      - name: Install libjxl
+        run: |
+          echo "Downloading and installing libjxl..."
+          VERSION_UBUNTU=22.04
+          VERSION_JXL=0.10.3
+          curl -Ss -qgb "" -fLC - --retry 3 --retry-delay 3 -o libjxl-debs.tar.gz \
+            "https://github.com/libjxl/libjxl/releases/download/v${VERSION_JXL}/jxl-debs-amd64-ubuntu-${VERSION_UBUNTU}-v${VERSION_JXL}.tar.gz"
+          tar xf libjxl-debs.tar.gz
+          DEBIAN_FRONTEND=noninteractive sudo dpkg -i jxl_${VERSION_JXL}_amd64.deb libjxl-dev_${VERSION_JXL}_amd64.deb libjxl_${VERSION_JXL}_amd64.deb
 
       - name: Configure build
         run: |
@@ -77,7 +87,7 @@ jobs:
           echo "REF_NAME_FILTERED=$REF_NAME_FILTERED" >> $GITHUB_ENV
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
 
@@ -90,6 +100,6 @@ jobs:
           mv AppDir/usr/bin/share AppDir/usr/
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"