[-- Attachment #1: Type: text/plain, Size: 1593 bytes --] There is a new pull request by abenson against master on the void-packages repository https://github.com/abenson/void-packages calc_2.13.0.1 https://github.com/void-linux/void-packages/pull/30547 calc: update to 2.13.0.1. <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] 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/30547.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-calc_2.13.0.1-30547.patch --] [-- Type: text/x-diff, Size: 1817 bytes --] From 1654c0e180c9f06f363e0242a6e6c117c11304a4 Mon Sep 17 00:00:00 2001 From: Andrew Benson <abenson+void@gmail.com> Date: Tue, 27 Apr 2021 08:20:25 -0500 Subject: [PATCH] calc: update to 2.13.0.1. --- common/shlibs | 4 ++-- srcpkgs/calc/template | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index bbe55668e47c..e6099415fe00 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1601,8 +1601,8 @@ libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3 libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3 libuwac0.so.0 libfreerdp-2.2.0_3 libcppunit-1.14.so.0 libcppunit-1.14.0_1 -libcalc.so.2.12.7.1 libcalc-2.12.7.1_1 -libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1 +libcalc.so.2.13.0.1 libcalc-2.13.0.1_1 +libcustcalc.so.2.13.0.1 libcalc-2.13.0.1_1 libOgreMain.so.1.12.9 libogre-1.12.9_1 libOgreBites.so.1.12.9 libogre-1.12.9_1 libOgreOverlay.so.1.12.9 libogre-1.12.9_1 diff --git a/srcpkgs/calc/template b/srcpkgs/calc/template index bc2087ca2bd3..e9a9808382fa 100644 --- a/srcpkgs/calc/template +++ b/srcpkgs/calc/template @@ -1,6 +1,6 @@ # Template file for 'calc' pkgname=calc -version=2.12.7.1 +version=2.13.0.1 revision=1 build_style=gnu-makefile make_install_args="T=$""{DESTDIR}" @@ -9,13 +9,14 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>" license="LGPL-2.1-only" homepage="http://www.isthe.com/chongo/tech/comp/calc/index.html" distfiles="http://www.isthe.com/chongo/src/calc/calc-${version}.tar.bz2" -checksum=eb1dc5dd680019e30264109167e20539fe9ac869049d8b1639781a51d1dea84c +checksum=6ae538f57785c5701a70112ccf007ab5553abd332ae2deaadaf564f401c734ad disable_parallel_build=yes post_extract() { case $XBPS_TARGET_MACHINE in *-musl) patch -Np0 < ${FILESDIR}/musl.patch ;; esac + vsed -e 's/^ARCH_CFLAGS/#&/' -i Makefile } do_build() {
[-- Attachment #1: Type: text/plain, Size: 571 bytes --] New comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/30547#issuecomment-827811259 Comment: calc is still miscompiled on cross targets, as noticed by @ericonr in #28681. Example is longbit.h generated by longbit.c that states that sizeof(long) is 8, but it is really 4. I wanted to work it out with upstream, but am postponing it again and again, and also have no single good solution - sometimes compilation alone is enough with no need of running (say, presence of certain functions), but not always. Any help welcome.
[-- Attachment #1: Type: text/plain, Size: 304 bytes --] New comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/30547#issuecomment-842617845 Comment: Current cross packages are broken too, let's update what works. Please use make_build_args="ARCH_CFLAGS=", as documented in calc's changelog insread of sedding.
[-- Attachment #1: Type: text/plain, Size: 1598 bytes --] There is an updated pull request by abenson against master on the void-packages repository https://github.com/abenson/void-packages calc_2.13.0.1 https://github.com/void-linux/void-packages/pull/30547 calc: update to 2.13.0.1. <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] 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/30547.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-calc_2.13.0.1-30547.patch --] [-- Type: text/x-diff, Size: 1737 bytes --] From 19b1e6af82292c2ea02a7cfddfdb3cc370dfac55 Mon Sep 17 00:00:00 2001 From: Andrew Benson <abenson+void@gmail.com> Date: Tue, 27 Apr 2021 08:20:25 -0500 Subject: [PATCH] calc: update to 2.13.0.1. --- common/shlibs | 4 ++-- srcpkgs/calc/template | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index ef3ff475a4d9..2021d7395e91 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1601,8 +1601,8 @@ libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3 libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3 libuwac0.so.0 libfreerdp-2.2.0_3 libcppunit-1.14.so.0 libcppunit-1.14.0_1 -libcalc.so.2.12.7.1 libcalc-2.12.7.1_1 -libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1 +libcalc.so.2.13.0.1 libcalc-2.13.0.1_1 +libcustcalc.so.2.13.0.1 libcalc-2.13.0.1_1 libOgreMain.so.1.12.9 libogre-1.12.9_1 libOgreBites.so.1.12.9 libogre-1.12.9_1 libOgreOverlay.so.1.12.9 libogre-1.12.9_1 diff --git a/srcpkgs/calc/template b/srcpkgs/calc/template index bc2087ca2bd3..f20452d816af 100644 --- a/srcpkgs/calc/template +++ b/srcpkgs/calc/template @@ -1,15 +1,16 @@ # Template file for 'calc' pkgname=calc -version=2.12.7.1 +version=2.13.0.1 revision=1 build_style=gnu-makefile make_install_args="T=$""{DESTDIR}" +make_build_args="ARCH_CFLAGS=" short_desc="C-style arbitrary precision calculator" maintainer="Piotr Wójcik <chocimier@tlen.pl>" license="LGPL-2.1-only" homepage="http://www.isthe.com/chongo/tech/comp/calc/index.html" distfiles="http://www.isthe.com/chongo/src/calc/calc-${version}.tar.bz2" -checksum=eb1dc5dd680019e30264109167e20539fe9ac869049d8b1639781a51d1dea84c +checksum=6ae538f57785c5701a70112ccf007ab5553abd332ae2deaadaf564f401c734ad disable_parallel_build=yes post_extract() {
[-- Attachment #1: Type: text/plain, Size: 1436 bytes --] There's a closed pull request on the void-packages repository calc: update to 2.13.0.1. https://github.com/void-linux/void-packages/pull/30547 Description: <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] 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 -->
[-- Attachment #1: Type: text/plain, Size: 220 bytes --] New comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/30547#issuecomment-978159322 Comment: Updated to 2.14.0.8, cross compilation will be solved when it will be solved.