[PR PATCH] Horizon

[PR PATCH] Horizon

[ii8]

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

There is a new 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/46043

Horizon
#### 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
- I built this PR locally for these architectures:
  - armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/46043.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-horizon-46043.patch --]
[-- Type: text/x-diff, Size: 3005 bytes --]

From 701648631df685734387951fe7ab7943f6b9b909 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Wed, 13 Sep 2023 12:04:25 +0100
Subject: [PATCH 1/2] horizon: update to 2.5.0.

---
 srcpkgs/horizon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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"

From 9d6aaf463e8287b8aee3cf1f75ea95d5fdd4d7a3 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
Date: Wed, 13 Sep 2023 12:08:04 +0100
Subject: [PATCH 2/2] horizon: patch to fix ODB++ output on musl systems

---
 srcpkgs/horizon/patches/translit.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 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)

Re: horizon: update to 2.5.0.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/46043#issuecomment-1721896495

Comment:
Please squash the commits.

Re: [PR PATCH] [Updated] horizon: update to 2.5.0.

[ii8]

[-- Attachment #1: Type: text/plain, Size: 541 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/46043

horizon: update to 2.5.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
- I built this PR locally for these architectures:
  - armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/46043.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-horizon-46043.patch --]
[-- Type: text/x-diff, Size: 2750 bytes --]

From a0a068d95f678211968afb124d13e9ae8bfa4232 Mon Sep 17 00:00:00 2001
From: murray <murray.calavera@protonmail.com>
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"

Re: horizon: update to 2.5.0.

[ii8]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

New comment by ii8 on void-packages repository

https://github.com/void-linux/void-packages/pull/46043#issuecomment-1722027668

Comment:
lol I had purposely separated them 🤦🏿 

Re: [PR PATCH] [Merged]: horizon: update to 2.5.0.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

There's a merged pull request on the void-packages repository

horizon: update to 2.5.0.
https://github.com/void-linux/void-packages/pull/46043

Description:
#### 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
- I built this PR locally for these architectures:
  - armv6l-musl