[pull] master from flameshot-org:master

.github/workflows/Linux-pack.yml

@@ -37,51 +37,51 @@ jobs:
       matrix:
         dist:
           - {
-              name: debian-12,
+              name: debian-13,
               os: debian,
-              symbol: bookworm,
+              symbol: trixie,
               arch: amd64,
               runs-on: ubuntu-latest
             }
           - {
-              name: ubuntu-22.04,
+              name: ubuntu-24.04,
               os: ubuntu,
-              symbol: jammy,
+              symbol: noble,
               arch: amd64,
               runs-on: ubuntu-latest
             }
           - {
-              name: ubuntu-24.04,
+              name: ubuntu-26.04,
               os: ubuntu,
-              symbol: noble,
+              symbol: resolute,
               arch: amd64,
               runs-on: ubuntu-latest
             }
           - {
-              name: debian-12,
+              name: debian-13,
               os: debian,
-              symbol: bookworm,
+              symbol: trixie,
               arch: arm64,
               runs-on: ubuntu-24.04-arm
             }
           - {
-              name: debian-12,
+              name: debian-13,
               os: debian,
-              symbol: bookworm,
+              symbol: trixie,
               arch: armhf,
               runs-on: ubuntu-24.04-arm
             }
           - {
-              name: ubuntu-22.04,
+              name: ubuntu-24.04,
               os: ubuntu,
-              symbol: jammy,
+              symbol: noble,
               arch: arm64,
               runs-on: ubuntu-24.04-arm
             }
           - {
-              name: ubuntu-24.04,
+              name: ubuntu-26.04,
               os: ubuntu,
-              symbol: noble,
+              symbol: resolute,
               arch: arm64,
               runs-on: ubuntu-24.04-arm
             }
@@ -179,15 +179,15 @@ jobs:
       matrix:
         dist:
           - {
-              name: fedora-41,
+              name: fedora-43,
               os: fedora,
-              symbol: 41,
+              symbol: 43,
               arch: x86_64
             }
           - {
-              name: fedora-42,
+              name: fedora-44,
               os: fedora,
-              symbol: 42,
+              symbol: 44,
               arch: x86_64
             }
     steps:

.github/workflows/MacOS-pack.yml

@@ -5,41 +5,42 @@ on:
     branches:
       - master
     paths-ignore:
-      - '*.md'
-      - 'LICENSE'
-      - 'docs/**'
+      - "*.md"
+      - "LICENSE"
+      - "docs/**"
 
   pull_request:
     paths-ignore:
-      - '*.md'
-      - 'LICENSE'
-      - 'docs/**'
-      - 'data/translations/*.ts'
+      - "*.md"
+      - "LICENSE"
+      - "docs/**"
+      - "data/translations/*.ts"
 
   workflow_dispatch:
 
 env:
   PRODUCT: flameshot
+  MACOSX_DEPLOYMENT_TARGET: "14.0"
 
 jobs:
   dmg-pack:
     name: Build dmg on ${{ matrix.dist.os }} ${{ matrix.dist.arch }}
+
     strategy:
       fail-fast: false
       matrix:
         dist:
-          - {
-              os: macos-26,
-              arch: arm64
-            }
-          - {
-              os: macos-26-intel,
-              arch: intel
-            }
+          - os: macos-26
+            arch: arm64
+          - os: macos-26-intel
+            arch: intel
+
     runs-on: ${{ matrix.dist.os }}
+
     env:
       APP_NAME: flameshot
       DIR_BUILD: build
+
     steps:
       - name: Checkout Source code
         if: github.event_name == 'push'
@@ -64,28 +65,56 @@ jobs:
           git_revno=$(git rev-list $(git describe --tags --abbrev=0)..HEAD --count)
           git_hash=$(git rev-parse --short HEAD)
           ver_info=${last_committed_tag}+git${git_revno}.${git_hash}
+
           echo "=======FLAMESHOT VERSION========"
           echo ${last_committed_tag:1}
           echo "Details: ${ver_info}"
           echo "================================"
