pyrox.dev / nixpkgs
lol
fork atom

flameshot: 13.0.1 -> 13.1.0

dmkhitaryan ff63eca9 c8ea26ce

+28 -41
unified split
+17 -24
pkgs/by-name/fl/flameshot/load-missing-deps.patch
··· 1 - --- a/CMakeLists.txt 2025-08-15 11:37:20 2 - +++ b/CMakeLists.txt 2025-08-15 11:40:06 3 - @@ -29,21 +29,7 @@ 4 - if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt") 5 - add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL) 6 - else() 1 + --- a/CMakeLists.txt 2025-08-21 13:12:55 2 + +++ b/CMakeLists.txt 2025-08-21 13:16:26 3 + @@ -24,28 +24,8 @@ 4 + #Needed due to linker error with QtColorWidget 5 + set(CMAKE_POSITION_INDEPENDENT_CODE ON) 6 + 7 + +find_package(QtColorWidgets REQUIRED) 8 + 9 + -# Dependency can be fetched via flatpak builder 10 + -if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt") 11 + - add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL) 12 + -else() 7 13 - FetchContent_Declare( 8 14 - qtColorWidgets 9 15 - GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git ··· 19 25 - else() 20 26 - FetchContent_MakeAvailable(qtColorWidgets) 21 27 - endif() 22 - + find_package(QtColorWidgets REQUIRED) 23 - endif() 24 - 28 + -endif() 29 + - 25 30 # This can be read from ${PROJECT_NAME} after project() is called 26 - @@ -115,12 +101,7 @@ 27 - if(EXISTS "${CMAKE_SOURCE_DIR}/external/KDSingleApplication/CMakeLists.txt") 28 - add_subdirectory("${CMAKE_SOURCE_DIR}/external/KDSingleApplication") 29 - else() 30 - - FetchContent_Declare( 31 - - kdsingleApplication 32 - - GIT_REPOSITORY https://github.com/KDAB/KDSingleApplication.git 33 - - GIT_TAG v1.2.0 34 - - ) 35 - - FetchContent_MakeAvailable(KDSingleApplication) 36 - + find_package(KDSingleApplication-qt6 REQUIRED) 37 - endif() 38 - endif() 39 - 40 - @@ -128,12 +109,7 @@ 31 + if (APPLE) 32 + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version") 33 + @@ -133,12 +113,7 @@ 41 34 option(BUILD_STATIC_LIBS ON) 42 35 43 36 if (APPLE)
+8 -15
pkgs/by-name/fl/flameshot/macos-build.patch
··· 1 - --- a/src/CMakeLists.txt 2025-08-12 16:34:27 2 - +++ b/src/CMakeLists.txt 2025-08-15 11:45:56 3 - @@ -220,7 +220,7 @@ 4 - 5 - target_link_libraries( 6 - flameshot 7 - - kdsingleapplication 8 - + kdsingleapplication-qt6 9 - ) 10 - endif() 11 - 12 - @@ -447,64 +447,3 @@ 1 + --- a/src/CMakeLists.txt 2025-08-21 13:12:55 2 + +++ b/src/CMakeLists.txt 2025-08-21 13:18:55 3 + @@ -449,66 +449,4 @@ 4 + else () 5 + message(WARNING "Unable to find executable windeployqt.") 13 6 endif () 14 - endif () 15 - 7 + -endif () 8 + - 16 9 -# macdeployqt 17 10 -if (APPLE) 18 11 -# Code signing settings - optional, set to empty string to skip signing ··· 73 66 - endif() 74 67 - 75 68 - 76 - -endif () 69 + endif ()
+3 -2
pkgs/by-name/fl/flameshot/package.nix
··· 18 18 19 19 stdenv.mkDerivation (finalAttrs: { 20 20 pname = "flameshot"; 21 - version = "13.0.1"; 21 + version = "13.1.0"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "flameshot-org"; 25 25 repo = "flameshot"; 26 26 tag = "v${finalAttrs.version}"; 27 - hash = "sha256-Zo+rhvpwhcYqgn8PZ0b48sCb/YWqGSormFnY6pbY8Qc="; 27 + hash = "sha256-Wg0jc1AqgetaESmTyhzAHx3zal/5DMDum7fzhClqeck="; 28 28 }; 29 29 30 30 cmakeFlags = [ 31 31 "-DCMAKE_CXX_FLAGS=-I${kdsingleapplication}/include/kdsingleapplication-qt6" 32 + (lib.cmakeBool "USE_BUNDLED_KDSINGLEAPPLICATION" false) 32 33 (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true) 33 34 (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon) 34 35 ]