From d9bc469e1fcf257879690d0eb1024507ce180fbd Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Wed, 20 Dec 2023 13:23:45 -0500 Subject: [PATCH] argyllcms: update to 3.1.0, adopt. --- srcpkgs/argyllcms/patches/fix-32bit.patch | 19 +++++++++++++++++++ .../patches/fix-gcc6-attribute_numsup_h.patch | 12 ------------ srcpkgs/argyllcms/template | 9 +++++---- 3 files changed, 24 insertions(+), 16 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..d186bcad601c4 100644 --- a/srcpkgs/argyllcms/template +++ b/srcpkgs/argyllcms/template @@ -1,16 +1,17 @@ # 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" short_desc="ICC compatible color management system" -maintainer="Orphaned " +maintainer="Daniel Martinez " 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