diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile index 29c1a5d36af3..e0e30659f677 100644 --- a/deskutils/treesheets/Makefile +++ b/deskutils/treesheets/Makefile @@ -1,31 +1,31 @@ PORTNAME= treesheets -DISTVERSION= 3033 +DISTVERSION= 3048 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:v2026.1:external/lobster-src 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 ${LN} -s ${WRKSRC}/lobster-src ${WRKDIR}/.build/_deps/lobster-src .include diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo index 832e4c55c0c5..90ca82475e7d 100644 --- a/deskutils/treesheets/distinfo +++ b/deskutils/treesheets/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1773001382 -SHA256 (aardappel-treesheets-3033_GH0.tar.gz) = cf51ff943669b51c4fd208b5bbc9df25cbaa8285883e8cbb3267749c0e31cc3c -SIZE (aardappel-treesheets-3033_GH0.tar.gz) = 2386752 +TIMESTAMP = 1775153726 +SHA256 (aardappel-treesheets-3048_GH0.tar.gz) = 7cd724747c418a9270fa21f3d09e514304d21c61aeb875df979577df7856de8b +SIZE (aardappel-treesheets-3048_GH0.tar.gz) = 2387163 SHA256 (aardappel-lobster-v2026.1_GH0.tar.gz) = fecd443c8bf03052f0eca3308bb8428e1f40292d61fb370e060e55094f853d67 SIZE (aardappel-lobster-v2026.1_GH0.tar.gz) = 26704113 diff --git a/deskutils/treesheets/files/patch-CMakeLists.txt b/deskutils/treesheets/files/patch-CMakeLists.txt index d13935e2aeff..ba4f1bd7f898 100644 --- a/deskutils/treesheets/files/patch-CMakeLists.txt +++ b/deskutils/treesheets/files/patch-CMakeLists.txt @@ -1,53 +1,53 @@ Build with system wx workaround: https://github.com/aardappel/treesheets/issues/1083 ---- CMakeLists.txt.orig 2026-03-08 20:24:05 UTC +--- CMakeLists.txt.orig 2026-03-22 09:59:32 UTC +++ CMakeLists.txt -@@ -12,7 +12,7 @@ endif() +@@ -11,7 +11,7 @@ endif() message(STATUS "User-defined version: ${TREESHEETS_VERSION}") endif() -project(TreeSheets +project(treesheets DESCRIPTION "A free-form hierarchical data organizer" HOMEPAGE_URL "https://github.com/aardappel/treesheets" VERSION "${TREESHEETS_VERSION}") -@@ -42,15 +42,6 @@ include(FetchContent) +@@ -41,15 +41,6 @@ include(FetchContent) include(FetchContent) -FetchContent_Declare( - wxwidgets - GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets - GIT_TAG v3.2.10 - GIT_SHALLOW ON - FIND_PACKAGE_ARGS 3.2.10 NAMES wxWidgets -) -FetchContent_MakeAvailable(wxwidgets) - if(ENABLE_LOBSTER) FetchContent_Declare( lobster -@@ -138,7 +129,12 @@ endif(ENABLE_LOBSTER) +@@ -137,7 +128,12 @@ endif(ENABLE_LOBSTER) if(ENABLE_LOBSTER) target_link_libraries(TreeSheets PRIVATE lobster-impl) endif(ENABLE_LOBSTER) -target_link_libraries(TreeSheets PRIVATE wx::aui wx::adv wx::core wx::xml wx::net) +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 ### Installation -@@ -193,7 +189,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $ +@@ -192,7 +188,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})