Merge pull request flameshot-org#4393 from Quentium-Forks/master

Author: borgmanJeremy

.github/workflows/build_cmake.yml

@@ -68,10 +68,7 @@ jobs:
         shell: bash
         working-directory: ${{runner.workspace}}/build
         # Note the current convention is to use the -S and -B options here to specify source
-        # and build directories, but this is only available with CMake 3.13 and higher.
-        # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-        #
-        # We need to source the profile file to make sure conan is in PATH
+        # and build directories. We need to source the profile file to make sure conan is in PATH
         run: |
           cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
       - name: Build

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.22)
 # cmake_policy(SET CMP0076 OLD)
 
 set(FLAMESHOT_VERSION 13.3.0)
@@ -7,9 +7,9 @@ set(FLAMESHOT_VERSION 13.3.0)
 set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")
 
 project(
-        flameshot
-        VERSION ${FLAMESHOT_VERSION}
-        LANGUAGES CXX)
+  flameshot
+  VERSION ${FLAMESHOT_VERSION}
+  LANGUAGES CXX)
 set(PROJECT_NAME_CAPITALIZED "Flameshot")
 
 include(FetchContent)
@@ -27,27 +27,27 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # Dependency can be fetched via flatpak builder
 if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt")
-    add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
+  add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
 else()
-    FetchContent_Declare(
-        qtColorWidgets
-        GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
-        GIT_TAG 352bc8f99bf2174d5724ee70623427aa31ddc26a
-    )
+  FetchContent_Declare(
+    qtColorWidgets
+    GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
+    GIT_TAG 352bc8f99bf2174d5724ee70623427aa31ddc26a
+  )
   #Workaround for duplicate GUID in windows WIX installer
-  if (WIN32)
-      FetchContent_GetProperties(qtColorWidgets)
-      if(NOT qtcolorwidgets_POPULATED)
-          FetchContent_Populate(qtColorWidgets)
-          add_subdirectory(${qtcolorwidgets_SOURCE_DIR} ${qtcolorwidgets_BINARY_DIR} EXCLUDE_FROM_ALL)
-      endif()
+  if(WIN32)
+    FetchContent_GetProperties(qtColorWidgets)
+    if(NOT qtcolorwidgets_POPULATED)
+      FetchContent_Populate(qtColorWidgets)
+      add_subdirectory(${qtcolorwidgets_SOURCE_DIR} ${qtcolorwidgets_BINARY_DIR} EXCLUDE_FROM_ALL)
+    endif()
   else()
-      FetchContent_MakeAvailable(qtColorWidgets)
+    FetchContent_MakeAvailable(qtColorWidgets)
   endif()
 endif()
 
 # This can be read from ${PROJECT_NAME} after project() is called
-if (APPLE)
+if(APPLE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 endif()
 
@@ -66,8 +66,8 @@ elseif(APPLE)
   set(Qt6_DIR "$(brew --prefix qt6)/lib/cmake/Qt6/" CACHE PATH "directory where Qt6Config.cmake exists.")
 endif()
 set(RUN_IN_PLACE
-        ${DEFAULT_RUN_IN_PLACE}
-        CACHE BOOL "Run directly in source directory structure")
+  ${DEFAULT_RUN_IN_PLACE}
+  CACHE BOOL "Run directly in source directory structure")
 
 
 option(FLAMESHOT_DEBUG_CAPTURE "Enable mode to make debugging easier" OFF)
@@ -80,13 +80,13 @@ option(USE_WAYLAND_CLIPBOARD "USE KF Gui Wayland Clipboard" OFF)
 option(DISABLE_UPDATE_CHECKER "Disable check for updates" OFF)
 option(ENABLE_IMGUR "Enable Imgur Uploader" OFF)
 
-if (ENABLE_IMGUR)
+if(ENABLE_IMGUR)
   add_compile_definitions(ENABLE_IMGUR)
 endif()
 
-if (DISABLE_UPDATE_CHECKER)
+if(DISABLE_UPDATE_CHECKER)
   add_compile_definitions(DISABLE_UPDATE_CHECKER)
-endif ()
+endif()
 
 include(cmake/StandardProjectSettings.cmake)
 
@@ -108,8 +108,8 @@ enable_sanitizers(project_options)
 
 # allow for static analysis options include(cmake/StaticAnalyzers.cmake)
 
