Re: [PR PATCH] [Updated] argyllcms: update to 3.0.0.

[Calandracas606 <Calandracas606@users.noreply.github.com>]

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

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

https://github.com/Calandracas606/void-packages argyllcms-update-to-3.0.0
https://github.com/void-linux/void-packages/pull/46312

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

#### 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-glibc
- Cross builds not supported


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-argyllcms-update-to-3.0.0-46312.patch --]
[-- Type: text/x-diff, Size: 3026 bytes --]

From e5af6c2df4ebcc977d031d3af3226a1e12fdce1b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 20 Dec 2023 13:23:45 -0500
Subject: [PATCH] argyllcms: update to 3.1.0.

---
 srcpkgs/argyllcms/patches/fix-32bit.patch     | 19 +++++++++++++++++++
 .../patches/fix-gcc6-attribute_numsup_h.patch | 12 ------------
 srcpkgs/argyllcms/template                    |  7 ++++---
 3 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/argyllcms/patches/fix-32bit.patch
 delete mode 100644 srcpkgs/argyllcms/patches/fix-gcc6-attribute_numsup_h.patch

diff --git a/srcpkgs/argyllcms/patches/fix-32bit.patch b/srcpkgs/argyllcms/patches/fix-32bit.patch
new file mode 100644
index 0000000000000..110552c51d475
--- /dev/null
+++ b/srcpkgs/argyllcms/patches/fix-32bit.patch
@@ -0,0 +1,19 @@
+--- a/Jambase
++++ b/Jambase
+@@ -1037,15 +1037,6 @@
+ 		HOSTTYPE = $(JAMUNAME[1]) ;
+ 	}
+ 
+-	if $(HOSTTYPE) = x86_64 
+-	 || $(HOSTTYPE) = x86_64-linux
+-	 || $(HOSTTYPE) = amd64 {
+-		ECHO "We're on a 64 bit host" ;
+-		HOST64     = true ;
+-		TARGET64   = true ;			# We're not allowing for cross-compiling here...
+-		CCFLAGS	   += -m64 ;
+-		C++FLAGS   += -m64 ;
+-	}
+
+
+ 	# Hmm. Newer linux gcc ar defaults to no timestamps
+ 	# and introduces a new option to get old behaviour,
diff --git a/srcpkgs/argyllcms/patches/fix-gcc6-attribute_numsup_h.patch b/srcpkgs/argyllcms/patches/fix-gcc6-attribute_numsup_h.patch
deleted file mode 100644
index 484ca01d832ee..0000000000000
--- a/srcpkgs/argyllcms/patches/fix-gcc6-attribute_numsup_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-
---- a/numlib/numsup.h	2015-10-26 05:17:33.000000000 +0100
-+++ b/numlib/numsup.h	2016-10-04 10:10:28.732000000 +0200
-@@ -324,7 +324,7 @@
- #define error_program g_log->tag
- extern void set_exe_path(char *arg0);
- 
--extern void ATTRIBUTE_NORETURN error(char *fmt, ...);
-+extern void error(char *fmt, ...) __attribute__((noreturn));
- extern void warning(char *fmt, ...);
- extern void verbose(int level, char *fmt, ...);
- 
diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index fd2cf41e32784..93deefc321e89 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,7 +1,7 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
-version=2.3.1
-revision=2
+version=3.1.0
+revision=1
 hostmakedepends="ftjam zip unzip"
 makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://www.argyllcms.com/"
 distfiles="https://www.argyllcms.com/Argyll_V${version}_src.zip"
-checksum=bd0bcf58cec284824b79ff55baa242903ed361e12b1b37e12228679f9754961c
+checksum=4fdd5a1d7bc6dde79a54e350ec9374f6ef00b53903ee0d184cdfa4a11f0ecdcb
+lib32disabled=yes
 
 # Build system look only under / for headers and libraries. Breaks cross.
 nocross=yes