cad/horizon-eda: Update 2.3.1 -> 2.4.0

Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2022-10-16 11:11:46 -07:00
parent e3eb58a6ce
commit 45d70e18b3
3 changed files with 4 additions and 25 deletions

View file

@ -1,7 +1,6 @@
PORTNAME= horizon-eda
DISTVERSIONPREFIX= v
DISTVERSION= 2.3.1
PORTREVISION= 2
DISTVERSION= 2.4.0
CATEGORIES= cad
MAINTAINER= yuri@FreeBSD.org

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1653934378
SHA256 (horizon-eda-horizon-v2.3.1_GH0.tar.gz) = 478632ce6c758884f16ae1f25c1f94358988051697124c4473f8e7d914e7320c
SIZE (horizon-eda-horizon-v2.3.1_GH0.tar.gz) = 3288208
TIMESTAMP = 1665938350
SHA256 (horizon-eda-horizon-v2.4.0_GH0.tar.gz) = e1165ec11dc222fd5c41a1da752b2aae44eca80f6f785dd4069dcdd225ae1d53
SIZE (horizon-eda-horizon-v2.4.0_GH0.tar.gz) = 3938745

View file

@ -1,20 +0,0 @@
- workaround for https://github.com/llvm/llvm-project/issues/55683
--- src/util/fs_util.cpp.orig 2022-05-29 18:00:44 UTC
+++ src/util/fs_util.cpp
@@ -8,10 +8,10 @@ std::optional<std::string> get_relative_filename(const
{
const auto p = fs::u8path(path);
const auto b = fs::u8path(base);
- const auto x = std::search(p.begin(), p.end(), b.begin(), b.end());
- if (x == p.begin()) // path is in base path
- return fs::relative(p, b).u8string();
- else
- return {};
+ for (auto ip = p.begin(), ib = b.begin(); ib != b.end(); ip++, ib++) {
+ if (ip == p.end() || *ip != *ib)
+ return {};
+ }
+ return fs::relative(p, b).u8string();
}
} // namespace horizon