diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 750693bb6c98..535e25da83e5 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -58,6 +58,8 @@ - `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0) +- Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds. + ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/pkgs/by-name/fl/flameshot/load-missing-deps.patch b/pkgs/by-name/fl/flameshot/load-missing-deps.patch index 9fdb2c46d7a4..ccd4efc29a3d 100644 --- a/pkgs/by-name/fl/flameshot/load-missing-deps.patch +++ b/pkgs/by-name/fl/flameshot/load-missing-deps.patch @@ -1,46 +1,46 @@ ---- 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) +- 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 5d52e907e50dc88cf969b41cea44665ff6c475b1 +- ) - #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() -- ++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 @@ + if(APPLE) +@@ -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 -- GIT_TAG master +- qHotKey +- GIT_REPOSITORY https://github.com/flameshot-org/QHotkey +- GIT_TAG master - ) - FetchContent_MakeAvailable(QHotKey) + find_package(QHotKey REQUIRED) endif() - + add_subdirectory(src) \ No newline at end of file diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 7ae09fd008df..054c8c93ea94 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -19,13 +19,13 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport); stdenv.mkDerivation (finalAttrs: { pname = "flameshot"; - version = "13.3.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; tag = "v${finalAttrs.version}"; - hash = "sha256-RyoLniRmJRinLUwgmaA4RprYAVHnoPxCP9LyhHfUPe0="; + hash = "sha256-GnJ3nOJyyqQbCTMrTYhnQfEOXqCy0x3IapX/PsaZ3VI="; }; cmakeFlags = [