Merge branch 'dev' into libraw-copylib

.github/workflows/appimage.yml

@@ -35,7 +35,7 @@ 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
 
       - name: Install Exiv2
         run: |
@@ -51,6 +51,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,6 +127,27 @@ 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

.github/workflows/codeql.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -77,7 +77,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 +90,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}}"

.github/workflows/windows.yml

@@ -17,6 +17,7 @@ on:
 env:
   publish_pre_dev_labels: '["Lawrence37:libraw-copylib"]'
 
+
 jobs:
   build:
     runs-on: windows-latest
@@ -130,14 +131,6 @@ jobs:
             "symbolic/ui" \
             "$BUILD_DIR/share/icons/Adwaita/symbolic"
           cp 'index.theme' "$BUILD_DIR/share/icons/Adwaita"
-          mkdir -p "$BUILD_DIR/share/icons/Adwaita/cursors"
-          cp -r \
-            "cursors/plus.cur" \
-            "cursors/sb_h_double_arrow.cur" \
-            "cursors/sb_left_arrow.cur" \
-            "cursors/sb_right_arrow.cur" \
-            "cursors/sb_v_double_arrow.cur" \
-            "$BUILD_DIR/share/icons/Adwaita/cursors"
           cd -
 
           echo "Copying GDK pixbuf."