Commit d6df7a56 authored by David Mkhitaryan's avatar David Mkhitaryan
Browse files

flameshot: 13.3.0 -> 14.0rc1

parent 00beb32e

pkgs/by-name/fl/flameshot/load-missing-deps.patch

+27 −27
Original line number Diff line number Diff line 
--- a/CMakeLists.txt	2025-08-21 13:12:55

+++ b/CMakeLists.txt	2025-08-21 13:16:26

@@ -24,28 +24,8 @@

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -35,27 +35,7 @@

 #Needed due to linker error with QtColorWidget

 set(CMAKE_POSITION_INDEPENDENT_CODE ON)

 

+find_package(QtColorWidgets REQUIRED)

 

-

-# 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)
@@ -13,7 +12,7 @@ 
-  FetchContent_Declare(

-    qtColorWidgets

-    GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git

-        GIT_TAG 352bc8f99bf2174d5724ee70623427aa31ddc26a

-    GIT_TAG 5d52e907e50dc88cf969b41cea44665ff6c475b1

-  )

-  #Workaround for duplicate GUID in windows WIX installer

-  if(WIN32)
@@ -26,14 +25,15 @@ 
-    FetchContent_MakeAvailable(qtColorWidgets)

-  endif()

-endif()

-

+find_package(QtColorWidgets REQUIRED)

 

 # This can be read from ${PROJECT_NAME} after project() is called

 if(APPLE)

   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")

@@ -133,12 +113,7 @@

@@ -124,12 +104,7 @@

 # ToDo: Check if this is used anywhere

 option(BUILD_STATIC_LIBS ON)

 

 if (APPLE)

 if(WIN32 OR APPLE)

-  FetchContent_Declare(

-    qHotKey

-    GIT_REPOSITORY https://github.com/flameshot-org/QHotkey

pkgs/by-name/fl/flameshot/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport); 


stdenv.mkDerivation (finalAttrs: {

  pname = "flameshot";

  version = "13.3.0";

  version = "14.0.rc1";



  src = fetchFromGitHub {

    owner = "flameshot-org";

    repo = "flameshot";

    tag = "v${finalAttrs.version}";

    hash = "sha256-RyoLniRmJRinLUwgmaA4RprYAVHnoPxCP9LyhHfUPe0=";

    hash = "sha256-7YvmZ9oSYD3VepIml4ixj40IPfTAR0R3MF8DuhdkHUM=";

  };



  cmakeFlags = [