From a0a068d95f678211968afb124d13e9ae8bfa4232 Mon Sep 17 00:00:00 2001 From: murray Date: Sat, 16 Sep 2023 00:33:22 +0100 Subject: [PATCH] horizon: update to 2.5.0. --- srcpkgs/horizon/patches/translit.patch | 24 ++++++++++++++++++++++++ srcpkgs/horizon/template | 8 ++++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/horizon/patches/translit.patch diff --git a/srcpkgs/horizon/patches/translit.patch b/srcpkgs/horizon/patches/translit.patch new file mode 100644 index 0000000000000..70e7a3604f554 --- /dev/null +++ b/srcpkgs/horizon/patches/translit.patch @@ -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) diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template index 1d1b8cf1891c2..97ed737c2c561 100644 --- a/srcpkgs/horizon/template +++ b/srcpkgs/horizon/template @@ -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"