[PR PATCH] xnec2c: update to 4.4.11.

[PR PATCH] xnec2c: update to 4.4.11.

[paper42]

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

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages xnec2c-4.4.11
https://github.com/void-linux/void-packages/pull/38696

xnec2c: update to 4.4.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 0c4ef5d6923d25022259db4ce15ca327506be653 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 16 Aug 2022 00:07:36 +0200
Subject: [PATCH] xnec2c: update to 4.4.11.

---
 srcpkgs/xnec2c/template | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index f936c70dff18..61a04e5f0c0b 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,35 +1,26 @@
 # Template file for 'xnec2c'
 pkgname=xnec2c
-version=4.1.1
-revision=2
+version=4.4.11
+revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel"
+wrksrc="${pkgname}-v${version}"
+hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
 makedepends="gtk+3-devel"
 depends="libglvnd"
-short_desc="GTK2 application for Numerical Electromagnetics Code generation"
+short_desc="GTK application for Numerical Electromagnetics Code generation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html"
-distfiles="https://www.qsl.net/5/5b4az/pkg/nec2/xnec2c/xnec2c-${version}.tar.bz2"
-checksum=29078bcefd5f2cb534a83fc6f293ffdf00f1e350cc2408285250ace5dda4dbd7
+homepage="https://www.xnec2c.org/"
+distfiles="https://www.xnec2c.org/releases/xnec2c-v${version}.tar.gz"
+checksum=33892709b19a271749c36073993282e76b77b3c811e94464953cf9b0c3b2cb8f
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
-post_install() {
-	local i
-	vdoc doc/NEC2-bug.txt
-	vdoc doc/NearFieldCalcs.txt
-	vdoc doc/nec2c.txt
-	vdoc doc/xnec2c.html
-	for i in doc/images/*.png; do
-		vcopy $i usr/share/doc/xnec2c/images
-	done
-	zcat doc/xnec2c.1.gz > xnec2c.1
-	vman xnec2c.1
-	vmkdir usr/share/xnec2c
-	vcopy examples usr/share/xnec2c
 
-	vinstall ${FILESDIR}/xnec2c.desktop 644 usr/share/applications
-	vinstall ${FILESDIR}/xnec2c.png 644 usr/share/pixmaps
+post_install() {
+	vmkdir usr/share/doc
+	cp -r doc ${DESTDIR}/usr/share/doc/xnec2c
+	vcopy examples usr/share/doc/xnec2c
+	rm ${DESTDIR}/usr/share/doc/xnec2c/doc/xnec2c.1
 }

Re: xnec2c: update to 4.4.11.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38696#issuecomment-1217529735

Comment:
tested and working for me

![image](https://user-images.githubusercontent.com/5366828/185052818-f4532b96-98dc-4805-9e2d-7491fc19cf3b.png)

Re: [PR PATCH] [Updated] xnec2c: update to 4.4.11.

[paper42]

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

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages xnec2c-4.4.11
https://github.com/void-linux/void-packages/pull/38696

xnec2c: update to 4.4.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 70c7621fd278b07cf1dfaa9327b799fd47b3365c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 16 Aug 2022 00:07:36 +0200
Subject: [PATCH] xnec2c: update to 4.4.11.

---
 srcpkgs/xnec2c/patches/cross.patch | 11 ++++++++++
 srcpkgs/xnec2c/template            | 35 +++++++++++-------------------
 2 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 srcpkgs/xnec2c/patches/cross.patch

diff --git a/srcpkgs/xnec2c/patches/cross.patch b/srcpkgs/xnec2c/patches/cross.patch
new file mode 100644
index 000000000000..2ae32b123877
--- /dev/null
+++ b/srcpkgs/xnec2c/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,7 +76,7 @@
+        [AC_MSG_RESULT([no])])
+ 
+ AC_MSG_CHECKING([whether dlopen supports LMID])
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ 			#define _GNU_SOURCE
+ 			#include <link.h>
+ 			#include <dlfcn.h>
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index f936c70dff18..61a04e5f0c0b 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,35 +1,26 @@
 # Template file for 'xnec2c'
 pkgname=xnec2c
-version=4.1.1
-revision=2
+version=4.4.11
+revision=1
 build_style=gnu-configure
-hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel"
+wrksrc="${pkgname}-v${version}"
+hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
 makedepends="gtk+3-devel"
 depends="libglvnd"
-short_desc="GTK2 application for Numerical Electromagnetics Code generation"
+short_desc="GTK application for Numerical Electromagnetics Code generation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html"
-distfiles="https://www.qsl.net/5/5b4az/pkg/nec2/xnec2c/xnec2c-${version}.tar.bz2"
-checksum=29078bcefd5f2cb534a83fc6f293ffdf00f1e350cc2408285250ace5dda4dbd7
+homepage="https://www.xnec2c.org/"
+distfiles="https://www.xnec2c.org/releases/xnec2c-v${version}.tar.gz"
+checksum=33892709b19a271749c36073993282e76b77b3c811e94464953cf9b0c3b2cb8f
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
-post_install() {
-	local i
-	vdoc doc/NEC2-bug.txt
-	vdoc doc/NearFieldCalcs.txt
-	vdoc doc/nec2c.txt
-	vdoc doc/xnec2c.html
-	for i in doc/images/*.png; do
-		vcopy $i usr/share/doc/xnec2c/images
-	done
-	zcat doc/xnec2c.1.gz > xnec2c.1
-	vman xnec2c.1
-	vmkdir usr/share/xnec2c
-	vcopy examples usr/share/xnec2c
 
-	vinstall ${FILESDIR}/xnec2c.desktop 644 usr/share/applications
-	vinstall ${FILESDIR}/xnec2c.png 644 usr/share/pixmaps
+post_install() {
+	vmkdir usr/share/doc
+	cp -r doc ${DESTDIR}/usr/share/doc/xnec2c
+	vcopy examples usr/share/doc/xnec2c
+	rm ${DESTDIR}/usr/share/doc/xnec2c/doc/xnec2c.1
 }

Re: [PR PATCH] [Updated] xnec2c: update to 4.4.11.

[paper42]

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

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages xnec2c-4.4.11
https://github.com/void-linux/void-packages/pull/38696

xnec2c: update to 4.4.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 28d996b706d7c06b250daa9737f84a8c855dce01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 16 Aug 2022 00:07:36 +0200
Subject: [PATCH] xnec2c: update to 4.4.11.

---
 srcpkgs/xnec2c/patches/cross.patch | 26 ++++++++++++++++++++++
 srcpkgs/xnec2c/template            | 35 +++++++++++-------------------
 2 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100644 srcpkgs/xnec2c/patches/cross.patch

diff --git a/srcpkgs/xnec2c/patches/cross.patch b/srcpkgs/xnec2c/patches/cross.patch
new file mode 100644
index 000000000000..60a2d0f4de80
--- /dev/null
+++ b/srcpkgs/xnec2c/patches/cross.patch
@@ -0,0 +1,26 @@
+From eec8c7b8cf9cbec7e217e61335c74a76e3686b51 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 20 Aug 2022 23:51:22 +0200
+Subject: [PATCH] Fix cross compilation
+
+102e3cef58eb796dd6b3bb099ed0103bcc3d9c75 introduced a check for LMID in
+libc to fix compilation on musl, but it used AC_RUN_IFELSE even though
+only a compile check is needed. AC_RUN_IFELSE is not available with
+cross compilation.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c83af6a..72bafdf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,7 +76,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+        [AC_MSG_RESULT([no])])
+ 
+ AC_MSG_CHECKING([whether dlopen supports LMID])
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ 			#define _GNU_SOURCE
+ 			#include <link.h>
+ 			#include <dlfcn.h>
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index f936c70dff18..2e0ed79e4ffa 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,35 +1,26 @@
 # Template file for 'xnec2c'
 pkgname=xnec2c
-version=4.1.1
-revision=2
+version=4.4.11
+revision=1
+wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
-hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel"
+hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
 makedepends="gtk+3-devel"
 depends="libglvnd"
-short_desc="GTK2 application for Numerical Electromagnetics Code generation"
+short_desc="GTK application for Numerical Electromagnetics Code generation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html"
-distfiles="https://www.qsl.net/5/5b4az/pkg/nec2/xnec2c/xnec2c-${version}.tar.bz2"
-checksum=29078bcefd5f2cb534a83fc6f293ffdf00f1e350cc2408285250ace5dda4dbd7
+homepage="https://www.xnec2c.org/"
+distfiles="https://www.xnec2c.org/releases/xnec2c-v${version}.tar.gz"
+checksum=33892709b19a271749c36073993282e76b77b3c811e94464953cf9b0c3b2cb8f
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
-post_install() {
-	local i
-	vdoc doc/NEC2-bug.txt
-	vdoc doc/NearFieldCalcs.txt
-	vdoc doc/nec2c.txt
-	vdoc doc/xnec2c.html
-	for i in doc/images/*.png; do
-		vcopy $i usr/share/doc/xnec2c/images
-	done
-	zcat doc/xnec2c.1.gz > xnec2c.1
-	vman xnec2c.1
-	vmkdir usr/share/xnec2c
-	vcopy examples usr/share/xnec2c
 
-	vinstall ${FILESDIR}/xnec2c.desktop 644 usr/share/applications
-	vinstall ${FILESDIR}/xnec2c.png 644 usr/share/pixmaps
+post_install() {
+	vmkdir usr/share/doc
+	cp -r doc ${DESTDIR}/usr/share/doc/xnec2c
+	vcopy examples usr/share/doc/xnec2c
+	rm ${DESTDIR}/usr/share/doc/xnec2c/doc/xnec2c.1
 }

Re: [PR PATCH] [Merged]: xnec2c: update to 4.4.11.

[paper42]

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

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

xnec2c: update to 4.4.11.
https://github.com/void-linux/void-packages/pull/38696

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->