diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile index af4cd8e4ed71..ff3c27937f13 100644 --- a/deskutils/treesheets/Makefile +++ b/deskutils/treesheets/Makefile @@ -1,31 +1,31 @@ PORTNAME= treesheets -DISTVERSION= 2732 +DISTVERSION= 2770 CATEGORIES= deskutils MAINTAINER= eduardo@FreeBSD.org COMMENT= Free form data organizer WWW= https://strlen.com/treesheets/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/ZLIB_LICENSE.txt USES= cmake desktop-file-utils shared-mime-info USE_GITHUB= yes GH_ACCOUNT= aardappel USE_WX= 3.2 -GH_TUPLE= aardappel:lobster:v2025.3:external/lobster +GH_TUPLE= aardappel:lobster:v2025.4:external/lobster PORTDATA= images scripts PORTDOCS= docs readme-ko.html readme-zh_CN.html readme.html PORTEXAMPLES= examples OPTIONS_DEFINE= DOCS EXAMPLES NLS OPTIONS_SUB= yes NLS_USES= gettext-tools post-extract: ${MKDIR} ${WRKDIR}/.build/_deps/lobster-src ${CP} -R ${WRKSRC}/lobster/* ${WRKDIR}/.build/_deps/lobster-src .include diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo index 023300184cfb..b09219ca8999 100644 --- a/deskutils/treesheets/distinfo +++ b/deskutils/treesheets/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1762623583 -SHA256 (aardappel-treesheets-2732_GH0.tar.gz) = 8f51f9d4208fc3167225eece854251230c465f9139902b7cf51809a6bf9e2641 -SIZE (aardappel-treesheets-2732_GH0.tar.gz) = 2369063 -SHA256 (aardappel-lobster-v2025.3_GH0.tar.gz) = 8eef481d779f9c1d53e860341e582d54732cbec997b5a05c0f4628107fc1e12d -SIZE (aardappel-lobster-v2025.3_GH0.tar.gz) = 26681905 +TIMESTAMP = 1764019516 +SHA256 (aardappel-treesheets-2770_GH0.tar.gz) = fbb5ee49a337f8b02ef6b13a69b7e50ff84f1a9b0ed45b169c5bf92c06457523 +SIZE (aardappel-treesheets-2770_GH0.tar.gz) = 2369783 +SHA256 (aardappel-lobster-v2025.4_GH0.tar.gz) = 572501f84f25cf91cdf9abf66f07b33997416abe3f99836f32ee13e699588e73 +SIZE (aardappel-lobster-v2025.4_GH0.tar.gz) = 26641610 diff --git a/deskutils/treesheets/files/patch-CMakeLists.txt b/deskutils/treesheets/files/patch-CMakeLists.txt index b3b2b86f21a3..b9993f8df96e 100644 --- a/deskutils/treesheets/files/patch-CMakeLists.txt +++ b/deskutils/treesheets/files/patch-CMakeLists.txt @@ -1,56 +1,58 @@ Build with system wx workaround: https://github.com/aardappel/treesheets/issues/1083 ---- CMakeLists.txt.orig 2025-09-20 08:01:27 UTC +--- CMakeLists.txt.orig 2025-11-24 18:18:51 UTC +++ CMakeLists.txt @@ -7,7 +7,7 @@ endif() set(TREESHEETS_VERSION "${timestamp}") endif() -project(TreeSheets +project(treesheets DESCRIPTION "A free-form hierarchical data organizer" HOMEPAGE_URL "https://github.com/aardappel/treesheets" VERSION "${TREESHEETS_VERSION}") -@@ -32,17 +32,11 @@ FetchContent_Declare( +@@ -32,19 +32,12 @@ FetchContent_Declare( include(FetchContent) FetchContent_Declare( - wxwidgets - GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets - GIT_TAG v3.2.8 +- GIT_SHALLOW ON - FIND_PACKAGE_ARGS 3.2.8 NAMES wxWidgets -) -FetchContent_Declare( lobster GIT_REPOSITORY https://github.com/aardappel/lobster - GIT_TAG v2025.3 + GIT_TAG v2025.4 + GIT_SHALLOW ON ) -FetchContent_MakeAvailable(wxwidgets lobster) +FetchContent_MakeAvailable(lobster) ### Options -@@ -143,7 +137,12 @@ target_precompile_headers(TreeSheets PUBLIC src/stdafx +@@ -145,7 +138,12 @@ target_precompile_headers(TreeSheets PUBLIC src/stdafx target_precompile_headers(TreeSheets PUBLIC src/stdafx.h) ## Link wxWidgets, lobster-impl and StackWalker into TreeSheets -set(TREESHEETS_LIBS wx::aui wx::adv wx::core wx::xml wx::net lobster-impl) +find_package(wxWidgets REQUIRED COMPONENTS aui adv core xml net) +set(TREESHEETS_LIBS ${wxWidgets_LIBRARIES} lobster-impl) +target_link_libraries(TreeSheets PRIVATE ${TREESHEETS_LIBS}) +target_include_directories(TreeSheets PRIVATE ${wxWidgets_INCLUDE_DIRS}) +target_compile_definitions(TreeSheets PRIVATE ${wxWidgets_DEFINITIONS}) +# https://github.com/aardappel/treesheets/issues/1083 if(WIN32) list(APPEND TREESHEETS_LIBS StackWalker) endif() -@@ -193,7 +192,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $ +@@ -195,7 +193,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $ install(DIRECTORY TS/docs DESTINATION ${TREESHEETS_DOCDIR}) file(GLOB treesheets_readme_files "TS/readme*.html") install(FILES ${treesheets_readme_files} DESTINATION ${TREESHEETS_DOCDIR}) -install(DIRECTORY TS/examples DESTINATION ${TREESHEETS_DOCDIR}) +install(DIRECTORY TS/examples DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/${CMAKE_PROJECT_NAME}) install(DIRECTORY TS/images DESTINATION ${TREESHEETS_PKGDATADIR}) install(DIRECTORY TS/scripts DESTINATION ${TREESHEETS_PKGDATADIR})