Date: Mon, 09 Mar 2026 18:09:02 +0000 From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5014ca16762a - main - deskutils/treesheets: Update to 3033 Message-ID: <69af0cbe.1c824.333bf220@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5014ca16762a50855fc4aeb3b4837e45150b6ed1 commit 5014ca16762a50855fc4aeb3b4837e45150b6ed1 Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2026-03-08 20:40:42 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2026-03-09 18:08:43 +0000 deskutils/treesheets: Update to 3033 ChangeLog: https://github.com/aardappel/treesheets/compare/2981...3033 --- deskutils/treesheets/Makefile | 4 ++-- deskutils/treesheets/distinfo | 10 ++++----- deskutils/treesheets/files/patch-CMakeLists.txt | 30 ++++++++++++------------- deskutils/treesheets/pkg-plist | 1 + 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile index 398cfc3dbcde..29c1a5d36af3 100644 --- a/deskutils/treesheets/Makefile +++ b/deskutils/treesheets/Makefile @@ -1,5 +1,5 @@ PORTNAME= treesheets -DISTVERSION= 2981 +DISTVERSION= 3033 CATEGORIES= deskutils MAINTAINER= eduardo@FreeBSD.org @@ -13,7 +13,7 @@ USES= cmake desktop-file-utils shared-mime-info USE_GITHUB= yes GH_ACCOUNT= aardappel USE_WX= 3.2 -GH_TUPLE= aardappel:lobster:v2025.4:external/lobster-src +GH_TUPLE= aardappel:lobster:v2026.1:external/lobster-src PORTDATA= images scripts PORTDOCS= docs readme-ko.html readme-zh_CN.html readme.html diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo index 67862666b57e..832e4c55c0c5 100644 --- a/deskutils/treesheets/distinfo +++ b/deskutils/treesheets/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1770847501 -SHA256 (aardappel-treesheets-2981_GH0.tar.gz) = 4811dfddf7da8b961a3b456cd22b4b8c719d8bcfd1545489b6f6b62b06633127 -SIZE (aardappel-treesheets-2981_GH0.tar.gz) = 2383071 -SHA256 (aardappel-lobster-v2025.4_GH0.tar.gz) = 572501f84f25cf91cdf9abf66f07b33997416abe3f99836f32ee13e699588e73 -SIZE (aardappel-lobster-v2025.4_GH0.tar.gz) = 26641610 +TIMESTAMP = 1773001382 +SHA256 (aardappel-treesheets-3033_GH0.tar.gz) = cf51ff943669b51c4fd208b5bbc9df25cbaa8285883e8cbb3267749c0e31cc3c +SIZE (aardappel-treesheets-3033_GH0.tar.gz) = 2386752 +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 a3b4c4d556c7..d13935e2aeff 100644 --- a/deskutils/treesheets/files/patch-CMakeLists.txt +++ b/deskutils/treesheets/files/patch-CMakeLists.txt @@ -1,10 +1,10 @@ Build with system wx workaround: https://github.com/aardappel/treesheets/issues/1083 ---- CMakeLists.txt.orig 2026-01-03 13:46:06 UTC +--- CMakeLists.txt.orig 2026-03-08 20:24:05 UTC +++ CMakeLists.txt -@@ -7,7 +7,7 @@ endif() - set(TREESHEETS_VERSION "${timestamp}") +@@ -12,7 +12,7 @@ endif() + message(STATUS "User-defined version: ${TREESHEETS_VERSION}") endif() -project(TreeSheets @@ -12,37 +12,37 @@ https://github.com/aardappel/treesheets/issues/1083 DESCRIPTION "A free-form hierarchical data organizer" HOMEPAGE_URL "https://github.com/aardappel/treesheets" VERSION "${TREESHEETS_VERSION}") -@@ -37,15 +37,6 @@ include(FetchContent) +@@ -42,15 +42,6 @@ include(FetchContent) include(FetchContent) -FetchContent_Declare( - wxwidgets - GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets -- GIT_TAG v3.2.9 +- GIT_TAG v3.2.10 - GIT_SHALLOW ON -- FIND_PACKAGE_ARGS 3.2.9 NAMES wxWidgets +- FIND_PACKAGE_ARGS 3.2.10 NAMES wxWidgets -) -FetchContent_MakeAvailable(wxwidgets) - if(ENABLE_LOBSTER) FetchContent_Declare( lobster -@@ -130,7 +121,12 @@ target_precompile_headers(TreeSheets PUBLIC src/stdafx - target_precompile_headers(TreeSheets PUBLIC src/stdafx.h) - - ## Link wxWidgets and lobster-impl into TreeSheets --set(TREESHEETS_LIBS wx::aui wx::adv wx::core wx::xml wx::net) +@@ -138,7 +129,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 - if(ENABLE_LOBSTER) - list(APPEND TREESHEETS_LIBS lobster-impl) - endif(ENABLE_LOBSTER) -@@ -180,7 +176,7 @@ install(FILES ${treesheets_readme_files} DESTINATION $ + + ### Installation + +@@ -193,7 +189,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}) diff --git a/deskutils/treesheets/pkg-plist b/deskutils/treesheets/pkg-plist index f355e7a096a3..dd2972927c6e 100644 --- a/deskutils/treesheets/pkg-plist +++ b/deskutils/treesheets/pkg-plist @@ -8,4 +8,5 @@ share/icons/hicolor/scalable/apps/com.strlen.TreeSheets.svg %%NLS%%share/locale/pt_BR/LC_MESSAGES/ts.mo %%NLS%%share/locale/ru_RU/LC_MESSAGES/ts.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/ts.mo +share/metainfo/com.strlen.TreeSheets.metainfo.xml share/mime/packages/com.strlen.TreeSheets.xmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69af0cbe.1c824.333bf220>