-if (USE_KDSINGLEAPPLICATION)
-  if (USE_BUNDLED_KDSINGLEAPPLICATION)
+if(USE_KDSINGLEAPPLICATION)
+  if(USE_BUNDLED_KDSINGLEAPPLICATION)
     set(KDSingleApplication_EXAMPLES OFF CACHE BOOL "Don't build the examples")
     set(KDSingleApplication_STATIC ON CACHE BOOL "Build static versions of the libraries")
 
@@ -118,9 +118,9 @@ if (USE_KDSINGLEAPPLICATION)
       add_subdirectory("${CMAKE_SOURCE_DIR}/external/KDSingleApplication")
     else()
       FetchContent_Declare(
-          kdsingleApplication
-          GIT_REPOSITORY https://github.com/KDAB/KDSingleApplication.git
-          GIT_TAG v1.2.0
+        kdsingleApplication
+        GIT_REPOSITORY https://github.com/KDAB/KDSingleApplication.git
+        GIT_TAG v1.2.0
       )
       FetchContent_MakeAvailable(kdsingleApplication)
     endif()
@@ -132,11 +132,11 @@ endif()
 # ToDo: Check if this is used anywhere
 option(BUILD_STATIC_LIBS ON)
 
-if (APPLE)
+if(APPLE)
   FetchContent_Declare(
-      qHotKey
-      GIT_REPOSITORY https://github.com/flameshot-org/QHotkey
-      GIT_TAG master
+    qHotKey
+    GIT_REPOSITORY https://github.com/flameshot-org/QHotkey
+    GIT_TAG master
   )
   FetchContent_MakeAvailable(QHotKey)
 endif()

README.md

@@ -42,7 +42,7 @@
       <img alt="Get it from the Snap Store" src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg" />
     </a>
     <a href="https://flathub.org/apps/details/org.flameshot.Flameshot">
-      <img height="60" alt="Download on Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.svg"/>
+      <img height="60" alt="Get it on Flathub" src="https://flathub.org/api/badge?locale=en"/>
     </a>
   </p>
 </div>
@@ -414,10 +414,10 @@ Also you can open and build/debug the project in a C++ IDE. For example, in Qt C
 
 #### Compile-time
 
-- Qt >= 6.0
+- Qt >= 6.2.4 (available by default on Ubuntu Jammy)
   + Development tools
-- GCC >= 7.4
-- CMake >= 3.29
+- GCC >= 11
+- CMake >= 3.22
 
 #### Run-time
 

packaging/debian/compat

@@ -1 +1 @@
-11
+12

packaging/debian/control

@@ -3,27 +3,37 @@ Section: graphics
 Priority: optional
 Maintainer: Boyuan Yang <[email protected]>
 Build-Depends:
- cmake (>= 3.13~),
- debhelper (>= 11),
- qt6-base-dev (>= 6.2.0~),
- qt6-tools-dev (>= 6.2.0~),
- qt6-tools-dev-tools (>= 6.2.0~),
- qt6-svg-dev (>= 6.2.0~) | libqt6svg6-dev (>= 6.2.0~),
- qt6-l10n-tools,
+ cmake (>= 3.22~),
+ debhelper (>= 12),
+ qt6-base-dev (>= 6.2.4~),
+ qt6-tools-dev (>= 6.2.4~),
+ qt6-tools-dev-tools (>= 6.2.4~),
+ qt6-svg-dev (>= 6.2.4~) | libqt6svg6-dev (>= 6.2.4~),
+ qt6-l10n-tools (>= 6.2.4~),
  libgl-dev,
-Standards-Version: 4.5.0
-Homepage: https://github.com/flameshot-org/flameshot
+Rules-Requires-Root: no
+Standards-Version: 4.7.2
+Homepage: https://flameshot.org/
 Vcs-Browser: https://github.com/flameshot-org/flameshot
 Vcs-Git: https://github.com/flameshot-org/flameshot.git
 
 Package: flameshot
 Architecture: any
+# Ubuntu noble expanded shlibs are suffixed with t64 for Qt dependencies, later versions of Ubuntu reverted back without suffix so make it future proof
+# ${shlibs:Depends},
 Depends:
- hicolor-icon-theme,
- libqt6svg6 (>= 6.2.0~),
- qt6-qpa-plugins (>= 6.2.0~),
- ${shlibs:Depends},
  ${misc:Depends},
