-
-
Notifications
You must be signed in to change notification settings - Fork 19.7k
flameshot: 12.1.0-unstable-2025-05-04 -> 13.0.1 #431307
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| --- a/CMakeLists.txt 2025-08-15 11:37:20 | ||
| +++ b/CMakeLists.txt 2025-08-15 11:40:06 | ||
| @@ -29,21 +29,7 @@ | ||
| if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt") | ||
| 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 | ||
| - ) | ||
| - #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() | ||
| - else() | ||
| - FetchContent_MakeAvailable(qtColorWidgets) | ||
| - endif() | ||
| + find_package(QtColorWidgets REQUIRED) | ||
| endif() | ||
|
|
||
| # This can be read from ${PROJECT_NAME} after project() is called | ||
| @@ -115,12 +101,7 @@ | ||
| if(EXISTS "${CMAKE_SOURCE_DIR}/external/KDSingleApplication/CMakeLists.txt") | ||
| add_subdirectory("${CMAKE_SOURCE_DIR}/external/KDSingleApplication") | ||
| else() | ||
| - FetchContent_Declare( | ||
| - kdsingleApplication | ||
| - GIT_REPOSITORY https://github.com/KDAB/KDSingleApplication.git | ||
| - GIT_TAG v1.2.0 | ||
| - ) | ||
| - FetchContent_MakeAvailable(KDSingleApplication) | ||
| + find_package(KDSingleApplication-qt6 REQUIRED) | ||
| endif() | ||
| endif() | ||
|
|
||
| @@ -128,12 +109,7 @@ | ||
| option(BUILD_STATIC_LIBS ON) | ||
|
|
||
| if (APPLE) | ||
| - FetchContent_Declare( | ||
| - qHotKey | ||
| - GIT_REPOSITORY https://github.com/flameshot-org/QHotkey | ||
| - GIT_TAG master | ||
| - ) | ||
| - FetchContent_MakeAvailable(QHotKey) | ||
| + find_package(QHotKey REQUIRED) | ||
| endif() | ||
|
|
||
| add_subdirectory(src) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| --- a/src/CMakeLists.txt 2025-08-12 16:34:27 | ||
| +++ b/src/CMakeLists.txt 2025-08-15 11:45:56 | ||
| @@ -220,7 +220,7 @@ | ||
|
|
||
| target_link_libraries( | ||
| flameshot | ||
| - kdsingleapplication | ||
| + kdsingleapplication-qt6 | ||
| ) | ||
| endif() | ||
|
|
||
| @@ -447,64 +447,3 @@ | ||
| endif () | ||
| endif () | ||
|
|
||
| -# macdeployqt | ||
| -if (APPLE) | ||
| -# Code signing settings - optional, set to empty string to skip signing | ||
| - set(CODE_SIGN_IDENTITY "" CACHE STRING "Code signing identity (leave empty to skip signing)") | ||
| - set(DMG_SIGN_IDENTITY "" CACHE STRING "DMG signing identity (leave empty to skip signing)") | ||
| - # Custom target to create DMG (signed or unsigned) | ||
| - add_custom_target(create_dmg | ||
| - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../packaging/macos/create_dmg.sh | ||
| - "${CMAKE_CURRENT_BINARY_DIR}/Flameshot.app" | ||
| - "${CMAKE_CURRENT_BINARY_DIR}/Flameshot-${PROJECT_VERSION}.dmg" | ||
| - "${CODE_SIGN_IDENTITY}" | ||
| - "${DMG_SIGN_IDENTITY}" | ||
| - DEPENDS flameshot | ||
| - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} | ||
| - COMMENT "Creating DMG" | ||
| - VERBATIM | ||
| - ) | ||
| - | ||
| -# Always sign the app bundle (either with identity or ad hoc) | ||
| - if(CODE_SIGN_IDENTITY AND NOT CODE_SIGN_IDENTITY STREQUAL "") | ||
| - # Identity-based signing (requires Developer ID) | ||
| - add_custom_command(TARGET flameshot POST_BUILD | ||
| - COMMAND codesign --force --deep --sign "${CODE_SIGN_IDENTITY}" | ||
| - --options runtime --timestamp "$<TARGET_BUNDLE_DIR:flameshot>" | ||
| - COMMENT "Code signing app bundle with ${CODE_SIGN_IDENTITY}" | ||
| - ) | ||
| - else() | ||
| - # Ad hoc signing | ||
| - add_custom_command(TARGET flameshot POST_BUILD | ||
| - COMMAND codesign --force --deep --sign - "$<TARGET_BUNDLE_DIR:flameshot>" | ||
| - COMMENT "Ad hoc code signing app bundle (no identity required)" | ||
| - ) | ||
| - endif() | ||
| - # Deploy Qt libraries and dependencies | ||
| - find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS ${Qt6_DIR}/../../../bin) | ||
| - | ||
| - if(MACDEPLOYQT_EXECUTABLE) | ||
| - add_custom_command(TARGET flameshot POST_BUILD | ||
| - COMMAND ${MACDEPLOYQT_EXECUTABLE} "$<TARGET_BUNDLE_DIR:flameshot>" -verbose=2 | ||
| - COMMENT "Deploying Qt libraries" | ||
| - ) | ||
| - | ||
| - # Re-sign after macdeployqt (it modifies the bundle) | ||
| - if(CODE_SIGN_IDENTITY AND NOT CODE_SIGN_IDENTITY STREQUAL "") | ||
| - add_custom_command(TARGET flameshot POST_BUILD | ||
| - COMMAND codesign --force --deep --sign "${CODE_SIGN_IDENTITY}" | ||
| - --options runtime --timestamp "$<TARGET_BUNDLE_DIR:flameshot>" | ||
| - COMMENT "Re-signing app bundle after Qt deployment" | ||
| - ) | ||
| - else() | ||
| - add_custom_command(TARGET flameshot POST_BUILD | ||
| - COMMAND codesign --force --deep --sign - "$<TARGET_BUNDLE_DIR:flameshot>" | ||
| - COMMENT "Re-signing app bundle after Qt deployment (ad hoc)" | ||
| - ) | ||
| - endif() | ||
| - else() | ||
| - message(WARNING "macdeployqt not found. App may not run on systems without Qt installed.") | ||
| - endif() | ||
| - | ||
| - | ||
| -endif () |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| { | ||
| stdenv, | ||
| lib, | ||
| fetchFromGitHub, | ||
| cmake, | ||
| qtbase, | ||
| }: | ||
|
|
||
| stdenv.mkDerivation (finalAttrs: { | ||
| pname = "qhotkey"; | ||
| version = "1.5.0-unstable-2025-07-06"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "Skycoder42"; | ||
| repo = "qhotkey"; | ||
| rev = "6c0e98492c59206139f8490706aadeb8ed033057"; | ||
| hash = "sha256-F+NTVYIB55GlB+p9mgDvJD86n0xOOKMGCRDM8TtnMpo="; | ||
| }; | ||
|
|
||
| dontWrapQtApps = true; | ||
|
|
||
| cmakeFlags = [ | ||
| "-DQT_DEFAULT_MAJOR_VERSION=${lib.versions.major qtbase.version}" | ||
| ]; | ||
| nativeBuildInputs = [ | ||
| cmake | ||
| ]; | ||
|
|
||
| buildInputs = [ | ||
| qtbase | ||
| ]; | ||
|
|
||
| meta = { | ||
| homepage = "https://github.com/Skycoder42/QHotkey"; | ||
| description = "Global shortcut/hotkey for Desktop Qt-Applications"; | ||
| license = lib.licenses.bsd3; | ||
| maintainers = with lib.maintainers; [ dmkhitaryan ]; | ||
| platforms = lib.platforms.linux ++ lib.platforms.darwin; | ||
| }; | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| { | ||
| stdenv, | ||
| lib, | ||
| fetchFromGitLab, | ||
| cmake, | ||
| qtbase, | ||
| }: | ||
|
|
||
| stdenv.mkDerivation (finalAttrs: { | ||
| pname = "qt-color-widgets"; | ||
| version = "2.2.0-unstable-2025-05-26"; | ||
|
|
||
| src = fetchFromGitLab { | ||
| owner = "mattbas"; | ||
| repo = "qt-color-widgets"; | ||
| rev = "8491078434b24cba295b5e41cc0d2a94c7049a5b"; | ||
|
dmkhitaryan marked this conversation as resolved.
Outdated
|
||
| hash = "sha256-77G1NU7079pvqhQnSTmMdkd2g1R2hoJxn183WcsWq8c="; | ||
| }; | ||
|
|
||
| dontWrapQtApps = true; | ||
|
|
||
| cmakeFlags = [ | ||
| "-DQT_VERSION_MAJOR=${lib.versions.major qtbase.version}" | ||
| ]; | ||
| nativeBuildInputs = [ | ||
| cmake | ||
| ]; | ||
|
|
||
| buildInputs = [ | ||
| qtbase | ||
| ]; | ||
|
|
||
| meta = { | ||
| homepage = "https://gitlab.com/mattbas/Qt-Color-Widgets"; | ||
| description = "Qt (C++) widgets to manage color inputs"; | ||
| license = lib.licenses.lgpl3Plus; | ||
| maintainers = with lib.maintainers; [ dmkhitaryan ]; | ||
| platforms = lib.platforms.linux ++ lib.platforms.darwin; | ||
| }; | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.