-          # This will allow to build pre-preleases without git tag
-          # echo "VERSION=${last_committed_tag:1}" >> $GITHUB_ENV
-          echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*FLAMESHOT_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
+
+          echo "VERSION=$(grep 'set.*(.*FLAMESHOT_VERSION' CMakeLists.txt | sed 's/[^0-9.]*//' | sed 's/)//g')" >> $GITHUB_ENV
           echo "VER_INFO=${ver_info}" >> $GITHUB_ENV
           echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Install Qt
         run: brew install qt@6
 
+      - name: Print build environment
+        run: |
+          echo "Deployment target: ${MACOSX_DEPLOYMENT_TARGET}"
+          xcodebuild -version
+          xcrun --sdk macosx --show-sdk-path
+          clang --version
+          cmake --version
+          brew info qt@6
+          brew --prefix qt@6
+
       - name: Configure
         run: |
-          rm -rf "${DIR_BUILD}"/src/flameshot.dmg "${DIR_BUILD}"/src/flameshot.app/
-          cmake -GNinja -S . -B "${DIR_BUILD}" -DQt6_DIR=$(brew --prefix qt6)/lib/cmake/Qt6 -DUSE_MONOCHROME_ICON=True
+          rm -rf "${DIR_BUILD}/src/flameshot.dmg"
+          rm -rf "${DIR_BUILD}/src/flameshot.app"
+
+          cmake \
+            -GNinja \
+            -S . \
+            -B "${DIR_BUILD}" \
+            -DQt6_DIR="$(brew --prefix qt@6)/lib/cmake/Qt6" \
+            -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
+            -DCMAKE_OSX_SYSROOT="$(xcrun --sdk macosx --show-sdk-path)" \
+            -DUSE_MONOCHROME_ICON=True
+
+      - name: Show CMake deployment target
+        run: |
+          grep CMAKE_OSX_DEPLOYMENT_TARGET "${DIR_BUILD}/CMakeCache.txt" || true
 
       - name: Compile
         run: |
           cmake --build "${DIR_BUILD}"
 
+      - name: Inspect resulting executable
+        run: |
+          otool -l "${DIR_BUILD}/src/flameshot.app/Contents/MacOS/flameshot" | \
+            sed -n '/LC_BUILD_VERSION/,/cmd/p'
+
       - name: Build dmg package
         run: |
           cd "${DIR_BUILD}"

flameshot.example.ini

@@ -64,6 +64,9 @@
 ;; Last used tool thickness; same thickness shared by Pencil, Line, Arrow, Rectangular Selection, Circle (int)
 ;drawThickness=3
 ;
+;; Arrow style: 0 = default, 1 = curved (int)
+;arrowStyle=0
+;
 ;; Last used font size (int)
 ;drawFontSize=8
 ;

packaging/flatpak/org.flameshot.Flameshot.yml

@@ -1,6 +1,6 @@
 app-id: org.flameshot.Flameshot
 runtime: org.kde.Platform
-runtime-version: '6.9'
+runtime-version: '6.10'
 sdk: org.kde.Sdk
 command: flameshot
 finish-args:
@@ -29,18 +29,20 @@ modules:
     sources:
       - type: git
         url: https://gitlab.com/mattbas/Qt-Color-Widgets.git
-        commit: 352bc8f99bf2174d5724ee70623427aa31ddc26a
+        commit: 5d52e907e50dc88cf969b41cea44665ff6c475b1
         dest: external/Qt-Color-Widgets
 
       - type: git
         url: https://github.com/KDAB/KDSingleApplication.git
         tag: v1.2.0
+        commit: 3186a158f8e6565e89f5983b4028c892737844ff
         dest: external/KDSingleApplication
-
+        
       - type: git
         url: https://github.com/flameshot-org/flameshot.git
         branch: master
-        #tag: v13.0.0
+        # tag: v14.0.0
+        # commit: e408812d77ff1835957f85796c4cf737466bd69d
 
     cleanup:
       - /share/bash-completion

packaging/rpm/flameshot.spec

@@ -44,8 +44,12 @@ Requires: hicolor-icon-theme
 %if 0%{?suse_version}
 Requires: qt6-svg
 %else
+%if 0%{?fedora} || 0%{?rhel}
+Requires: qt6-qtsvg%{?_isa}
+%else
 Requires: qt6-svg%{?_isa}
 %endif
+%endif
 
 %if 0%{?suse_version}
 Recommends: qt6-imageformats