diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile index c72ff88c0b56..0e59d5264e3a 100644 --- a/deskutils/treesheets/Makefile +++ b/deskutils/treesheets/Makefile @@ -1,31 +1,31 @@ PORTNAME= treesheets -DISTVERSION= 2507 +DISTVERSION= 2527 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 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 6c0ae4022014..28532db3f62e 100644 --- a/deskutils/treesheets/distinfo +++ b/deskutils/treesheets/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1757527112 -SHA256 (aardappel-treesheets-2507_GH0.tar.gz) = dfd21bb46c9f456d6e6107d8edbf1ae8556da0c05830bd2c64415074989e1d3f -SIZE (aardappel-treesheets-2507_GH0.tar.gz) = 2358134 +TIMESTAMP = 1758377940 +SHA256 (aardappel-treesheets-2527_GH0.tar.gz) = 5eb0da666e8ba889727ec296088ada24becf6e005983f96fb47630ca09b91eff +SIZE (aardappel-treesheets-2527_GH0.tar.gz) = 2359233 SHA256 (aardappel-lobster-v2025.3_GH0.tar.gz) = 8eef481d779f9c1d53e860341e582d54732cbec997b5a05c0f4628107fc1e12d SIZE (aardappel-lobster-v2025.3_GH0.tar.gz) = 26681905 diff --git a/deskutils/treesheets/files/patch-CMakeLists.txt b/deskutils/treesheets/files/patch-CMakeLists.txt index 7263d8e56183..b3b2b86f21a3 100644 --- a/deskutils/treesheets/files/patch-CMakeLists.txt +++ b/deskutils/treesheets/files/patch-CMakeLists.txt @@ -1,69 +1,56 @@ Build with system wx workaround: https://github.com/aardappel/treesheets/issues/1083 ---- CMakeLists.txt.orig 2025-09-10 10:53:00 UTC +--- CMakeLists.txt.orig 2025-09-20 08:01:27 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( include(FetchContent) FetchContent_Declare( - wxwidgets - GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets - GIT_TAG v3.2.8 - FIND_PACKAGE_ARGS 3.2.8 NAMES wxWidgets -) -FetchContent_Declare( lobster GIT_REPOSITORY https://github.com/aardappel/lobster GIT_TAG v2025.3 ) -FetchContent_MakeAvailable(wxwidgets lobster) +FetchContent_MakeAvailable(lobster) ### Options -@@ -143,7 +137,11 @@ target_precompile_headers(TreeSheets PUBLIC src/stdafx +@@ -143,7 +137,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() -@@ -153,11 +151,11 @@ target_link_libraries(TreeSheets PRIVATE ${TREESHEETS_ - - ## Platform specific installation paths - --if(LINUX) -+if(LINUX OR BSD) - OPTION(TREESHEETS_RELOCATABLE_INSTALLATION "Install data relative to the TreeSheets binary, instead of respecting the Filesystem Hierarchy Standard" OFF) - endif() - --if(LINUX AND NOT TREESHEETS_RELOCATABLE_INSTALLATION) -+if((LINUX OR BSD) AND NOT TREESHEETS_RELOCATABLE_INSTALLATION) - include(GNUInstallDirs) - - set(TREESHEETS_BINDIR ${CMAKE_INSTALL_BINDIR}) -@@ -193,7 +191,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $ +@@ -193,7 +192,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})