+ libc6 (>= 2.35),
+ libgcc-s1 (>= 11),
+ libstdc++6 (>= 11),
+ hicolor-icon-theme,
+ qt6-qpa-plugins (>= 6.2.4~),
+ libqt6core6 (>= 6.2.4~),
+ libqt6dbus6 (>= 6.2.4~),
+ libqt6gui6 (>= 6.2.4~),
+ libqt6network6 (>= 6.2.4~),
+ libqt6widgets6 (>= 6.2.4~),
+ libqt6svg6 (>= 6.2.4~),
 Recommends:
  xdg-desktop-portal-gtk | xdg-desktop-portal-gnome | xdg-desktop-portal-kde | xdg-desktop-portal-wlr,
  grim,

packaging/rpm/fedora/flameshot.spec

@@ -10,26 +10,26 @@ URL:     https://github.com/flameshot-org/flameshot
 Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Vendor:  Flameshot
 
-BuildRequires: cmake >= 3.13.0
-BuildRequires: gcc-c++ >= 7
+BuildRequires: cmake >= 3.22
+BuildRequires: gcc-c++ >= 11
 BuildRequires: fdupes
 BuildRequires: libappstream-glib
 BuildRequires: ninja-build
 BuildRequires: desktop-file-utils
 
-BuildRequires: cmake(Qt6Core) >= 6.0.0
+BuildRequires: cmake(Qt6Core) >= 6.2.4
 BuildRequires: cmake(KF6GuiAddons) >= 6.7.0
-BuildRequires: cmake(Qt6DBus) >= 6.0.0
-BuildRequires: cmake(Qt6Gui) >= 6.0.0
-BuildRequires: cmake(Qt6LinguistTools) >= 6.0.0
-BuildRequires: cmake(Qt6Network) >= 6.0.0
-BuildRequires: cmake(Qt6Svg) >= 6.0.0
-BuildRequires: cmake(Qt6Widgets) >= 6.0.0
+BuildRequires: cmake(Qt6DBus) >= 6.2.4
+BuildRequires: cmake(Qt6Gui) >= 6.2.4
+BuildRequires: cmake(Qt6LinguistTools) >= 6.2.4
+BuildRequires: cmake(Qt6Network) >= 6.2.4
+BuildRequires: cmake(Qt6Svg) >= 6.2.4
+BuildRequires: cmake(Qt6Widgets) >= 6.2.4
 
 Requires: hicolor-icon-theme
-Requires: qt6-qtbase >= 6.0.0
-Requires: qt6-qttools >= 6.0.0
-Requires: qt6-qtsvg >= 6.0.0
+Requires: qt6-qtbase >= 6.2.4
+Requires: qt6-qttools >= 6.2.4
+Requires: qt6-qtsvg >= 6.2.4
 
 Recommends: qt6-qtimageformats
 Recommends: xdg-desktop-portal%{?_isa}

packaging/rpm/opensuse/flameshot.spec

@@ -10,25 +10,25 @@ URL:     https://github.com/flameshot-org/flameshot
 Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Vendor:  Flameshot
 
-BuildRequires: cmake >= 3.13.0
-BuildRequires: gcc-c++ >= 7
+BuildRequires: cmake >= 3.22
+BuildRequires: gcc-c++ >= 11
 BuildRequires: fdupes
 BuildRequires: update-desktop-files
 BuildRequires: appstream-glib
 BuildRequires: desktop-file-utils
 
-BuildRequires: cmake(Qt6Core) >= 6.0.0
-BuildRequires: cmake(Qt6DBus) >= 6.0.0
-BuildRequires: cmake(Qt6Gui) >= 6.0.0
-BuildRequires: cmake(Qt6LinguistTools) >= 6.0.0
-BuildRequires: cmake(Qt6Network) >= 6.0.0
-BuildRequires: cmake(Qt6Svg) >= 6.0.0
-BuildRequires: cmake(Qt6Widgets) >= 6.0.0
+BuildRequires: cmake(Qt6Core) >= 6.2.4
+BuildRequires: cmake(Qt6DBus) >= 6.2.4
+BuildRequires: cmake(Qt6Gui) >= 6.2.4
+BuildRequires: cmake(Qt6LinguistTools) >= 6.2.4
+BuildRequires: cmake(Qt6Network) >= 6.2.4
+BuildRequires: cmake(Qt6Svg) >= 6.2.4
+BuildRequires: cmake(Qt6Widgets) >= 6.2.4
 
 Requires: hicolor-icon-theme
-Requires: qt6-base >= 6.0.0
-Requires: qt6-tools >= 6.0.0
-Requires: qt6-svg >= 6.0.0
+Requires: qt6-base >= 6.2.4
+Requires: qt6-tools >= 6.2.4
+Requires: qt6-svg >= 6.2.4
 
 Recommends: qt6-imageformats
 Recommends: xdg-desktop-portal%{?_isa}