From 69558c80ae6739464c35fb590e50fd3dc0213850 Mon Sep 17 00:00:00 2001 From: ii8 Date: Sat, 29 Jun 2024 15:06:51 +0100 Subject: [PATCH] horizon: update to 2.6.0. --- srcpkgs/horizon/patches/translit.patch | 24 ------------------------ srcpkgs/horizon/template | 19 +++++++------------ 2 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/horizon/patches/translit.patch diff --git a/srcpkgs/horizon/patches/translit.patch b/srcpkgs/horizon/patches/translit.patch deleted file mode 100644 index 70e7a3604f5540..00000000000000 --- a/srcpkgs/horizon/patches/translit.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 16bbf70822d672..679292a0ea9a86 100644 --- a/srcpkgs/horizon/template +++ b/srcpkgs/horizon/template @@ -1,14 +1,11 @@ # Template file for 'horizon' pkgname=horizon -version=2.5.0 -revision=3 -build_style=gnu-makefile -make_build_args="GOLD=" -make_install_target="install install-man" -make_use_env=yes -hostmakedepends="pkg-config glib-devel" +version=2.6.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config cmake glib-devel" makedepends="cairomm-devel librsvg-devel sqlite-devel - glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo0.9.7-devel libzip-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" maintainer="Érico Nogueira " @@ -16,8 +13,6 @@ 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=c5cbe54b5f58289e52e4a8d0ed0594cd88ed0cfcef89e1c5ecdd5b82449449b4 +checksum=e7e680a05b92ac8ab4b6a32fb8e3b17bc298245d3d3d9224e9b3f7fb55b81256 +nocross="CMake binary for machine host machine not found" -if [ "$CROSS_BUILD" ]; then - make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade" -fi