git: 5e3cf01a75ef - main - deskutils/treesheets: Update to 2507
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Sep 2025 22:17:22 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5e3cf01a75ef46779b85d5f72a3dd2eea62d225b
commit 5e3cf01a75ef46779b85d5f72a3dd2eea62d225b
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2025-09-10 22:14:55 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-09-10 22:17:11 +0000
deskutils/treesheets: Update to 2507
- Switch to new upstream versioning
- Remove PORTSCOUT
- Apply build with system wx workaround
ChangeLog: https://github.com/aardappel/treesheets/compare/15700798552...2507
---
deskutils/treesheets/Makefile | 13 +++---
deskutils/treesheets/distinfo | 8 ++--
deskutils/treesheets/files/patch-CMakeLists.txt | 53 ++++++++++++++++++++-----
3 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile
index b5b717c57c16..c72ff88c0b56 100644
--- a/deskutils/treesheets/Makefile
+++ b/deskutils/treesheets/Makefile
@@ -1,6 +1,5 @@
PORTNAME= treesheets
-DISTVERSION= 1.0.20250617
-PORTREVISION= 1
+DISTVERSION= 2507
CATEGORIES= deskutils
MAINTAINER= eduardo@FreeBSD.org
@@ -13,13 +12,11 @@ LICENSE_FILE= ${WRKSRC}/ZLIB_LICENSE.txt
USES= cmake desktop-file-utils shared-mime-info
USE_GITHUB= yes
GH_ACCOUNT= aardappel
-GH_TAGNAME= 15700798552
USE_WX= 3.2
-
-PORTSCOUT= ignore:1 # upstream uses CI run ids as releases
+GH_TUPLE= aardappel:lobster:v2025.3:external/lobster
PORTDATA= images scripts
-PORTDOCS= docs readme.html
+PORTDOCS= docs readme-ko.html readme-zh_CN.html readme.html
PORTEXAMPLES= examples
OPTIONS_DEFINE= DOCS EXAMPLES NLS
@@ -27,4 +24,8 @@ 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 <bsd.port.mk>
diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo
index 60da807e7903..6c0ae4022014 100644
--- a/deskutils/treesheets/distinfo
+++ b/deskutils/treesheets/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1750158203
-SHA256 (aardappel-treesheets-1.0.20250617-15700798552_GH0.tar.gz) = 33146a7f5ae30ae7dbe5692b18ed6ed5b06c5b475c736fb52e05813e3c2ccf67
-SIZE (aardappel-treesheets-1.0.20250617-15700798552_GH0.tar.gz) = 3312954
+TIMESTAMP = 1757527112
+SHA256 (aardappel-treesheets-2507_GH0.tar.gz) = dfd21bb46c9f456d6e6107d8edbf1ae8556da0c05830bd2c64415074989e1d3f
+SIZE (aardappel-treesheets-2507_GH0.tar.gz) = 2358134
+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 745c53af74c3..7263d8e56183 100644
--- a/deskutils/treesheets/files/patch-CMakeLists.txt
+++ b/deskutils/treesheets/files/patch-CMakeLists.txt
@@ -1,15 +1,50 @@
---- CMakeLists.txt.orig 2025-06-14 21:33:28 UTC
+Build with system wx workaround:
+https://github.com/aardappel/treesheets/issues/1083
+
+--- CMakeLists.txt.orig 2025-09-10 10:53:00 UTC
+++ CMakeLists.txt
-@@ -4,7 +4,7 @@ string(TIMESTAMP TimeStamp "%y%m%d.%H%M" UTC)
-
- string(TIMESTAMP TimeStamp "%y%m%d.%H%M" UTC)
+@@ -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 ${TimeStamp})
-@@ -174,11 +174,11 @@ target_link_libraries(TreeSheets PRIVATE ${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
+ 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})
+ if(WIN32)
+ list(APPEND TREESHEETS_LIBS StackWalker)
+ endif()
+@@ -153,11 +151,11 @@ target_link_libraries(TreeSheets PRIVATE ${TREESHEETS_
## Platform specific installation paths
@@ -23,10 +58,10 @@
include(GNUInstallDirs)
set(TREESHEETS_BINDIR ${CMAKE_INSTALL_BINDIR})
-@@ -211,7 +211,7 @@ install(FILES TS/readme.html DESTINATION ${TREESHEETS_
- install(TARGETS TreeSheets DESTINATION ${TREESHEETS_BINDIR})
+@@ -193,7 +191,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $
install(DIRECTORY TS/docs DESTINATION ${TREESHEETS_DOCDIR})
- install(FILES TS/readme.html 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})