From af093679f2ed4169ea64cfd6a52f8adee5ac6332 Mon Sep 17 00:00:00 2001
From: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
Date: Tue, 14 May 2024 11:39:13 -0600
Subject: [PATCH] fix: MacOS 12 build

---
 .github/workflows/Linux-pack.yml   | 4 +++-
 .github/workflows/MacOS-pack.yml   | 6 ++++--
 .github/workflows/Windows-pack.yml | 6 ++++--
 CMakeLists.txt                     | 4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml
index 0278f3fe43..0b66aefa7f 100644
--- a/.github/workflows/Linux-pack.yml
+++ b/.github/workflows/Linux-pack.yml
@@ -7,8 +7,10 @@ on:
     paths-ignore:
       - 'README.md'
       - 'LICENSE'
-
+  workflow_dispatch:
   pull_request:
+    branches:
+      - master
     paths-ignore:
       - 'README.md'
       - 'LICENSE'
diff --git a/.github/workflows/MacOS-pack.yml b/.github/workflows/MacOS-pack.yml
index 57f5dfd59e..258712cde1 100644
--- a/.github/workflows/MacOS-pack.yml
+++ b/.github/workflows/MacOS-pack.yml
@@ -4,12 +4,13 @@ on:
   push:
     branches:
       - master
-      - feature/RND-680-macos-.dmg-package-build
     paths-ignore:
       - 'README.md'
       - 'LICENSE'
-
+  workflow_dispatch:
   pull_request:
+    branches:
+      - master
     paths-ignore:
       - 'README.md'
       - 'LICENSE'
@@ -53,6 +54,7 @@ jobs:
       - name: Configure
         run: |
           rm -rf "${DIR_BULD}"/src/flameshot.dmg "${DIR_BULD}"/src/flameshot.app/
+          cp "./packaging/macos/flameshot.icns" "${DIR_BULD}/build/flameshot.icns"
           cmake -S . -B "${DIR_BULD}" -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5 -DUSE_MONOCHROME_ICON=True
 
       - name: Compile
diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml
index a84866813d..777bb83ab7 100644
--- a/.github/workflows/Windows-pack.yml
+++ b/.github/workflows/Windows-pack.yml
@@ -3,12 +3,14 @@ name: Packaging(Windows)
 on:
   push:
     branches:
-      - master*
+      - master
     paths-ignore:
       - 'README.md'
       - 'LICENSE'
-
+  workflow_dispatch:
   pull_request:
+    branches:
+      - master
     paths-ignore:
       - 'README.md'
       - 'LICENSE'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d8dbc58c1..0201b2c8af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.13)
 set(FLAMESHOT_VERSION 12.1.0.5)
 
 # Flameshot-org
-set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")
+# set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")
 # Namecheap
-# set(GIT_API_URL "https://api.github.com/repos/namecheap/flameshot/releases/latest")
+set(GIT_API_URL "https://api.github.com/repos/namecheap/flameshot/releases/latest")
 
 # TODO - fix it for all linux distros
 #find_package (Git)