Uncodedtech · pull · Aug 23, 2025 · Aug 22, 2025 · Aug 23, 2025 · Aug 23, 2025
diff --git a/.github/workflows/Linux-arm-pack.yml b/.github/workflows/Linux-arm-pack.yml
@@ -103,6 +103,8 @@ jobs:
           # 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 "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
+
 
       - name: Get packpack tool
         uses: actions/checkout@v4

diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml
@@ -94,6 +94,7 @@ jobs:
           # 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 "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Get packpack tool
         uses: actions/checkout@v4
@@ -184,6 +185,7 @@ jobs:
           # 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 "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Get packpack tool
         uses: actions/checkout@v4
@@ -311,6 +313,7 @@ jobs:
           # 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 "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Install Dependencies
         run: |
@@ -404,6 +407,7 @@ jobs:
           # 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 "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Setup flatpak
         run: |
@@ -476,6 +480,7 @@ jobs:
           # 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 "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Packaging snap
         uses: snapcore/action-build@v1

diff --git a/.github/workflows/MacOS-pack.yml b/.github/workflows/MacOS-pack.yml
@@ -72,6 +72,7 @@ jobs:
           # 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 "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Install Qt
         run: brew install qt@6 cmake

diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml
@@ -89,6 +89,7 @@ jobs:
           # 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 "VER_INFO=${ver_info}" >> $GITHUB_ENV
+          echo "GIT_HASH=${git_hash}" >> $GITHUB_ENV
 
       - name: Restore from cache and run vcpkg
         uses: lukka/run-vcpkg@v11

diff --git a/data/translations/Internationalization_bg.ts b/data/translations/Internationalization_bg.ts
diff --git a/data/translations/Internationalization_ca.ts b/data/translations/Internationalization_ca.ts
diff --git a/data/translations/Internationalization_cs.ts b/data/translations/Internationalization_cs.ts
diff --git a/data/translations/Internationalization_de_DE.ts b/data/translations/Internationalization_de_DE.ts
diff --git a/data/translations/Internationalization_el.ts b/data/translations/Internationalization_el.ts
diff --git a/data/translations/Internationalization_en.ts b/data/translations/Internationalization_en.ts
diff --git a/data/translations/Internationalization_es.ts b/data/translations/Internationalization_es.ts
diff --git a/data/translations/Internationalization_eu.ts b/data/translations/Internationalization_eu.ts
diff --git a/data/translations/Internationalization_fa.ts b/data/translations/Internationalization_fa.ts
diff --git a/data/translations/Internationalization_fi.ts b/data/translations/Internationalization_fi.ts
diff --git a/data/translations/Internationalization_fr.ts b/data/translations/Internationalization_fr.ts
diff --git a/data/translations/Internationalization_gl.ts b/data/translations/Internationalization_gl.ts
diff --git a/data/translations/Internationalization_he.ts b/data/translations/Internationalization_he.ts
diff --git a/data/translations/Internationalization_hu.ts b/data/translations/Internationalization_hu.ts
diff --git a/data/translations/Internationalization_id.ts b/data/translations/Internationalization_id.ts
diff --git a/data/translations/Internationalization_it_IT.ts b/data/translations/Internationalization_it_IT.ts
diff --git a/data/translations/Internationalization_ja.ts b/data/translations/Internationalization_ja.ts
diff --git a/data/translations/Internationalization_ka.ts b/data/translations/Internationalization_ka.ts
diff --git a/data/translations/Internationalization_ko.ts b/data/translations/Internationalization_ko.ts
diff --git a/data/translations/Internationalization_nb_NO.ts b/data/translations/Internationalization_nb_NO.ts
diff --git a/data/translations/Internationalization_nl.ts b/data/translations/Internationalization_nl.ts
diff --git a/data/translations/Internationalization_nl_NL.ts b/data/translations/Internationalization_nl_NL.ts
diff --git a/data/translations/Internationalization_pl.ts b/data/translations/Internationalization_pl.ts
diff --git a/data/translations/Internationalization_pt_BR.ts b/data/translations/Internationalization_pt_BR.ts
diff --git a/data/translations/Internationalization_ru.ts b/data/translations/Internationalization_ru.ts
diff --git a/data/translations/Internationalization_sk.ts b/data/translations/Internationalization_sk.ts
diff --git a/data/translations/Internationalization_sr_SP.ts b/data/translations/Internationalization_sr_SP.ts
diff --git a/data/translations/Internationalization_sv_SE.ts b/data/translations/Internationalization_sv_SE.ts
diff --git a/data/translations/Internationalization_tr.ts b/data/translations/Internationalization_tr.ts
diff --git a/data/translations/Internationalization_uk.ts b/data/translations/Internationalization_uk.ts
diff --git a/data/translations/Internationalization_vi.ts b/data/translations/Internationalization_vi.ts
diff --git a/data/translations/Internationalization_zh_CN.ts b/data/translations/Internationalization_zh_CN.ts
diff --git a/data/translations/Internationalization_zh_HK.ts b/data/translations/Internationalization_zh_HK.ts
diff --git a/data/translations/Internationalization_zh_TW.ts b/data/translations/Internationalization_zh_TW.ts
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -273,7 +273,7 @@
    endif ()

    if (NOT USE_OPENSSL)
        message(WARNING "OpenSSL is required to upload screenshots")
    endif ()
 endif ()

