git: 6056232a156f - main - deskutils/treesheets: Update to 2895
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Dec 2025 06:08:22 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6056232a156f8c5aaf67667ef4139ca5128d5433
commit 6056232a156f8c5aaf67667ef4139ca5128d5433
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2025-12-24 23:15:31 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-12-25 06:08:06 +0000
deskutils/treesheets: Update to 2895
ChangeLog: https://github.com/aardappel/treesheets/compare/2830...2895
---
deskutils/treesheets/Makefile | 2 +-
deskutils/treesheets/distinfo | 6 ++--
deskutils/treesheets/files/patch-CMakeLists.txt | 42 ++++++++++++++-----------
3 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile
index 6ef81473150a..4fca5634545f 100644
--- a/deskutils/treesheets/Makefile
+++ b/deskutils/treesheets/Makefile
@@ -1,5 +1,5 @@
PORTNAME= treesheets
-DISTVERSION= 2830
+DISTVERSION= 2895
CATEGORIES= deskutils
MAINTAINER= eduardo@FreeBSD.org
diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo
index 80d294eb5634..51fbb361a1fa 100644
--- a/deskutils/treesheets/distinfo
+++ b/deskutils/treesheets/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1765142176
-SHA256 (aardappel-treesheets-2830_GH0.tar.gz) = 43f22f596e124cff2d58fd1e7d0708da17c43819c8a8d2870d8479bff62c5f53
-SIZE (aardappel-treesheets-2830_GH0.tar.gz) = 2370036
+TIMESTAMP = 1766616084
+SHA256 (aardappel-treesheets-2895_GH0.tar.gz) = 01e987306d3e38fdd449df7857e10499f4a914abf8fd1ac08de79c59ea5b2b17
+SIZE (aardappel-treesheets-2895_GH0.tar.gz) = 2371313
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 281d98aa50dc..8a650234b4ab 100644
--- a/deskutils/treesheets/files/patch-CMakeLists.txt
+++ b/deskutils/treesheets/files/patch-CMakeLists.txt
@@ -1,7 +1,7 @@
Build with system wx workaround:
https://github.com/aardappel/treesheets/issues/1083
---- CMakeLists.txt.orig 2025-12-07 19:27:28 UTC
+--- CMakeLists.txt.orig 2025-12-23 17:42:28 UTC
+++ CMakeLists.txt
@@ -7,7 +7,7 @@ endif()
set(TREESHEETS_VERSION "${timestamp}")
@@ -12,42 +12,46 @@ https://github.com/aardappel/treesheets/issues/1083
DESCRIPTION "A free-form hierarchical data organizer"
HOMEPAGE_URL "https://github.com/aardappel/treesheets"
VERSION "${TREESHEETS_VERSION}")
-@@ -32,19 +32,12 @@ FetchContent_Declare(
+@@ -32,13 +32,6 @@ include(FetchContent)
+ ### Thirdparty dependencies
include(FetchContent)
- FetchContent_Declare(
+-FetchContent_Declare(
- wxwidgets
- GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets
- GIT_TAG v3.2.9
- GIT_SHALLOW ON
- FIND_PACKAGE_ARGS 3.2.9 NAMES wxWidgets
-)
--FetchContent_Declare(
- lobster
- GIT_REPOSITORY https://github.com/aardappel/lobster
- GIT_TAG v2025.4
- GIT_SHALLOW ON
- )
--FetchContent_MakeAvailable(wxwidgets lobster)
-+FetchContent_MakeAvailable(lobster)
+ if(ENABLE_LOBSTER)
+ FetchContent_Declare(
+ lobster
+@@ -46,9 +39,7 @@ if(ENABLE_LOBSTER)
+ GIT_TAG v2025.4
+ GIT_SHALLOW ON
+ )
+- FetchContent_MakeAvailable(wxwidgets lobster)
+-else(ENABLE_LOBSTER)
+- FetchContent_MakeAvailable(wxwidgets)
++ FetchContent_MakeAvailable(lobster)
+ endif(ENABLE_LOBSTER)
- ### Options
-@@ -145,7 +138,12 @@ target_precompile_headers(TreeSheets PUBLIC src/stdafx
+@@ -131,7 +122,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)
+ ## Link wxWidgets and lobster-impl into TreeSheets
+-set(TREESHEETS_LIBS 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
- if(WIN32)
- list(APPEND TREESHEETS_LIBS StackWalker)
- endif()
-@@ -195,7 +193,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $
+ if(ENABLE_LOBSTER)
+ list(APPEND TREESHEETS_LIBS lobster-impl)
+ endif(ENABLE_LOBSTER)
+@@ -181,7 +177,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})