From: ii8 <ii8@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] horizon: update to 2.6.0.
Date: Sat, 29 Jun 2024 16:13:51 +0200 [thread overview]
Message-ID: <20240629141351.8F70923F3C@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-51041@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
There is an updated pull request by ii8 against master on the void-packages repository
https://github.com/ii8/void-packages horizon
https://github.com/void-linux/void-packages/pull/51041
horizon: update to 2.6.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Does anyone know why meson can't find cmake in a cross build?
A patch file from https://github.com/void-linux/void-packages/pull/51041.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-horizon-51041.patch --]
[-- Type: text/x-diff, Size: 2967 bytes --]
From 70c517d70bca053937029a46d127a4f3b1399c3a Mon Sep 17 00:00:00 2001
From: ii8 <murray.calavera@protonmail.com>
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 | 20 +++++++-------------
2 files changed, 7 insertions(+), 37 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..f93e629319c30b 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 <ericonr@disroot.org>"
@@ -16,8 +13,5 @@ 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
-
-if [ "$CROSS_BUILD" ]; then
- make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"
-fi
+checksum=e7e680a05b92ac8ab4b6a32fb8e3b17bc298245d3d3d9224e9b3f7fb55b81256
+nocross="CMake binary for machine host machine not found"
next prev parent reply other threads:[~2024-06-29 14:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-29 14:11 [PR PATCH] " ii8
2024-06-29 14:13 ` ii8 [this message]
2024-07-01 21:33 ` ii8
2024-07-01 21:33 ` [PR PATCH] [Closed]: " ii8
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240629141351.8F70923F3C@inbox.vuxu.org \
--to=ii8@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).