@@ -286,16 +286,22 @@
 message("Flameshot predefined color palette large: " ${FLAMESHOT_PREDEFINED_COLOR_PALETTE_LARGE})
 target_compile_definitions(flameshot PRIVATE PREDEFINED_COLOR_PALETTE_LARGE=${FLAMESHOT_PREDEFINED_COLOR_PALETTE_LARGE})
 
-find_package (Git)
-if (GIT_FOUND)
-    message("git found: ${GIT_EXECUTABLE} in version     ${GIT_VERSION_STRING}")
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD OUTPUT_VARIABLE FLAMESHOT_GIT_HASH)
-    string(REGEX REPLACE "\r*\n$" "" FLAMESHOT_GIT_HASH "${FLAMESHOT_GIT_HASH}")
+if( DEFINED ENV{GIT_HASH})
+    message("Using provided git_commit_hash: $ENV{GIT_HASH}")
+    set(FLAMESHOT_GIT_HASH $ENV{GIT_HASH})
     target_compile_definitions(flameshot PRIVATE FLAMESHOT_GIT_HASH="${FLAMESHOT_GIT_HASH}")
-    message("FLAMESHOT_GIT_HASH: ${FLAMESHOT_GIT_HASH}")
 else()
-    target_compile_definitions(flameshot PRIVATE FLAMESHOT_GIT_HASH="-")
-    message("git command is not found")
+    find_package (Git)
+    if (GIT_FOUND)
+        message("git found: ${GIT_EXECUTABLE} in version     ${GIT_VERSION_STRING}")
+        execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD OUTPUT_VARIABLE FLAMESHOT_GIT_HASH)
+        string(REGEX REPLACE "\r*\n$" "" FLAMESHOT_GIT_HASH "${FLAMESHOT_GIT_HASH}")
+        target_compile_definitions(flameshot PRIVATE FLAMESHOT_GIT_HASH="${FLAMESHOT_GIT_HASH}")
+        message("FLAMESHOT_GIT_HASH: ${FLAMESHOT_GIT_HASH}")
+    else()
+        target_compile_definitions(flameshot PRIVATE FLAMESHOT_GIT_HASH="-")
+        message("git command is not found")
+    endif ()
 endif ()
 target_compile_definitions(flameshot PRIVATE APP_PREFIX="${CMAKE_INSTALL_PREFIX}")
 target_compile_definitions(flameshot PRIVATE APP_VERSION="v${PROJECT_VERSION}")
@@ -442,7 +448,7 @@
                        FILES_MATCHING
                        PATTERN "*.dll")
            else ()
                message(WARNING "Unable to find OpenSSL dlls.")
            endif ()
        endif ()