On Sun, Aug 17, 2025 at 05:03:53PM +0200, Rafael Sadowski wrote: > On Sun Aug 17, 2025 at 04:55:55PM +0200, Denis Fondras wrote: > > This update is a hotfix for a Qt6 issue on multi monitor X11 setup. > > > > @bin bin/flameshot > > -@man man/man1/flameshot.1 > > +@mandir man/man/ > > +man/man/man1/ > > +@man man/man/man1/flameshot.1 > > This is wrong an should be as before.
Thank you, here is the proper diff. Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/flameshot/Makefile,v diff -u -p -r1.16 Makefile --- Makefile 12 Aug 2025 15:56:14 -0000 1.16 +++ Makefile 17 Aug 2025 15:27:50 -0000 @@ -3,8 +3,7 @@ CATEGORIES = graphics x11 GH_ACCOUNT = flameshot-org GH_PROJECT = flameshot -GH_TAGNAME = v13.0.1 -REVISION = 0 +GH_TAGNAME = v13.1.0 HOMEPAGE = https://flameshot.org/ MAINTAINER = Denis Fondras <[email protected]> @@ -27,7 +26,8 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+4,-guic CONFIGURE_ARGS += -DENABLE_CACHE=OFF \ - -DDISABLE_UPDATE_CHECKER=OFF + -DDISABLE_UPDATE_CHECKER=OFF \ + -DUSE_BUNDLED_KDSINGLEAPPLICATION=OFF CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON \ -Wno-dev Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/flameshot/distinfo,v diff -u -p -r1.10 distinfo --- distinfo 7 Aug 2025 20:36:16 -0000 1.10 +++ distinfo 17 Aug 2025 15:27:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (flameshot-13.0.1.tar.gz) = VIhnrmelzw+7iyu13sKsThE8KYDtqau3h4BBw3Tlr6Y= -SIZE (flameshot-13.0.1.tar.gz) = 16003231 +SHA256 (flameshot-13.1.0.tar.gz) = HXVaYYvcs+c59pHOpV7S1DL5PlIaUE+Vt0q+0MWV9vc= +SIZE (flameshot-13.1.0.tar.gz) = 16028319 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/flameshot/patches/patch-CMakeLists_txt,v diff -u -p -r1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 12 Aug 2025 15:56:14 -0000 1.1 +++ patches/patch-CMakeLists_txt 17 Aug 2025 15:27:50 -0000 @@ -18,17 +18,3 @@ Index: CMakeLists.txt FetchContent_Declare( qtColorWidgets GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git -@@ -111,8 +115,12 @@ if (USE_KDSINGLEAPPLICATION) - set(KDSingleApplication_EXAMPLES OFF CACHE BOOL "Don't build the examples") - set(KDSingleApplication_STATIC ON CACHE BOOL "Build static versions of the libraries") - -+ find_package(KDSingleApplication-qt6) -+ -+ if(KDSingleApplication-qt6_FOUND) -+ message(STATUS "Found system KDSingleApplication package") - # Check if KDSingleApplication is available locally -- if(EXISTS "${CMAKE_SOURCE_DIR}/external/KDSingleApplication/CMakeLists.txt") -+ elseif(EXISTS "${CMAKE_SOURCE_DIR}/external/KDSingleApplication/CMakeLists.txt") - add_subdirectory("${CMAKE_SOURCE_DIR}/external/KDSingleApplication") - else() - FetchContent_Declare( Index: patches/patch-src_CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/flameshot/patches/patch-src_CMakeLists_txt,v diff -u -p -r1.5 patch-src_CMakeLists_txt --- patches/patch-src_CMakeLists_txt 12 Aug 2025 15:56:14 -0000 1.5 +++ patches/patch-src_CMakeLists_txt 17 Aug 2025 15:27:50 -0000 @@ -3,16 +3,7 @@ Install manpage to correct location Index: src/CMakeLists.txt --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -220,7 +220,7 @@ if (USE_KDSINGLEAPPLICATION) - - target_link_libraries( - flameshot -- kdsingleapplication -+ KDAB::kdsingleapplication - ) - endif() - -@@ -362,7 +362,7 @@ if (UNIX) +@@ -366,7 +366,7 @@ if (UNIX) # Install man pages configure_file(${CMAKE_SOURCE_DIR}/data/man/man1/flameshot.1 @@ -21,11 +12,11 @@ Index: src/CMakeLists.txt # Install Icons configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/48x48/apps/org.flameshot.Flameshot.png -@@ -385,6 +385,7 @@ if (UNIX) +@@ -389,6 +389,7 @@ if (UNIX) ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/flameshot.svg COPYONLY) # Install assets -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/ DESTINATION ${CMAKE_INSTALL_PREFIX}/man) ++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man DESTINATION ${CMAKE_INSTALL_PREFIX}) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) # Install Translations
