horizon: update to 2.7.0

srcpkgs/gmsh/template

@@ -24,7 +24,7 @@ desc_option_fltk="Enable FLTK GUI support"
 desc_option_occt="Enable OpenCASCADE support"
 desc_option_zipper="Enable zip file compression/decompression"
 
-CFLAGS="-fcommon -Wimplicit-function-declaration"
+CFLAGS="-fcommon"
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"

srcpkgs/horizon/patches/translit.patch

@@ -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)

srcpkgs/horizon/template

@@ -1,12 +1,9 @@
 # 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.7.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
  gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel"
@@ -16,8 +13,10 @@ 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=7860a556604f60ce0ca5bee9e60573bd2e61e0b4219a77e81e549f737616c02b
 
-if [ "$CROSS_BUILD" ]; then
-	make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"
-fi
+pre_configure() {
+	# this needs to be set when cross compiling, otherwise meson complains
+	# about not knowing which cmake to use for the target.
+	export CMAKE=cmake
+}