* Re: [PR PATCH] [Updated] argyllcms: update to 3.0.0.
2023-09-28 20:04 [PR PATCH] argyllcms: update to 3.0.0 Calandracas606
@ 2023-10-19 17:59 ` Calandracas606
2023-10-19 19:37 ` Calandracas606
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Calandracas606 @ 2023-10-19 17:59 UTC (permalink / raw)
To: ml
[-- 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: 2188 bytes --]
From 2795cda137dd209c40721161ecf0289578f1d9c3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielpedromartinez@duck.com>
Date: Thu, 28 Sep 2023 15:59:26 -0400
Subject: [PATCH] argyllcms: update to 3.0.0.
---
.../patches/fix-gcc6-attribute_numsup_h.patch | 12 ------------
srcpkgs/argyllcms/template | 7 ++++---
2 files changed, 4 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/argyllcms/patches/fix-gcc6-attribute_numsup_h.patch
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..17c5c81a165d8 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.0.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=f3f8932f311a8c0c1239baf475e069d645ed6aa991e1e8d822bae361e1764651
+lib32disabled=yes
# Build system look only under / for headers and libraries. Breaks cross.
nocross=yes
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] argyllcms: update to 3.0.0.
2023-09-28 20:04 [PR PATCH] argyllcms: update to 3.0.0 Calandracas606
2023-10-19 17:59 ` [PR PATCH] [Updated] " Calandracas606
@ 2023-10-19 19:37 ` Calandracas606
2023-11-27 20:22 ` Calandracas606
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Calandracas606 @ 2023-10-19 19:37 UTC (permalink / raw)
To: ml
[-- 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: 2961 bytes --]
From 26a02bd3f7c0bdb86fd1a5cad03382aa39426b41 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielpedromartinez@duck.com>
Date: Thu, 28 Sep 2023 15:59:26 -0400
Subject: [PATCH] argyllcms: update to 3.0.0.
---
srcpkgs/argyllcms/patches/fix-32bit.patch | 18 ++++++++++++++++++
.../patches/fix-gcc6-attribute_numsup_h.patch | 12 ------------
srcpkgs/argyllcms/template | 7 ++++---
3 files changed, 22 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..8194ea1a6866c
--- /dev/null
+++ b/srcpkgs/argyllcms/patches/fix-32bit.patch
@@ -0,0 +1,18 @@
+--- 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 ;
+- 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..17c5c81a165d8 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.0.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=f3f8932f311a8c0c1239baf475e069d645ed6aa991e1e8d822bae361e1764651
+lib32disabled=yes
# Build system look only under / for headers and libraries. Breaks cross.
nocross=yes
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] argyllcms: update to 3.0.0.
2023-09-28 20:04 [PR PATCH] argyllcms: update to 3.0.0 Calandracas606
2023-10-19 17:59 ` [PR PATCH] [Updated] " Calandracas606
2023-10-19 19:37 ` Calandracas606
@ 2023-11-27 20:22 ` Calandracas606
2023-12-20 18:24 ` Calandracas606
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Calandracas606 @ 2023-11-27 20:22 UTC (permalink / raw)
To: ml
[-- 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: 2961 bytes --]
From 96fd940cae3da1b634ad3172c9b715fcccb8b722 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielpedromartinez@duck.com>
Date: Thu, 28 Sep 2023 15:59:26 -0400
Subject: [PATCH] argyllcms: update to 3.0.0.
---
srcpkgs/argyllcms/patches/fix-32bit.patch | 18 ++++++++++++++++++
.../patches/fix-gcc6-attribute_numsup_h.patch | 12 ------------
srcpkgs/argyllcms/template | 7 ++++---
3 files changed, 22 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..8194ea1a6866c
--- /dev/null
+++ b/srcpkgs/argyllcms/patches/fix-32bit.patch
@@ -0,0 +1,18 @@
+--- 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 ;
+- 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..17c5c81a165d8 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.0.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=f3f8932f311a8c0c1239baf475e069d645ed6aa991e1e8d822bae361e1764651
+lib32disabled=yes
# Build system look only under / for headers and libraries. Breaks cross.
nocross=yes
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] argyllcms: update to 3.0.0.
2023-09-28 20:04 [PR PATCH] argyllcms: update to 3.0.0 Calandracas606
` (2 preceding siblings ...)
2023-11-27 20:22 ` Calandracas606
@ 2023-12-20 18:24 ` Calandracas606
2023-12-20 18:32 ` Calandracas606
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Calandracas606 @ 2023-12-20 18:24 UTC (permalink / raw)
To: ml
[-- 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: 2182 bytes --]
From 7b319604c7fb68a843c44f47a2f3024168b5095c 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.
---
.../patches/fix-gcc6-attribute_numsup_h.patch | 12 ------------
srcpkgs/argyllcms/template | 7 ++++---
2 files changed, 4 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/argyllcms/patches/fix-gcc6-attribute_numsup_h.patch
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] argyllcms: update to 3.0.0.
2023-09-28 20:04 [PR PATCH] argyllcms: update to 3.0.0 Calandracas606
` (3 preceding siblings ...)
2023-12-20 18:24 ` Calandracas606
@ 2023-12-20 18:32 ` Calandracas606
2024-01-26 14:41 ` Calandracas606
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Calandracas606 @ 2023-12-20 18:32 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] argyllcms: update to 3.0.0.
2023-09-28 20:04 [PR PATCH] argyllcms: update to 3.0.0 Calandracas606
` (4 preceding siblings ...)
2023-12-20 18:32 ` Calandracas606
@ 2024-01-26 14:41 ` Calandracas606
2024-02-13 16:36 ` Calandracas606
2024-02-14 14:46 ` [PR PATCH] [Merged]: argyllcms: update to 3.1.0, adopt ahesford
7 siblings, 0 replies; 9+ messages in thread
From: Calandracas606 @ 2024-01-26 14:41 UTC (permalink / raw)
To: ml
[-- 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 dae0e9cf4b9307b8d7f92106fe77219b4f2be005 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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] argyllcms: update to 3.0.0.
2023-09-28 20:04 [PR PATCH] argyllcms: update to 3.0.0 Calandracas606
` (5 preceding siblings ...)
2024-01-26 14:41 ` Calandracas606
@ 2024-02-13 16:36 ` Calandracas606
2024-02-14 14:46 ` [PR PATCH] [Merged]: argyllcms: update to 3.1.0, adopt ahesford
7 siblings, 0 replies; 9+ messages in thread
From: Calandracas606 @ 2024-02-13 16:36 UTC (permalink / raw)
To: ml
[-- 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: 3128 bytes --]
From d9bc469e1fcf257879690d0eb1024507ce180fbd 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, 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 <orphan@voidlinux.org>"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Merged]: argyllcms: update to 3.1.0, adopt
2023-09-28 20:04 [PR PATCH] argyllcms: update to 3.0.0 Calandracas606
` (6 preceding siblings ...)
2024-02-13 16:36 ` Calandracas606
@ 2024-02-14 14:46 ` ahesford
7 siblings, 0 replies; 9+ messages in thread
From: ahesford @ 2024-02-14 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 443 bytes --]
There's a merged pull request on the void-packages repository
argyllcms: update to 3.1.0, adopt
https://github.com/void-linux/void-packages/pull/46312
Description:
<!-- 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
^ permalink raw reply [flat|nested] 9+ messages in thread