Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Aug 2024 10:22:50 GMT
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: 4ffd449f0cfd - main - deskutils/treesheets: Update to 20240802 snapshot
Message-ID:  <202408061022.476AMoHq046664@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ffd449f0cfdbef7d1c78442ad3ea0be9ab12ea3

commit 4ffd449f0cfdbef7d1c78442ad3ea0be9ab12ea3
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-08-06 09:09:22 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-08-06 10:22:34 +0000

    deskutils/treesheets: Update to 20240802 snapshot
    
    ChangeLog:
    https://github.com/aardappel/treesheets/compare/9723493654...10218605277
---
 deskutils/treesheets/Makefile                           |  4 ++--
 deskutils/treesheets/distinfo                           |  6 +++---
 .../files/patch-lobster_src_lobster_string__tools.h     | 17 +++++++++++++++++
 deskutils/treesheets/pkg-plist                          |  1 +
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile
index e763a13e1534..d057f52af91a 100644
--- a/deskutils/treesheets/Makefile
+++ b/deskutils/treesheets/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	treesheets
-DISTVERSION=	1.0.20240629
+DISTVERSION=	1.0.20240802
 CATEGORIES=	deskutils
 
 MAINTAINER=	eduardo@FreeBSD.org
@@ -13,7 +13,7 @@ USES=		cmake desktop-file-utils shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	aardappel
 #GH_TAGNAME=	>= 9850843724 fails to build: https://github.com/aardappel/treesheets/issues/686
-GH_TAGNAME=	9723493654
+GH_TAGNAME=	10218605277
 USE_WX=		3.2
 
 PORTSCOUT=	ignore:1 # upstream uses CI run ids as releases
diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo
index 80e55ca0b168..0418836665c2 100644
--- a/deskutils/treesheets/distinfo
+++ b/deskutils/treesheets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722021976
-SHA256 (aardappel-treesheets-1.0.20240629-9723493654_GH0.tar.gz) = 41f0db8d74909a1c70e6334aed2e4d4ee3251098620be88ac97276caaf9f7f63
-SIZE (aardappel-treesheets-1.0.20240629-9723493654_GH0.tar.gz) = 3087763
+TIMESTAMP = 1722934057
+SHA256 (aardappel-treesheets-1.0.20240802-10218605277_GH0.tar.gz) = 0f990bd6539e074d9b005cd2dbe10b83785bccbce82ba9a124a5af93625f66c2
+SIZE (aardappel-treesheets-1.0.20240802-10218605277_GH0.tar.gz) = 3241174
diff --git a/deskutils/treesheets/files/patch-lobster_src_lobster_string__tools.h b/deskutils/treesheets/files/patch-lobster_src_lobster_string__tools.h
new file mode 100644
index 000000000000..43f285345c3d
--- /dev/null
+++ b/deskutils/treesheets/files/patch-lobster_src_lobster_string__tools.h
@@ -0,0 +1,17 @@
+Fall back to fast_float when C++ stdlib doesn't provide from_chars for floats
+
+See also:
+https://github.com/aardappel/treesheets/issues/686
+https://github.com/Stellarium/stellarium/issues/3656
+
+--- lobster/src/lobster/string_tools.h.orig	2024-08-06 08:52:45 UTC
++++ lobster/src/lobster/string_tools.h
+@@ -157,7 +157,7 @@ template<typename T> T parse_float(string_view sv, con
+ 
+ template<typename T> T parse_float(string_view sv, const char **end = nullptr) {
+     // FIXME: Upgrade compilers for these platforms on CI.
+-    #if defined(__APPLE__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__)
++    #if defined(__APPLE__) || defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__FreeBSD__)
+         auto &term = *(char *)(sv.data() + sv.size());
+         auto orig = term;
+         term = 0;
diff --git a/deskutils/treesheets/pkg-plist b/deskutils/treesheets/pkg-plist
index 9f377c60c414..a0b5a66ee35c 100644
--- a/deskutils/treesheets/pkg-plist
+++ b/deskutils/treesheets/pkg-plist
@@ -5,5 +5,6 @@ share/icons/hicolor/scalable/apps/com.strlen.TreeSheets.svg
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/ts.mo
 %%NLS%%share/locale/it/LC_MESSAGES/ts.mo
 %%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/mime/packages/com.strlen.TreeSheets.xml



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408061022.476AMoHq046664>