horizon: update to 2.5.0.

This commit is contained in:
murray 2023-09-16 00:33:22 +01:00 committed by Duncan Overbruck
parent 04e3788d8e
commit 19adc62aef
2 changed files with 28 additions and 4 deletions

View File

@ -0,0 +1,24 @@
--- a/src/export_odb/odb_util.cpp
+++ b/src/export_odb/odb_util.cpp
@@ -29,9 +29,20 @@ std::ostream &operator<<(std::ostream &os, DimUm d)
return os << std::fixed << std::setprecision(3) << std::fixed << d.dim;
}
+static bool check_have_transliteration()
+{
+ auto ic = g_iconv_open("ascii//TRANSLIT", "utf-8");
+ const bool have_translit = ic != ((GIConv)-1);
+ if (!have_translit)
+ return false;
+ g_iconv_close(ic);
+ return true;
+}
+
std::string utf8_to_ascii(const std::string &s)
{
- return Glib::convert_with_fallback(s, "ascii//TRANSLIT", "utf-8");
+ static bool have_translit = check_have_transliteration();
+ return Glib::convert_with_fallback(s, have_translit ? "ascii//TRANSLIT" : "ascii", "utf-8");
}
std::string make_legal_name(const std::string &n)

View File

@ -1,13 +1,13 @@
# Template file for 'horizon'
pkgname=horizon
version=2.4.0
revision=3
version=2.5.0
revision=1
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
make_use_env=yes
hostmakedepends="pkg-config glib-devel"
makedepends="cairomm-devel librsvg-devel sqlite-devel boost-devel
makedepends="cairomm-devel librsvg-devel sqlite-devel
glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo-devel libzip-devel
gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel"
short_desc="Free EDA package"
@ -16,7 +16,7 @@ license="GPL-3.0-only"
homepage="https://horizon-eda.org/"
changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md"
distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz"
checksum=e1165ec11dc222fd5c41a1da752b2aae44eca80f6f785dd4069dcdd225ae1d53
checksum=c5cbe54b5f58289e52e4a8d0ed0594cd88ed0cfcef89e1c5ecdd5b82449449b4
if [ "$CROSS_BUILD" ]; then
make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"