* Re: [PR PATCH] [Updated] New Version 4.0.0 - Test compiled amd64 and aarch64.
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
@ 2022-07-28 15:30 ` ajtcode71
2022-07-28 15:37 ` darktable: update to 4.0.0 CameronNemo
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-07-28 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
New Version 4.0.0 - Test compiled amd64 and aarch64.
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 1343 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/2] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/2] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
2022-07-28 15:30 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-07-28 15:37 ` CameronNemo
2022-07-28 15:44 ` tranzystorek-io
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: CameronNemo @ 2022-07-28 15:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1198320722
Comment:
Squash commits and use the format `darktable: update to 4.0.0` for the commit message.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
2022-07-28 15:30 ` [PR PATCH] [Updated] " ajtcode71
2022-07-28 15:37 ` darktable: update to 4.0.0 CameronNemo
@ 2022-07-28 15:44 ` tranzystorek-io
2022-07-28 16:25 ` [PR PATCH] [Updated] " ajtcode71
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: tranzystorek-io @ 2022-07-28 15:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New comment by tranzystorek-io on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1198328752
Comment:
Seems you haven't updated the `checksum`, please run `./xbps-src pkg darktable` to build your changes, and then test them if you can
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (2 preceding siblings ...)
2022-07-28 15:44 ` tranzystorek-io
@ 2022-07-28 16:25 ` ajtcode71
2022-07-28 16:40 ` ajtcode71
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-07-28 16:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/3] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (3 preceding siblings ...)
2022-07-28 16:25 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-07-28 16:40 ` ajtcode71
2022-07-31 6:49 ` ajtcode71
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-07-28 16:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/3] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (4 preceding siblings ...)
2022-07-28 16:40 ` ajtcode71
@ 2022-07-31 6:49 ` ajtcode71
2022-07-31 7:07 ` [PR PATCH] [Updated] " ajtcode71
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-07-31 6:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
New comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1200361542
Comment:
For some reasons all xbps packages i xlint come up with following errors:
grep: zstd-1.5.2_1.x86_64.xbps: binary file matches
grep: zstd-1.5.2_1.x86_64.xbps: binary file matches
grep: zstd-1.5.2_1.x86_64.xbps: binary file matches
grep: zstd-1.5.2_1.x86_64.xbps: binary file matches
grep: zstd-1.5.2_1.x86_64.xbps: binary file matches
zstd-1.5.2_1.x86_64.xbps: 'homepage' missing!
zstd-1.5.2_1.x86_64.xbps: 'license' missing!
zstd-1.5.2_1.x86_64.xbps: 'maintainer' missing!
zstd-1.5.2_1.x86_64.xbps: 'pkgname' missing!
zstd-1.5.2_1.x86_64.xbps: 'revision' missing!
zstd-1.5.2_1.x86_64.xbps: 'short_desc' missing!
zstd-1.5.2_1.x86_64.xbps: 'version' missing!
zstd-1.5.2_1.x86_64.xbps:1: Header should be: # Template file for ''
zstd-1.5.2_1.x86_64.xbps:1758: File does not end with newline character
These are will packages that I havent built... My Darktable 4 template is as peer the 3.8 template will the change to version number and checksum..
All the fields that are coming back as missing are in the template...
Any ideas?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (5 preceding siblings ...)
2022-07-31 6:49 ` ajtcode71
@ 2022-07-31 7:07 ` ajtcode71
2022-07-31 7:12 ` CameronNemo
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-07-31 7:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/3] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (6 preceding siblings ...)
2022-07-31 7:07 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-07-31 7:12 ` CameronNemo
2022-08-01 4:00 ` ajtcode71
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: CameronNemo @ 2022-07-31 7:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1200364761
Comment:
@ajtcode71 you run xlint on the template file, not the .xbps file
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (7 preceding siblings ...)
2022-07-31 7:12 ` CameronNemo
@ 2022-08-01 4:00 ` ajtcode71
2022-08-05 23:49 ` abenson
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-01 4:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 377 bytes --]
New comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1200666893
Comment:
@CameronNemo - Ok stupid me (first time - can u tell?).. Xlint is not showing any errors at my end.. Yet the xlint test is complaining about 'subject'.
Do i need to do anything else... or just wait for approval to get it merged?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (8 preceding siblings ...)
2022-08-01 4:00 ` ajtcode71
@ 2022-08-05 23:49 ` abenson
2022-08-07 7:47 ` [PR PATCH] [Updated] " ajtcode71
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: abenson @ 2022-08-05 23:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1207092310
Comment:
'subject' refers to your commit message. Squash the commits and make sure the commit message matches what you put as the title for the PR.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (9 preceding siblings ...)
2022-08-05 23:49 ` abenson
@ 2022-08-07 7:47 ` ajtcode71
2022-08-08 7:07 ` ajtcode71
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-07 7:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/3] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (10 preceding siblings ...)
2022-08-07 7:47 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-08-08 7:07 ` ajtcode71
2022-08-09 22:57 ` ajtcode71
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-08 7:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/3] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (11 preceding siblings ...)
2022-08-08 7:07 ` ajtcode71
@ 2022-08-09 22:57 ` ajtcode71
2022-08-09 23:11 ` ajtcode71
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-09 22:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/3] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (12 preceding siblings ...)
2022-08-09 22:57 ` ajtcode71
@ 2022-08-09 23:11 ` ajtcode71
2022-08-09 23:31 ` ajtcode71
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-09 23:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/3] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (13 preceding siblings ...)
2022-08-09 23:11 ` ajtcode71
@ 2022-08-09 23:31 ` ajtcode71
2022-08-09 23:48 ` lemmi
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-09 23:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/3] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/3] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (14 preceding siblings ...)
2022-08-09 23:31 ` ajtcode71
@ 2022-08-09 23:48 ` lemmi
2022-08-10 7:27 ` [PR PATCH] [Updated] " ajtcode71
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: lemmi @ 2022-08-09 23:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
New comment by lemmi on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1210000537
Comment:
So, I haven't updated the package to `4.0.0` because things tend to break on major versions with darktable. I have `4.0.0` running locally, but there are hand full of small issues I didn't want everyone else to experience. I'd rather wait for a `4.0.1`.
Sorry I didn't see this earlier. Please @ me next time.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (15 preceding siblings ...)
2022-08-09 23:48 ` lemmi
@ 2022-08-10 7:27 ` ajtcode71
2022-08-10 7:33 ` ajtcode71
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-10 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 88844 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/6] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/6] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/6] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
From f2937c2eb6cf5411f8c27b8888c8eeb37e3918f5 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:31:35 +1000
Subject: [PATCH 4/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit abf0389c6b7e1a28bb8a9af056b26dc6675f9881.
---
srcpkgs/cloudflared/template | 1 -
srcpkgs/opendht/template | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index b31cf78f4c53..3cb6912ffda9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -13,7 +13,6 @@ homepage="https://developers.cloudflare.com/argo-tunnel/"
changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
checksum=3a822faaed7ae90be5ba4920f9226cd85367402d2c5a2bf2f0732c37cad6599d
-broken="vendor/github.com/lucas-clemente/quic-go/internal/qtls/go119.go: can't be built on Go 1.19 yet"
pre_build() {
go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index 5b8c520eaa84..6b9f70d6b281 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
-version=2.4.9
-revision=1
+version=2.4.4
+revision=2
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
@@ -11,8 +11,8 @@ short_desc="Distributed Hash Table implementation"
maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-3.0-or-later"
homepage="https://github.com/savoirfairelinux/opendht"
-distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/v${version}.tar.gz"
-checksum=ede4a0adee7e5d98d9681cfd2bab83421b153afcdb5efa1a925986a0a3a0ac8a
+distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz"
+checksum=a4b452423f9a55f3c53ceaeeb43ec50f2747fdc89a546caa74cd79b93b6ede08
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 81646da46d71124d21f471f8fdd33dff3df4f032 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Wed, 10 Aug 2022 08:57:24 +1000
Subject: [PATCH 5/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit 28c098573def8000345bf6eb5e623be893c93a37.
---
common/build-style/cmake.sh | 4 ---
common/shlibs | 10 +++----
srcpkgs/alarm-clock/template | 19 ++++++++++++
srcpkgs/bluebird-themes/template | 2 +-
srcpkgs/claws-mail/template | 4 +--
srcpkgs/cloudflared/template | 19 ------------
srcpkgs/dbus-elogind/template | 8 ++---
srcpkgs/dbus/template | 8 ++---
srcpkgs/foot/template | 4 +--
srcpkgs/freetype/template | 4 +--
srcpkgs/fzf/template | 4 +--
srcpkgs/gnutls/template | 4 +--
srcpkgs/gogglesmm/template | 3 +-
srcpkgs/gsimplecal-gtk2 | 1 -
srcpkgs/gsimplecal-gtk2/patches/musl.patch | 19 ++++++++++++
srcpkgs/gsimplecal-gtk2/template | 25 ++++++++++++++++
srcpkgs/gsimplecal-gtk3/patches | 1 +
srcpkgs/gsimplecal-gtk3/template | 17 ++++-------
.../harfbuzz/patches/fix-char-signed.patch | 29 -------------------
srcpkgs/harfbuzz/template | 5 ++--
srcpkgs/hatari/template | 2 +-
srcpkgs/hunspell-pl_PL/template | 4 +--
srcpkgs/kismet/template | 6 ++--
srcpkgs/ksh/template | 4 +--
srcpkgs/lighttpd/template | 4 +--
srcpkgs/mate-settings-daemon/template | 3 +-
srcpkgs/mpop/template | 4 +--
srcpkgs/msmtp/template | 4 +--
srcpkgs/mutt/template | 6 ++--
srcpkgs/okteta/template | 4 +--
srcpkgs/openblas/template | 4 +--
srcpkgs/openjdk8/template | 2 +-
srcpkgs/qtcreator/template | 11 ++-----
srcpkgs/removed-packages/template | 1 -
srcpkgs/rsync/template | 7 ++---
srcpkgs/sc3-plugins/template | 2 +-
srcpkgs/tgt/template | 4 +--
srcpkgs/zlib/patches/2-CVE-2022-37434.patch | 29 -------------------
...-2022-37434.patch => CVE-2022-37434.patch} | 0
srcpkgs/zlib/template | 2 +-
40 files changed, 133 insertions(+), 160 deletions(-)
create mode 100644 srcpkgs/alarm-clock/template
delete mode 100644 srcpkgs/cloudflared/template
delete mode 120000 srcpkgs/gsimplecal-gtk2
create mode 100644 srcpkgs/gsimplecal-gtk2/patches/musl.patch
create mode 100644 srcpkgs/gsimplecal-gtk2/template
create mode 120000 srcpkgs/gsimplecal-gtk3/patches
delete mode 100644 srcpkgs/harfbuzz/patches/fix-char-signed.patch
delete mode 100644 srcpkgs/zlib/patches/2-CVE-2022-37434.patch
rename srcpkgs/zlib/patches/{1-CVE-2022-37434.patch => CVE-2022-37434.patch} (100%)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index e1efd9cc6586..711fcea6273d 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,10 +54,6 @@ _EOF
cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
cmake_args+=" -DCMAKE_BUILD_TYPE=None"
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
- cmake_args+=" -DQT_HOST_PATH=/usr"
- # QT_HOST_PATH isn't enough in my system,
- # which have binfmts support on and off
- cmake_args+=" -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/cmake"
if [[ $build_helper = *"qemu"* ]]; then
echo "SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)" \
diff --git a/common/shlibs b/common/shlibs
index ea6fde4ffe31..326943713f07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -105,7 +105,7 @@ libgtk-x11-2.0.so.0 gtk+-2.16.0_1
libgdk_pixbuf-2.0.so.0 gdk-pixbuf-2.22.0_1
libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-xlib-2.30.8_1
libgailutil.so.18 gtk+-2.16.0_1
-libfreetype.so.6 freetype-2.12.1_1
+libfreetype.so.6 freetype-2.3.9_1
libfontconfig.so.1 fontconfig-2.6.0_1
libX11-xcb.so.1 libX11-1.2_1
libX11.so.6 libX11-1.2_1
@@ -1153,10 +1153,10 @@ librygel-renderer-gst-2.6.so.2 librygel-0.26.0_1
librygel-ruih-2.0.so.1 librygel-0.26.0_1
librygel-server-2.6.so.2 librygel-0.26.0_1
librygel-db-2.6.so.2 librygel-0.28.0_1
-libharfbuzz.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-icu.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-subset.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-gobject.so.0 libharfbuzz-5.1.0_1
+libharfbuzz.so.0 libharfbuzz-0.9.4_1
+libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
+libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
+libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
libosinfo-1.0.so.0 libosinfo-0.2.0_1
libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
diff --git a/srcpkgs/alarm-clock/template b/srcpkgs/alarm-clock/template
new file mode 100644
index 000000000000..8c2fd84b812d
--- /dev/null
+++ b/srcpkgs/alarm-clock/template
@@ -0,0 +1,19 @@
+# Template file for 'alarm-clock'
+pkgname=alarm-clock
+version=1.4.9
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake gettext-devel glib-devel libtool intltool pkg-config"
+makedepends="gstreamer1-devel gtk+-devel libnotify-devel libunique1-devel"
+maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Simple GTK2 alarm clock for your desktop"
+homepage="https://github.com/shaggytwodope/alarm-clock"
+license="GPL-3.0-or-later"
+distfiles="https://github.com/shaggytwodope/alarm-clock/archive/v${version}.tar.gz"
+checksum=3724a42801befaee631d249edd8b15318bb72ae5f9db918c25de513f4c3f4538
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
diff --git a/srcpkgs/bluebird-themes/template b/srcpkgs/bluebird-themes/template
index 65f66d6da3ba..a9f4e852df12 100644
--- a/srcpkgs/bluebird-themes/template
+++ b/srcpkgs/bluebird-themes/template
@@ -4,7 +4,7 @@ version=1.3
revision=3
wrksrc=Bluebird-$version
build_style=gnu-configure
-hostmakedepends="sassc which glib-devel automake gdk-pixbuf tar librsvg"
+hostmakedepends="sassc which glib-devel automake gdk-pixbuf tar librsvg-utils"
short_desc="Elegant blue GTK2/3/Metacity/Xfwm theme"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
license="GPL-2.0-or-later"
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 7f7de90b5f05..118b7d607108 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,11 +1,11 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.0
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
-hostmakedepends="pkg-config automake libtool gettext-devel"
+hostmakedepends="pkg-config python-devel automake libtool gettext-devel"
makedepends="poppler-glib-devel libarchive-devel libSM-devel
libnotify-devel libcanberra-devel gpgme-devel gnutls-devel
enchant2-devel dbus-devel libetpan-devel libldap-devel
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
deleted file mode 100644
index 3cb6912ffda9..000000000000
--- a/srcpkgs/cloudflared/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'cloudflared'
-pkgname=cloudflared
-version=2022.7.1
-revision=1
-build_style=go
-go_import_path=github.com/cloudflare/cloudflared
-go_package="${go_import_path}/cmd/cloudflared"
-go_ldflags="-X \"main.Version=${version}\""
-short_desc="Cloudflare Tunnel client"
-maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
-license="Apache-2.0"
-homepage="https://developers.cloudflare.com/argo-tunnel/"
-changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
-distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
-checksum=3a822faaed7ae90be5ba4920f9226cd85367402d2c5a2bf2f0732c37cad6599d
-
-pre_build() {
- go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
-}
diff --git a/srcpkgs/dbus-elogind/template b/srcpkgs/dbus-elogind/template
index 61a6040d200d..7e92ccf7cd2b 100644
--- a/srcpkgs/dbus-elogind/template
+++ b/srcpkgs/dbus-elogind/template
@@ -1,7 +1,7 @@
# Template file for 'dbus-elogind'
# NOTE: keep this pkg synchronized with dbus
pkgname=dbus-elogind
-version=1.14.0
+version=1.12.20
revision=1
wrksrc="dbus-${version}"
build_style=gnu-configure
@@ -18,9 +18,9 @@ short_desc="Message bus system (built with elogind support)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
-changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
-distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
+distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
+checksum=f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
conf_files="/etc/dbus-1/*.conf"
replaces="dbus>=0"
provides="dbus-${version}_${revision}"
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aa6b118f52ae..09dd3296c8a6 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
# Template file for 'dbus'
# NOTE: keep this pkg synchronized with dbus-elogind
pkgname=dbus
-version=1.14.0
+version=1.12.20
revision=1
build_style=gnu-configure
configure_args="--disable-selinux --enable-inotify --with-dbus-user=dbus
@@ -15,9 +15,9 @@ short_desc="Message bus system"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
-changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
-distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
+distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
+checksum=f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
python_version=3
conf_files="/etc/dbus-1/*.conf"
diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index a21aba144cb6..d139879a5399 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
# Template file for 'foot'
pkgname=foot
-version=1.13.0
+version=1.12.1
revision=1
wrksrc=$pkgname
build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
homepage="https://codeberg.org/dnkl/foot"
changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9fd10584d40f6aac6b87c11a94e1fdfc4bac43aef9144f4aa84213257672da8c
+checksum=14e307ac89454b682bb9f1bc644043779f4462df656034fcc4c1e72b18fbffdd
conf_files="/etc/xdg/foot/foot.ini"
post_install() {
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 72549c71bd7e..75abb71ceaa2 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,11 +1,11 @@
# Template file for 'freetype'
pkgname=freetype
version=2.12.1
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel libpng-devel brotli-devel"
+makedepends="bzip2-devel libpng-devel"
short_desc="Font rendering engine and library API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, FTL"
diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 71e7b17e21d6..7e9383e3f341 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
# Template file for 'fzf'
pkgname=fzf
-version=0.32.1
+version=0.32.0
revision=1
build_style=go
go_import_path="github.com/junegunn/fzf"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/junegunn/fzf"
changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=c7afef61553b3b3e4e02819c5d560fa4acf33ecb39829aeba392c2e05457ca6a
+checksum=3502c15faeb0a6d553c68ab1a7f472af08afed94a1d016427a8ab053ef149a8f
post_install() {
cd ${wrksrc}
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index d8ea09e85f42..228bd0334166 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
# Template file for 'gnutls'
pkgname=gnutls
-version=3.7.7
+version=3.7.6
revision=1
build_style=gnu-configure
configure_args="--disable-guile --disable-static
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only, LGPL-2.1-or-later"
homepage="https://gnutls.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106
+checksum=77065719a345bfb18faa250134be4c53bef70c1bd61f6c0c23ceb8b44f0262ff
pre_check() {
# same as $PASS in tests/cert-tests/certtool.sh
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index b95341dfe54f..29579786726d 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -10,11 +10,12 @@ makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-dev
faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
depends="hicolor-icon-theme"
short_desc="Music Manager and Player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2 #unverified
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gsimplecal-gtk2 b/srcpkgs/gsimplecal-gtk2
deleted file mode 120000
index bd547b0783c2..000000000000
--- a/srcpkgs/gsimplecal-gtk2
+++ /dev/null
@@ -1 +0,0 @@
-gsimplecal-gtk3
\ No newline at end of file
diff --git a/srcpkgs/gsimplecal-gtk2/patches/musl.patch b/srcpkgs/gsimplecal-gtk2/patches/musl.patch
new file mode 100644
index 000000000000..eef2a786bb73
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk2/patches/musl.patch
@@ -0,0 +1,19 @@
+--- a/src/Unique.cpp.orig 2016-04-24 08:08:43.921536576 +0200
++++ b/src/Unique.cpp 2016-04-24 08:09:18.615896283 +0200
+@@ -1,10 +1,16 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <limits.h>
+ #include <signal.h>
+ #include <sys/sem.h>
++#ifdef HAVE_SYSCTL_H
+ #include <sys/sysctl.h>
++#endif
+ #include <sys/types.h>
+
+ #include "Unique.hpp"
diff --git a/srcpkgs/gsimplecal-gtk2/template b/srcpkgs/gsimplecal-gtk2/template
new file mode 100644
index 000000000000..73cf3bd39b88
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk2/template
@@ -0,0 +1,25 @@
+# Template file for 'gsimplecal-gtk2'
+pkgname=gsimplecal-gtk2
+version=2.1
+revision=4
+wrksrc="${pkgname%-*}-${version}"
+build_style=gnu-configure
+configure_args="--enable-gtk2"
+hostmakedepends="automake pkg-config"
+makedepends="gtk+-devel"
+short_desc="Simple and lightweight GTK calendar"
+maintainer="Jarbowski <jarbowski@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://dmedvinsky.github.io/gsimplecal/"
+distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
+checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
+
+replaces="gsimplecal-gtk3>=0"
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_install() {
+ vlicense COPYING
+}
diff --git a/srcpkgs/gsimplecal-gtk3/patches b/srcpkgs/gsimplecal-gtk3/patches
new file mode 120000
index 000000000000..7ee8024d19bb
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk3/patches
@@ -0,0 +1 @@
+../gsimplecal-gtk2/patches
\ No newline at end of file
diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template
index 21c75517bdb8..52acc624d51c 100644
--- a/srcpkgs/gsimplecal-gtk3/template
+++ b/srcpkgs/gsimplecal-gtk3/template
@@ -1,18 +1,19 @@
# Template file for 'gsimplecal-gtk3'
pkgname=gsimplecal-gtk3
-version=2.4.1
-revision=1
+version=2.1
+revision=4
wrksrc="${pkgname%-*}-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="gtk+3-devel"
short_desc="Simple and lightweight GTK calendar"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Jarbowski <jarbowski@gmail.com>"
license="BSD-3-Clause"
homepage="http://dmedvinsky.github.io/gsimplecal/"
-changelog="https://github.com/dmedvinsky/gsimplecal/raw/master/ChangeLog"
distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum=fd47df49ec26115bd6022d0e6a24648873c619e0406375d807fb18428d07d000
+checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
+
+replaces="gsimplecal-gtk2>=0"
pre_configure() {
./autogen.sh
@@ -21,9 +22,3 @@ pre_configure() {
post_install() {
vlicense COPYING
}
-
-gsimplecal-gtk2_package() {
- build_style=meta
- depends="gsimplecal-gtk3>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/harfbuzz/patches/fix-char-signed.patch b/srcpkgs/harfbuzz/patches/fix-char-signed.patch
deleted file mode 100644
index affcbc57dc55..000000000000
--- a/srcpkgs/harfbuzz/patches/fix-char-signed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/harfbuzz/harfbuzz/pull/3771
-From 81fe35159e4fdc5ca2c9436cc9ad2750bda64203 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Mon, 1 Aug 2022 07:45:25 +0000
-Subject: [PATCH] [repacker] fix signedness of char in tests
-
----
- src/test-repacker.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test-repacker.cc b/src/test-repacker.cc
-index 053c0c603..1b7e1f08b 100644
---- a/src/test-repacker.cc
-+++ b/src/test-repacker.cc
-@@ -112,9 +112,9 @@ static void start_lookup (int8_t type,
- hb_serialize_context_t* c)
- {
- char lookup[] = {
-- 0, type, // type
-+ 0, (char)type, // type
- 0, 0, // flag
-- 0, num_subtables, // num subtables
-+ 0, (char)num_subtables, // num subtables
- };
-
- start_object (lookup, 6, c);
---
-2.37.1
-
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 2fc515698f92..8e0947d775fb 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,7 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
-version=5.1.0
+reverts="5.1.0_1"
+version=4.4.1
revision=2
build_style=meson
build_helper="gir qemu"
@@ -14,7 +15,7 @@ license="MIT"
homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05
+checksum=c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee
libharfbuzz_package() {
short_desc+=" - runtime library"
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 4858805707ae..e05e77961d60 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config python3"
makedepends="SDL2-devel libpng-devel portaudio-devel zlib-devel"
depends="hicolor-icon-theme"
short_desc="Atari ST/STE/TT/Falcon emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index bfbcaae14013..db94240d6e7e 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
# Template file for 'hunspell-pl_PL'
pkgname=hunspell-pl_PL
-version=20220801
+version=20220501
revision=1
create_wrksrc=yes
short_desc="Polish dictionary for hunspell"
@@ -8,7 +8,7 @@ maintainer="m-cz <emcze@ya.ru>"
license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
homepage="https://sjp.pl/slownik/ort/"
distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=cc2874c7bf452255cbcd09d5083dd337f9c34daf2b6079bc97e398132a966424
+checksum=fd715b1facddfd680b8779f6f671a6763a0bf3b31f6e5909d52926ac27f7f1c7
post_extract() {
bsdtar -xf pl_PL.zip
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index aa14af915c45..3780e03f87a3 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
# Template file for 'kismet'
pkgname=kismet
-version=2022.08.R1
-revision=1
+version=2022.02.R1
+revision=4
_realver="${version//./-}"
wrksrc="${pkgname}-${_realver}"
build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://www.kismetwireless.net/"
distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz"
-checksum=2149cceac5526508653f4d02dcf7a694e3da3dc000a2372a1ee4bf9988279781
+checksum=aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8
system_groups="kismet"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 5f022424b7f0..be70d00c905b 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,7 +1,7 @@
# Template file for 'ksh'
pkgname=ksh
reverts="2020.0.0_1"
-version=1.0.2
+version=1.0.1
revision=1
wrksrc="ksh-${version}"
short_desc="AT&T's Korn shell (community branch ksh93u+m)"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="https://github.com/ksh93/ksh"
distfiles="https://github.com/ksh93/ksh/archive/v${version}.tar.gz"
-checksum=e62616caab07b2d090e9ad5e17f058d4b8b8f12b48f44017d9e5d6550dfd5c14
+checksum=4cbbee459df591426fea9e1705fa3200d168faf800451544d04fdb7013e33468
nocross=yes
register_shell="/bin/ksh"
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8a96ba55203d..6df12c8a5ed7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
# Template file for 'lighttpd'
pkgname=lighttpd
-version=1.4.66
+version=1.4.65
revision=1
build_style=meson
configure_args="-Dwith_brotli=false -Dwith_bzip=false
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://lighttpd.net"
distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=47ac6e60271aa0196e65472d02d019556dc7c6d09df3b65df2c1ab6866348e3b
+checksum=bf0fa68a629fbc404023a912b377e70049331d6797bcbb4b3e8df4c3b42328be
conf_files="/etc/lighttpd/lighttpd.conf"
system_accounts="_lighttpd"
diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template
index 43606ffbdc3c..b5db461e136b 100644
--- a/srcpkgs/mate-settings-daemon/template
+++ b/srcpkgs/mate-settings-daemon/template
@@ -1,13 +1,14 @@
# Template file for 'mate-settings-daemon'
pkgname=mate-settings-daemon
version=1.26.0
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse"
hostmakedepends="dbus-glib-devel glib-devel intltool itstool pkg-config polkit"
makedepends="dbus-glib-devel libXt-devel libXxf86misc-devel libcanberra-devel
libmatekbd-devel libmatemixer-devel libnotify-devel mate-desktop-devel nss-devel
polkit-devel"
+depends="alsa-plugins-pulseaudio"
short_desc="MATE Settings daemon (pulseaudio)"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index a718f7c06571..ba25741d8db8 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
# Template file for 'mpop'
pkgname=mpop
-version=1.4.17
+version=1.4.16
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/mpop/"
distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=42ae494bad2941d9f647c48c3ed98c38ba9aa5cf3fe48fb0fe06e5b6dadf8bd5
+checksum=870eb571eae6d23fb92ad0c84d79de9c38c5f624e3614937d574bfe49ba687f9
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 2664cd7cff9d..eb687ece82c7 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
# Template file for 'msmtp'
pkgname=msmtp
-version=1.8.22
+version=1.8.20
revision=1
build_style=gnu-configure
configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/msmtp/"
distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7
+checksum=d93ae2aafc0f48af7dc9d0b394df1bb800588b8b4e8d096d8b3cf225344eb111
build_options="idn sasl gnome msmtpd"
build_options_default="idn sasl msmtpd"
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e3b0218e4008..c237bab6699a 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
# Template file for 'mutt'
pkgname=mutt
-version=2.2.7
-revision=1
+version=2.2.6
+revision=2
build_style=gnu-configure
configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
--enable-gpgme --with-idn2 --with-ssl --without-sasl --with-gsasl
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="http://www.mutt.org"
changelog="http://mutt.org/relnotes/${version%.*}"
distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=eb13858f58bb369f477bf652d90e9b6aaddd0d610acbea3455049e5efad36df1
+checksum=ffa2d93517cfc606fe01daffc5f12e42062a1c134d3b9af78484ebc5430888d3
post_install() {
# provided by mime-types
diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template
index 9c5638e67cf2..7d3878ca031a 100644
--- a/srcpkgs/okteta/template
+++ b/srcpkgs/okteta/template
@@ -1,7 +1,7 @@
# Template file for 'okteta'
pkgname=okteta
reverts="4.14.3_1"
-version=0.26.9
+version=0.26.6
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://apps.kde.org/okteta/"
distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz"
-checksum=16854c4d4e94838219ae3115a42ba385fda5c87dc6c9865ac90d3774f8d05ffb
+checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c
okteta-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index a749863d1d4e..e308926c5abd 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,7 +1,7 @@
# Template file for 'openblas'
pkgname=openblas
reverts="0.3.19_1"
-version=0.3.21
+version=0.3.20
revision=1
wrksrc="OpenBLAS-${version}"
build_style=gnu-makefile
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
homepage="https://www.openblas.net/"
changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"
-checksum=f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca
+checksum=8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 5060224eaab8..ebf8aa2b56a6 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=2
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 0e4840d0e7f8..cdd49a872a6c 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
# Template file for 'qtcreator'
pkgname=qtcreator
-version=8.0.0
+version=7.0.2
revision=1
wrksrc="qt-creator-opensource-src-${version}"
build_style=cmake
@@ -16,9 +16,9 @@ short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
-changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changelog/changes-${version}.md"
+changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=323640f96c76d199fe5bf7b02cbf2dd1a3b6489ab7cc0adeaad3957d8dc96f17
+checksum=14dee285aa3aa56fb25ccbd7587382fb6cb05ae99a1a30237f0a0bbef3ceff7a
replaces="qtcreator-data>=0"
python_version=3
@@ -33,11 +33,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- CXXFLAGS+=" -latomic "
-fi
-
post_install() {
# Install the license with the annotation for
# the Qt Company GPL Exception 1.0
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30cb55c291fb..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -16,7 +16,6 @@ replaces="
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
- alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
appdata-tools<=0.1.8_2
diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 9563278c7b87..2f79c20f8f6b 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,11 +1,10 @@
# Template file for 'rsync'
pkgname=rsync
version=3.2.4
-revision=2
+revision=1
build_style=gnu-configure
-configure_args="--with-rrsync"
conf_files="/etc/rsyncd.conf"
-hostmakedepends="perl python3-commonmark"
+hostmakedepends="perl"
makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
openssl-devel libzstd-devel"
short_desc="Remote fast incremental file transfer tool"
@@ -20,7 +19,7 @@ checksum=6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1
CFLAGS="-DINET6"
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-simd"
+ configure_args=" --disable-simd"
fi
pre_check() {
diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template
index 45f54453e414..8511caea26e0 100644
--- a/srcpkgs/sc3-plugins/template
+++ b/srcpkgs/sc3-plugins/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
makedepends="fftw-devel libstk-devel"
depends="supercollider"
short_desc="Extension plugins for the SuperCollider3 audio synthesis server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-2.0-or-later"
homepage="https://github.com/supercollider/sc3-plugins"
distfiles="https://github.com/supercollider/sc3-plugins/archive/Version-${version}.tar.gz
diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index 72325672c896..316e126c922e 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
# Template file for 'tgt'
pkgname=tgt
-version=1.0.84
+version=1.0.83
revision=1
build_style=gnu-makefile
make_install_args="sbindir=/usr/bin"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://github.com/fujita/tgt"
distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=c5f5913fd5c4a1333590ad3ddcf80dd12592a5f773f3609619513dd583772486
+checksum=a9ddb0ff32d3396416df9639f9f398d14a6051f505b5772d7d196df99df8b8da
post_extract() {
sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
diff --git a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch b/srcpkgs/zlib/patches/2-CVE-2022-37434.patch
deleted file mode 100644
index c5c95a92b28a..000000000000
--- a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
-From: Mark Adler <fork@madler.net>
-Date: Mon, 8 Aug 2022 10:50:09 -0700
-Subject: [PATCH] Fix extra field processing bug that dereferences NULL
- state->head.
-
-The recent commit to fix a gzip header extra field processing bug
-introduced the new bug fixed here.
----
- inflate.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 7a7289749..2a3c4fe98 100644
---- a/inflate.c
-+++ b/inflate.c
-@@ -763,10 +763,10 @@ int flush;
- copy = state->length;
- if (copy > have) copy = have;
- if (copy) {
-- len = state->head->extra_len - state->length;
- if (state->head != Z_NULL &&
- state->head->extra != Z_NULL &&
-- len < state->head->extra_max) {
-+ (len = state->head->extra_len - state->length) <
-+ state->head->extra_max) {
- zmemcpy(state->head->extra + len, next,
- len + copy > state->head->extra_max ?
- state->head->extra_max - len : copy);
diff --git a/srcpkgs/zlib/patches/1-CVE-2022-37434.patch b/srcpkgs/zlib/patches/CVE-2022-37434.patch
similarity index 100%
rename from srcpkgs/zlib/patches/1-CVE-2022-37434.patch
rename to srcpkgs/zlib/patches/CVE-2022-37434.patch
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 17cf7ccaf9f4..b0ef4c68e35d 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
# Template file for 'zlib'
pkgname=zlib
version=1.2.12
-revision=4
+revision=3
bootstrap=yes
build_style=configure
configure_args="--prefix=/usr --shared"
From 82e19c04276852ac0cc15e9064d3a4894f9c3ec9 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Mon, 8 Aug 2022 17:07:23 +1000
Subject: [PATCH 6/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit 4bb64d1cec5444300b74dd3590fe132d28d05e10.
---
common/xbps-src/shutils/update_check.sh | 1 -
srcpkgs/PrusaSlicer/template | 32 ++--
srcpkgs/amtk/template | 24 ++-
srcpkgs/angband/template | 2 +-
srcpkgs/cargo-geiger/template | 5 +-
srcpkgs/freetype/template | 15 +-
srcpkgs/go/patches/fix-32bit-tests.patch | 13 --
srcpkgs/go/patches/fix-musl-tests.patch | 29 ----
srcpkgs/go/patches/fix-tests.patch | 150 ------------------
srcpkgs/go/template | 29 +---
srcpkgs/godot/template | 4 +-
srcpkgs/gpodder/template | 6 +-
srcpkgs/harfbuzz/template | 3 +-
srcpkgs/hatch/template | 6 +-
srcpkgs/hwinfo/template | 4 +-
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 ++
srcpkgs/libnvme/template | 5 +-
srcpkgs/luarocks-lua53/template | 5 +-
srcpkgs/mcelog/template | 4 +-
srcpkgs/mumble/files/mumble-server/log/run | 3 -
srcpkgs/mumble/files/mumble-server/run | 4 -
srcpkgs/mumble/patches/config.patch | 11 --
srcpkgs/mumble/template | 17 +-
.../nettle/patches/musl-ppc-use-auxval.patch | 21 +++
srcpkgs/nettle/patches/ppc64-elfv2.patch | 22 +++
srcpkgs/nettle/template | 5 +-
srcpkgs/nilfs-utils/template | 21 +--
srcpkgs/nspr/template | 4 +-
srcpkgs/nvme-cli/patches/musl.patch | 18 +++
srcpkgs/nvme-cli/template | 4 +-
srcpkgs/perl-Sub-HandlesVia/template | 4 +-
srcpkgs/python3-cached-property/template | 8 +-
srcpkgs/python3-virtualenv/template | 10 +-
srcpkgs/spacefm/template | 2 +-
.../thunderbird/patches/ROOT_CLIP_CHAIN.patch | 12 --
.../vala-panel-appmenu/patches/no-gtk2.patch | 7 -
srcpkgs/wayfire/template | 2 +-
srcpkgs/weston/template | 3 +-
srcpkgs/xarchiver/patches/doubleclick.patch | 75 ---------
srcpkgs/xarchiver/template | 2 +-
srcpkgs/xournal | 1 -
srcpkgs/xournal/template | 22 +++
srcpkgs/xournalpp/template | 8 +-
.../patches/mupdf-1.20.0.patch | 12 --
44 files changed, 184 insertions(+), 464 deletions(-)
delete mode 100644 srcpkgs/go/patches/fix-32bit-tests.patch
delete mode 100644 srcpkgs/go/patches/fix-musl-tests.patch
delete mode 100644 srcpkgs/go/patches/fix-tests.patch
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
delete mode 100644 srcpkgs/mumble/files/mumble-server/log/run
delete mode 100644 srcpkgs/mumble/files/mumble-server/run
delete mode 100644 srcpkgs/mumble/patches/config.patch
create mode 100644 srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
create mode 100644 srcpkgs/nettle/patches/ppc64-elfv2.patch
create mode 100644 srcpkgs/nvme-cli/patches/musl.patch
delete mode 100644 srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
delete mode 100644 srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
delete mode 100644 srcpkgs/xarchiver/patches/doubleclick.patch
delete mode 120000 srcpkgs/xournal
create mode 100644 srcpkgs/xournal/template
delete mode 100644 srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 80ab6e8889d8..7348260f54af 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -4,7 +4,6 @@ update_check() {
local i p url pkgurlname rx found_version consider
local update_override=$XBPS_SRCPKGDIR/$XBPS_TARGET_PKG/update
local original_pkgname=$pkgname
- local pkgname=$sourcepkg
local urlpfx urlsfx
local -A fetchedurls
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..46cd9d3dede6 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=1
+version=2.4.0
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
@@ -16,31 +16,21 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2
nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
post_extract() {
- # Mark tests that fail on certain targets
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- vsed -i tests/libslic3r/test_mutable_priority_queue.cpp \
- -e 's/\(TEST_CASE("Mutable priority queue - first pop", "\[MutableSkipHeapPriorityQueue\]\)\(")\)/\1[!mayfail]\2/'
- ;;
- i686*)
- vsed -i tests/libslic3r/test_voronoi.cpp \
- -e 's/\(TEST_CASE("Voronoi offset 2", "\[VoronoiOffset\]\)\(")\)/\1[!mayfail]\2/'
- vsed -i tests/fff_print/test_trianglemesh.cpp \
- -e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
- ;;
- esac
-}
-
-post_install() {
- vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
+ # this test suite fails on musl
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d"
+ fi
}
Slic3rPE_package() {
build_style=meta
- short_desc+=" (transitional dummy package)"
depends="${sourcepkg}>=${version}_${revision}"
}
+
+post_install() {
+ vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
+}
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
index 44a33686702f..6942c7c51eda 100644
--- a/srcpkgs/amtk/template
+++ b/srcpkgs/amtk/template
@@ -1,35 +1,29 @@
# Template file for 'amtk'
pkgname=amtk
-version=5.4.1
+version=5.2.0
revision=1
-build_style=meson
+build_style=gnu-configure
build_helper="gir"
-configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc)"
-hostmakedepends="pkg-config glib-devel gettext $(vopt_if gtk_doc gtk-doc)"
+configure_args="$(vopt_enable gir introspection)"
+hostmakedepends="pkg-config glib-devel"
makedepends="gtk+3-devel libglib-devel"
short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="https://gitlab.gnome.org/World/amtk"
+homepage="https://gitlab.gnome.org/Archive/amtk"
distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=7ebabc429b0eebb2b32360c9bfdbe368e489b35c3cdc086a856cfc9b3a466a72
+checksum=820545bb4cf87ecebc2c3638d6b6e58b8dbd60a419a9b43cf020124e5dad7078
-build_options="gir gtk_doc"
+build_options="gir"
build_options_default="gir"
-if ! [ "$CROSS_BUILD" ]; then
- build_options_default+="gtk_doc"
-fi
-
amtk-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel"
+ depends="amtk-${version}_${revision} gtk+3-devel libglib-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
+ vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
diff --git a/srcpkgs/angband/template b/srcpkgs/angband/template
index 7cf46c4e13ad..2ac3a0f27fa5 100644
--- a/srcpkgs/angband/template
+++ b/srcpkgs/angband/template
@@ -11,7 +11,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-or-later"
homepage="http://rephial.org/"
changelog="http://rephial.org/release/"
-distfiles="https://github.com/angband/angband/archive/refs/tags/${version}.tar.gz"
+distfiles="http://rephial.org/downloads/4.2/angband-${version}.tar.gz"
checksum=acd735c9d46bf86ee14337c71c56f743ad13ec2a95d62e7115604621e7560d0f
pre_configure() {
diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index 1fa9ab08ec20..0b2f201450b1 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,6 +1,6 @@
# Template file for 'cargo-geiger'
pkgname=cargo-geiger
-version=0.11.4
+version=0.11.3
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_wrksrc="${pkgname}"
@@ -11,9 +11,8 @@ short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
homepage="https://github.com/rust-secure-code/cargo-geiger"
-changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-geiger/master/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-geiger/archive/cargo-geiger-${version}.tar.gz"
-checksum=8f57da70a465c7fc2797b5142c51fd763e4569e0b3daf63205980be3a1af2576
+checksum=f6d6e860a4c597b6a4eed1ed9ab800eb13741744768f7d3a5b2c2faee3922169
post_install() {
vlicense LICENSE-MIT
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 75abb71ceaa2..ba4c6ad900c4 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
-version=2.12.1
-revision=1
+version=2.10.4
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -11,14 +11,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, FTL"
homepage="https://www.freetype.org/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f
+checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
post_patch() {
vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
}
post_install() {
- vlicense LICENSE.TXT
+ vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
}
@@ -26,10 +26,9 @@ freetype-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/bin/freetype-config
- vmove usr/share/man/man1/freetype-config.1
- vmove usr/share/aclocal
- vmove usr/include
+ for f in bin include share; do
+ vmove usr/${f}
+ done
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
deleted file mode 100644
index f5d8083b19f0..000000000000
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fixes go1.19 error on i686 -
- runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
-
---- a/go/src/cmd/go/script_test.go
-+++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
- "GO_TESTING_GOTOOLS", // for gccgo testing
- "GCCGO", // for gccgo testing
- "GCCGOTOOLDIR", // for gccgo testing
-+ "CGO_CFLAGS", // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
- }
-
- // setup sets up the test execution temporary directory and environment.
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
deleted file mode 100644
index f70cb456857b..000000000000
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
-
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
- {call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
- {call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
-
-- {call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
-- {call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
-- {call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
--
- {call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
- {call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
- {call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
- {call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
- {call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
-
-- {call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
-- {call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
-- {call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
--
- {call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
- {call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
- {call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
deleted file mode 100644
index c93415611413..000000000000
--- a/srcpkgs/go/patches/fix-tests.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
-
---- a/go/src/os/os_unix_test.go
-+++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
- }
- }
-
--func TestChown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestChown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = Chown(f.Name(), -1, gid); err != nil {
-- t.Fatalf("chown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = Chown(f.Name(), -1, g); err != nil {
-- t.Fatalf("chown %s -1 %d: %s", f.Name(), g, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), g)
--
-- // change back to gid to test fd.Chown
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
-- }
--}
--
--func TestFileChown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestFileChown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = f.Chown(-1, g); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), g, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), g)
--
-- // change back to gid to test fd.Chown
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
-- }
--}
--
--func TestLchown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestLchown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- linkname := f.Name() + "2"
-- if err := Symlink(f.Name(), linkname); err != nil {
-- if runtime.GOOS == "android" && IsPermission(err) {
-- t.Skip("skipping test on Android; permission error creating symlink")
-- }
-- t.Fatalf("link %s -> %s: %v", f.Name(), linkname, err)
-- }
-- defer Remove(linkname)
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = Lchown(linkname, -1, gid); err != nil {
-- if err, ok := err.(*PathError); ok && err.Err == syscall.ENOSYS {
-- t.Skip("lchown is unavailable")
-- }
-- t.Fatalf("lchown %s -1 %d: %s", linkname, gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, linkname, int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = Lchown(linkname, -1, g); err != nil {
-- t.Fatalf("lchown %s -1 %d: %s", linkname, g, err)
-- }
-- checkUidGid(t, linkname, int(sys.Uid), g)
--
-- // Check that link target's gid is unchanged.
-- checkUidGid(t, f.Name(), int(sys.Uid), int(sys.Gid))
-- }
--}
--
- // Issue 16919: Readdir must return a non-empty slice or an error.
- func TestReaddirRemoveRace(t *testing.T) {
- oldStat := *LstatP
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index a5fce0f153b6..2db64b795ed8 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,18 +1,17 @@
# Template file for 'go'
pkgname=go
-version=1.19
+version=1.18.3
revision=1
create_wrksrc=yes
build_wrksrc=go
hostmakedepends="go1.12-bootstrap"
-checkdepends="iana-etc clang gcc-fortran"
short_desc="Go Programming Language"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://go.dev/"
changelog="https://go.dev/doc/devel/release.html"
distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9
+checksum=0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d
nostrip=yes
noverifyrdeps=yes
@@ -32,24 +31,11 @@ if [ "$CROSS_BUILD" ]; then
fi
fi
-# Workaround for go-1.19 compilation error on i686
-# runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
-if [ "$XBPS_MACHINE" = i686 ]; then
- export CGO_CFLAGS="-fno-stack-protector"
-fi
-
-post_extract() {
- if [ "$(df . --output=fstype | tail -1)" = zfs ]; then
- # https://github.com/golang/go/issues/39905
- rm -v go/src/cmd/link/internal/ld/fallocate_test.go
- fi
-}
-
do_build() {
unset GCC CC CXX LD CFLAGS
# FIXME: work around leaking go build-style vars when built as a
# dependency
- unset CGO_CXXFLAGS CGO_ENABLED # CGO_CFLAGS
+ unset CGO_CXXFLAGS CGO_CFLAGS CGO_ENABLED
export GOROOT_BOOTSTRAP="/usr/lib/go1.12"
export GOROOT=$PWD
@@ -61,15 +47,6 @@ do_build() {
bash make.bash -v
}
-do_check() {
- if [ "$XBPS_LIBC" = musl ]; then
- # https://github.com/golang/go/issues/39857
- ./bin/go tool dist test -v -run "!^cgo_test$"
- else
- ./bin/go tool dist test -v
- fi
-}
-
do_install() {
local bindir
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index b1d393b582ac..c38f3f8c525a 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
# Template file for 'godot'
pkgname=godot
-version=3.5
+version=3.4
revision=1
archs="x86_64* i686* aarch64* armv7* ppc64*"
wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
license="MIT"
homepage="https://www.godotengine.org/"
distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
+checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
CFLAGS+=" -fPIE -fPIC"
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 79e6bcb07d23..738464c61ca0 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,7 +1,7 @@
# Template file for 'gpodder'
pkgname=gpodder
-version=3.11.0
-revision=1
+version=3.10.21
+revision=2
hostmakedepends="python3 intltool"
depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
@@ -14,7 +14,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/gpodder/gpodder"
distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=c96a3332e61e8277475497ec24fe0918c5cafc580a2f85fc7b34c2fd989873de
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
do_check() {
make releasetest
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 8e0947d775fb..4899fd5a1c38 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,8 +1,7 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
-reverts="5.1.0_1"
version=4.4.1
-revision=2
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
diff --git a/srcpkgs/hatch/template b/srcpkgs/hatch/template
index 52d222ae6c7d..5269561edf34 100644
--- a/srcpkgs/hatch/template
+++ b/srcpkgs/hatch/template
@@ -1,6 +1,6 @@
# Template file for 'hatch'
pkgname=hatch
-version=1.4.0
+version=1.3.1
revision=1
build_style=python3-pep517
# ignore backend tests, because updating hatchling when there is no new hatch
@@ -12,7 +12,7 @@ hostmakedepends="hatchling"
depends="python3-atomicwrites python3-click hatchling python3-httpx
python3-keyring python3-pexpect python3-platformdirs python3-pyperclip
python3-rich python3-tomli-w python3-tomlkit python3-userpath
- python3-virtualenv python3-hyperlink"
+ python3-virtualenv"
checkdepends="${depends} python3-pytest python3-pytest-mock
python3-pytest-xdist git python3-pip"
short_desc="Modern, extensible Python project management "
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://hatch.pypa.io/latest/"
changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history.md"
distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a1b06523cf66c759828f21145d8619044049b9ef660accef42d47612e7b7fda2
+checksum=fb1bdad4a22d3443137036b246898c5d3c7552ff4ba399b4605548cef0a22496
make_check_pre="env PYTHONPATH=./src"
post_install() {
diff --git a/srcpkgs/hwinfo/template b/srcpkgs/hwinfo/template
index e7510055d795..416261ae95bb 100644
--- a/srcpkgs/hwinfo/template
+++ b/srcpkgs/hwinfo/template
@@ -1,6 +1,6 @@
# Template file for 'hwinfo'
pkgname=hwinfo
-version=22.0
+version=21.82
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -13,7 +13,7 @@ maintainer="meator <meator.dev@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/openSUSE/hwinfo"
distfiles="https://github.com/openSUSE/hwinfo/archive/refs/tags/${version}.tar.gz"
-checksum=7ba4042f492e2337b6f18782737f6a5238841352d69457b128cbaf0e40ef2a6e
+checksum=b031dba3ad79676c11d7478ce3123a3551e6abf4b2262f0cc903d1bfedb8d4ee
disable_parallel_build=yes
if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index 56fc82e44277..aafe21aa9aa5 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,18 +1,17 @@
# Template file for 'libnvme'
pkgname=libnvme
-version=1.1
+version=1.0
revision=1
build_style=meson
configure_args="-Ddocs=man"
hostmakedepends="pkg-config swig"
makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
-checkdepends="perl"
short_desc="C Library for NVM Express on Linux"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/linux-nvme/libnvme"
distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=d000181356513733671409c747c88826155b60f45f76e7289d6bbf27a8f851b0
+checksum=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807
libnvme-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/luarocks-lua53/template b/srcpkgs/luarocks-lua53/template
index a925d7ddd64d..9ab25a87f5ec 100644
--- a/srcpkgs/luarocks-lua53/template
+++ b/srcpkgs/luarocks-lua53/template
@@ -1,6 +1,6 @@
# Template file for 'luarocks-lua53'
pkgname=luarocks-lua53
-version=3.9.1
+version=3.7.0
revision=1
wrksrc=luarocks-${version}
build_style=configure
@@ -17,9 +17,8 @@ short_desc="${_desc} (5.3.x)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://luarocks.org/"
-changelog="https://github.com/luarocks/luarocks/wiki/Release-history"
distfiles="https://luarocks.org/releases/luarocks-${version}.tar.gz"
-checksum=ffafd83b1c42aa38042166a59ac3b618c838ce4e63f4ace9d961a5679ef58253
+checksum=9255d97fee95cec5b54fc6ac718b11bf5029e45bed7873e053314919cd448551
alternatives="
luarocks:luarocks:/usr/bin/luarocks-5.3
luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.3"
diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index afae462569a2..4e495f3f5a20 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
# Template file for 'mcelog'
pkgname=mcelog
-version=185
+version=184
revision=1
archs="i686* x86_64*"
hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://www.mcelog.org/"
distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=594adaf9395e630de9c963350729b2c4f6354022aeac309c5aebdf57c4ff138b
+checksum=067d52006f0aa42045acc6d9c04d590362448bacd8ef415d42729e6f35825028
do_build() {
make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}
diff --git a/srcpkgs/mumble/files/mumble-server/log/run b/srcpkgs/mumble/files/mumble-server/log/run
deleted file mode 100644
index 6b01a89f5be9..000000000000
--- a/srcpkgs/mumble/files/mumble-server/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t murmur
diff --git a/srcpkgs/mumble/files/mumble-server/run b/srcpkgs/mumble/files/mumble-server/run
deleted file mode 100644
index ee17d0d1ed0d..000000000000
--- a/srcpkgs/mumble/files/mumble-server/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-[ -r ./conf ] && . ./conf
-exec chpst -u_murmur:_murmur mumble-server -fg -ini ${CONFIG_FILE:-/etc/murmur.ini} ${OPTS}
diff --git a/srcpkgs/mumble/patches/config.patch b/srcpkgs/mumble/patches/config.patch
deleted file mode 100644
index f85e1f1cefa8..000000000000
--- a/srcpkgs/mumble/patches/config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/murmur.ini
-+++ b/scripts/murmur.ini
-@@ -13,7 +13,7 @@
-
- ; Path to database. If blank, will search for
- ; murmur.sqlite in default locations or create it if not found.
--database=
-+database=/var/lib/murmur/murmur.sqlite
-
- ; Murmur defaults to using SQLite with its default rollback journal.
- ; In some situations, using SQLite's write-ahead log (WAL) can be
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 65f96a90f282..2d67fdfcac1d 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -29,25 +29,18 @@ build_options_default="jack portaudio"
export CMAKE_GENERATOR="Unix Makefiles"
post_install() {
- rm -f ${DESTDIR}/usr/share/man/man1/murmur-user-wrapper.1
- vconf scripts/murmur.ini
- vsv mumble-server
- ln -sf murmurd.1 ${DESTDIR}/usr/share/man/man1/mumble-server.1
+ vbin ${wrksrc}/scripts/murmur-user-wrapper
+ vsconf scripts/murmur.ini
vlicense LICENSE
}
murmur_package() {
- system_accounts="_murmur"
- _murmur_homedir="/var/lib/murmur"
- make_dirs="/var/lib/murmur 0750 _murmur _murmur"
- conf_files="/etc/murmur.ini"
- depends="qt5-plugin-sqlite"
short_desc+=" - Server software (mumble-server)"
pkg_install() {
- vmove etc/sv/mumble-server
- vmove etc/murmur.ini
vmove usr/bin/mumble-server
- vmove usr/share/man/man1/mumble-server.1
+ vmove usr/bin/murmur-user-wrapper
+ vmove usr/share/man/man1/murmur-user-wrapper.1
vmove usr/share/man/man1/murmurd.1
+ vmove usr/share/examples/mumble/murmur.ini
}
}
diff --git a/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
new file mode 100644
index 000000000000..ce7c74779e85
--- /dev/null
+++ b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
@@ -0,0 +1,21 @@
+This ensures that efficient capability checks are used on musl.
+
+--- a/fat-ppc.c
++++ b/fat-ppc.c
+@@ -42,12 +42,10 @@
+
+ #if defined(_AIX)
+ # include <sys/systemcfg.h>
+-#elif defined(__linux__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-# define USE_GETAUXVAL 1
+-# include <asm/cputable.h>
+-# include <sys/auxv.h>
+-# endif
++#elif defined(__linux__)
++# define USE_GETAUXVAL 1
++# include <asm/cputable.h>
++# include <sys/auxv.h>
+ #elif defined(__FreeBSD__)
+ # include <machine/cpu.h>
+ # ifdef PPC_FEATURE2_HAS_VEC_CRYPTO
diff --git a/srcpkgs/nettle/patches/ppc64-elfv2.patch b/srcpkgs/nettle/patches/ppc64-elfv2.patch
new file mode 100644
index 000000000000..22f76582e0e1
--- /dev/null
+++ b/srcpkgs/nettle/patches/ppc64-elfv2.patch
@@ -0,0 +1,22 @@
+Ensure that ELFv2 ABI is used on all ppc64, including big endian.
+
+--- a/powerpc64/machine.m4
++++ b/powerpc64/machine.m4
+@@ -1,7 +1,7 @@
+ define(`PROLOGUE',
+ `.globl C_NAME($1)
+ DECLARE_FUNC(C_NAME($1))
+-ifelse(WORDS_BIGENDIAN,no,
++ifelse(`no',`no',
+ `ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ C_NAME($1):
+ addis 2,12,(.TOC.-C_NAME($1))@ha
+@@ -17,7 +17,7 @@ ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ undefine(`FUNC_ALIGN')')
+
+ define(`EPILOGUE',
+-`ifelse(WORDS_BIGENDIAN,no,
++`ifelse(`no',`no',
+ `.size C_NAME($1), . - C_NAME($1)',
+ `.size .C_NAME($1), . - .C_NAME($1)
+ .size C_NAME($1), . - .C_NAME($1)')')
diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template
index 26b926bf9cbe..25eca0dcab04 100644
--- a/srcpkgs/nettle/template
+++ b/srcpkgs/nettle/template
@@ -1,6 +1,6 @@
# Template file for 'nettle'
pkgname=nettle
-version=3.8
+version=3.7.3
revision=1
build_style=gnu-configure
configure_args="--enable-shared"
@@ -10,9 +10,8 @@ short_desc="Low-level cryptographic library"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://www.lysator.liu.se/~nisse/nettle/"
-changelog="https://git.lysator.liu.se/nettle/nettle/-/raw/master/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7576c68481c198f644b08c160d1a4850ba9449e308069455b5213319f234e8e6
+checksum=661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0
nettle-devel_package() {
depends="gmp-devel ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index 89175e29a449..c58b411bcdab 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -1,33 +1,36 @@
# Template file for 'nilfs-utils'
pkgname=nilfs-utils
-version=2.2.9
+version=2.2.8
revision=1
build_style=gnu-configure
-configure_args="--without-selinux"
+configure_args="--sbindir=/usr/bin --enable-libmount"
make_install_args="sbindir=/usr/bin"
-makedepends="libblkid-devel libmount-devel libuuid-devel"
+hostmakedepends="automake libtool"
+makedepends="libuuid-devel libmount-devel"
conf_files="/etc/nilfs_cleanerd.conf"
short_desc="Log-structured file system for Linux - userspace utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
-homepage="https://nilfs.sourceforge.io/"
-distfiles="https://nilfs.sourceforge.io/download/${pkgname}-${version}.tar.bz2"
-checksum=5df63998c2084182c8c608a29b47b1771b825b4b5fa7916c12cca2fcb7577a97
+homepage="http://nilfs.sourceforge.net/"
+distfiles="http://nilfs.sourceforge.net/download/$pkgname-$version.tar.bz2"
+checksum=5a29f8f59db03edf8dd1e68dfd80ff4713e0aa184cfa83a6326ac8af93d9bda6
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin/
}
libnilfs_package() {
- short_desc="${short_desc/utils/libraries}"
+ short_desc="NILFS userspace runtime libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
}
}
-
nilfs-utils-devel_package() {
depends="${makedepends} libnilfs>=${version}_${revision}"
- short_desc="${short_desc/utils/development files}"
+ short_desc="NILFS userspace development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index f45eae77b031..d85963d3f6c6 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
# Template file for 'nspr'
pkgname=nspr
-version=4.34.1
+version=4.34
revision=1
build_wrksrc=nspr
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="http://www.mozilla.org/projects/nspr/"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=c5b8354c48b632b8f4c1970628146c0e0c0ca8f32c7315d7d5736c002e03774f
+checksum=beef011cd15d8f40794984d17014366513cec5719bf1a78f5e8a3e3a1cebf99c
CFLAGS="-D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
diff --git a/srcpkgs/nvme-cli/patches/musl.patch b/srcpkgs/nvme-cli/patches/musl.patch
new file mode 100644
index 000000000000..4ebfba11d38f
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/musl.patch
@@ -0,0 +1,18 @@
+commit ddf3610e8326d014360c9550d54a73f97b40e862
+Author: q66 <daniel@octaforge.org>
+Date: Wed Apr 27 04:20:41 2022 +0200
+
+ fix build on musl
+
+diff --git a/util/base64.c b/util/base64.c
+index e386c11..dad4492 100644
+--- a/util/base64.c
++++ b/util/base64.c
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <sys/types.h>
+
+ static const char base64_table[65] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index fb64fece0644..d4e7bc892403 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
# Template file for 'nvme-cli'
pkgname=nvme-cli
-version=2.1.1
+version=2.0
revision=1
build_style=meson
configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -11,7 +11,7 @@ maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-2.0-only"
homepage="http://nvmexpress.org"
distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=cc8bd36b9aa71243e2bace238aa5505244fef3fef5418b0c61f75d1988458272
+checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
conf_files="/etc/nvme/*.conf"
if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
diff --git a/srcpkgs/perl-Sub-HandlesVia/template b/srcpkgs/perl-Sub-HandlesVia/template
index c76976791ab3..adb6d69553b2 100644
--- a/srcpkgs/perl-Sub-HandlesVia/template
+++ b/srcpkgs/perl-Sub-HandlesVia/template
@@ -1,6 +1,6 @@
# Template file for 'perl-Sub-HandlesVia'
pkgname=perl-Sub-HandlesVia
-version=0.034
+version=0.033
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Sub-HandlesVia"
distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
-checksum=7c6865f664782af1418ef1a0c112901e331f166f9a9550104d9d32a84ac80515
+checksum=b003821f30007dad977d7a8a93ae27d5563a746f955a8471a6d004447678198d
diff --git a/srcpkgs/python3-cached-property/template b/srcpkgs/python3-cached-property/template
index 6978a26349e7..7d088f3cd023 100644
--- a/srcpkgs/python3-cached-property/template
+++ b/srcpkgs/python3-cached-property/template
@@ -1,7 +1,7 @@
# Template file for 'python3-cached-property'
pkgname=python3-cached-property
-version=1.5.2
-revision=1
+version=1.5.1
+revision=5
wrksrc="cached-property-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,9 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/pydanny/cached-property"
distfiles="${PYPI_SITE}/c/cached-property/cached-property-${version}.tar.gz"
-checksum=9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130
-# upstream testcode use @coroutine
-make_check=no
+checksum=9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index ce3721e75092..f5593aa78c6b 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
# Template file for 'python3-virtualenv'
pkgname=python3-virtualenv
-version=20.16.3
+version=20.15.1
revision=1
wrksrc="virtualenv-${version}"
build_style=python3-module
@@ -8,18 +8,18 @@ hostmakedepends="python3-setuptools_scm"
depends="python3-setuptools python3-platformdirs python3-distlib python3-filelock python3-six"
checkdepends="python3-pytest-mock python3-flaky python3-devel python3-pip $depends"
short_desc="Virtual Python environment builder"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="MIT"
homepage="https://virtualenv.pypa.io/"
changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=d86ea0bb50e06252d79e6c241507cb904fcd66090c3271381372d6221a3970f9
+checksum=288171134a2ff3bfb1a2f54f119e77cd1b81c29fc1265a2356f3e8d14c7d58c4
alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
do_check() {
- # excluded tests depend on pytest-freezegun, not packaged in Void, or python2
+ # excluded tests depend on pytest-freezegun, not packaged in Void
vsed -e '/addopts/d' -i setup.cfg
- PYTHONPATH=src python3 -m pytest -k 'not (test_periodic_update or test_get_wheel_download_cached or test_py_pyc_missing)'
+ PYTHONPATH=src python3 -m pytest -k 'not (test_periodic_update or test_get_wheel_download_cached)'
}
post_install() {
diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index bae644840887..f89a4cd5ad5c 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
configure_args="$(vopt_with gtk3)"
hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel)
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="Multi-panel tabbed file manager"
diff --git a/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch b/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
deleted file mode 100644
index d048d1238d6e..000000000000
--- a/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: FreeBSD
---- a/gfx/webrender_bindings/webrender_ffi.h.orig 2022-05-23 17:12:36 UTC
-+++ b/gfx/webrender_bindings/webrender_ffi.h
-@@ -77,8 +77,6 @@ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpo
- struct WrPipelineIdAndEpoch;
- using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
-
--const uint64_t ROOT_CLIP_CHAIN = ~0;
--
- } // namespace wr
- } // namespace mozilla
-
diff --git a/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch b/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
deleted file mode 100644
index 6af2f0266a2f..000000000000
--- a/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/subprojects/appmenu-gtk-module/meson_options.txt
-+++ b/subprojects/appmenu-gtk-module/meson_options.txt
-@@ -1,3 +1,3 @@
--option('gtk', type: 'array', choices : ['2','3'], value: ['2','3'], description: 'Supported GTK versions')
-+option('gtk', type: 'array', choices : ['2','3'], value: ['3'], description: 'Supported GTK versions')
- option('tests', type : 'boolean', value : false, description: 'Parser tests')
- option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference')
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index a564cd99f232..6a9e874d1723 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -7,7 +7,7 @@ _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
build_style=meson
configure_args="-Dprint_trace=false"
hostmakedepends="pkg-config wayland-devel"
-makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel
+makedepends="wf-config-devel wlroots-devel cairo-devel
$(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
depends="xorg-server-xwayland"
short_desc="3D wayland compositor"
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index b517c10c98ca..4eb882a6c22e 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -11,8 +11,7 @@ makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel
pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel
poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel
libinput-devel libxcb-devel libXcursor-devel colord-devel dbus-devel
- $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel)
- libevdev-devel"
+ $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel)"
short_desc="Reference implementation of a Wayland compositor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/xarchiver/patches/doubleclick.patch b/srcpkgs/xarchiver/patches/doubleclick.patch
deleted file mode 100644
index aaac2c6b16e0..000000000000
--- a/srcpkgs/xarchiver/patches/doubleclick.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From f245d8714690af30064a2e5ec94bd2374288c2b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
-Date: Sat, 2 Jul 2022 23:47:36 +0200
-Subject: [PATCH 1/2] Simplify code
-
-The state of the modifier keys is available in event->state.
----
- src/window.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/window.c b/src/window.c
-index 1ec0e02c..e9760386 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -2620,11 +2620,7 @@ gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *even
-
- if (event->button == 1)
- {
-- GdkModifierType state;
--
-- gdk_event_get_state((GdkEvent *) event, &state);
--
-- if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
-+ if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
- return TRUE;
- else
- return FALSE;
-
-From 5d18fd23e8242678dbe47c232bc60b47f8fd75b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
-Date: Sat, 2 Jul 2022 23:51:40 +0200
-Subject: [PATCH 2/2] Re-enable left mouse button double clicks
-
-Check the time between two left mouse button clicks and if they are
-fast enough, fake a double-click event.
-
-Left mouse button double clicks have been unintentionally disabled by
-the change in commit e81d108c429e29b13ef1759c05033a6f3c645ac1 in order
-to allow dragging of multiple rows.
-
-This fixes github issue #148, reported by aianson.
----
- src/window.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/window.c b/src/window.c
-index e9760386..b9591aed 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -2597,6 +2597,7 @@ void xa_location_entry_activated (GtkEntry *entry,gpointer user_data)
-
- gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *event, XArchive *archive)
- {
-+ static guint32 last_button1;
- XEntry *entry;
- GtkTreePath *path;
- GtkTreeIter iter;
-@@ -2620,10 +2621,17 @@ gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *even
-
- if (event->button == 1)
- {
-+ if (event->time - last_button1 > 250)
-+ {
-+ last_button1 = event->time;
-+
- if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
- return TRUE;
- else
- return FALSE;
-+ }
-+ else
-+ event->button = 2;
- }
-
- if (!gtk_tree_selection_iter_is_selected(selection, &iter))
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index c0403f69ac47..56c781bea0dd 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,7 +1,7 @@
# Template file for 'xarchiver'
pkgname=xarchiver
version=0.5.4.18
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-doc --enable-gtk2=no"
hostmakedepends="pkg-config intltool"
diff --git a/srcpkgs/xournal b/srcpkgs/xournal
deleted file mode 120000
index f050a0a34269..000000000000
--- a/srcpkgs/xournal
+++ /dev/null
@@ -1 +0,0 @@
-xournalpp
\ No newline at end of file
diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
new file mode 100644
index 000000000000..36f11cead862
--- /dev/null
+++ b/srcpkgs/xournal/template
@@ -0,0 +1,22 @@
+# Template file for 'xournal'
+pkgname=xournal
+version=0.4.8.2016
+revision=4
+build_style=gnu-configure
+make_install_args="desktop-install"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
+depends="hicolor-icon-theme desktop-file-utils ghostscript"
+short_desc="GPL Notetaking, sketching, and journal-keeping"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://xournal.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+ vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+ vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+ po/Makefile.in.in
+}
diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 769d103e6459..e235dcfe40fb 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
# Template file for 'xournalpp'
pkgname=xournalpp
version=1.1.1
-revision=2
+revision=1
build_style=cmake
hostmakedepends="pkg-config gettext"
makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel
@@ -21,9 +21,3 @@ fi
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" libexecinfo-devel";;
esac
-
-xournal_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
diff --git a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch b/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
deleted file mode 100644
index 53b76fe358cb..000000000000
--- a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-from https://gitlab.alpinelinux.org/alpine/aports/-/commit/5c2d1886fdead7c00a00ddcd5d04aaa8d1f53377
---- a/zathura-pdf-mupdf/search.c
-+++ b/zathura-pdf-mupdf/search.c
-@@ -41,7 +41,7 @@
-
- fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad);
- int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
-- text, hit_bbox, N_SEARCH_RESULTS);
-+ text, NULL, hit_bbox, N_SEARCH_RESULTS);
-
- fz_rect r;
- for (int i = 0; i < num_results; i++) {
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (16 preceding siblings ...)
2022-08-10 7:27 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-08-10 7:33 ` ajtcode71
2022-08-10 7:59 ` ajtcode71
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-10 7:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 88844 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/6] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/6] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/6] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
From f2937c2eb6cf5411f8c27b8888c8eeb37e3918f5 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:31:35 +1000
Subject: [PATCH 4/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit abf0389c6b7e1a28bb8a9af056b26dc6675f9881.
---
srcpkgs/cloudflared/template | 1 -
srcpkgs/opendht/template | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index b31cf78f4c53..3cb6912ffda9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -13,7 +13,6 @@ homepage="https://developers.cloudflare.com/argo-tunnel/"
changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
checksum=3a822faaed7ae90be5ba4920f9226cd85367402d2c5a2bf2f0732c37cad6599d
-broken="vendor/github.com/lucas-clemente/quic-go/internal/qtls/go119.go: can't be built on Go 1.19 yet"
pre_build() {
go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index 5b8c520eaa84..6b9f70d6b281 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
-version=2.4.9
-revision=1
+version=2.4.4
+revision=2
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
@@ -11,8 +11,8 @@ short_desc="Distributed Hash Table implementation"
maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-3.0-or-later"
homepage="https://github.com/savoirfairelinux/opendht"
-distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/v${version}.tar.gz"
-checksum=ede4a0adee7e5d98d9681cfd2bab83421b153afcdb5efa1a925986a0a3a0ac8a
+distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz"
+checksum=a4b452423f9a55f3c53ceaeeb43ec50f2747fdc89a546caa74cd79b93b6ede08
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 81646da46d71124d21f471f8fdd33dff3df4f032 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Wed, 10 Aug 2022 08:57:24 +1000
Subject: [PATCH 5/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit 28c098573def8000345bf6eb5e623be893c93a37.
---
common/build-style/cmake.sh | 4 ---
common/shlibs | 10 +++----
srcpkgs/alarm-clock/template | 19 ++++++++++++
srcpkgs/bluebird-themes/template | 2 +-
srcpkgs/claws-mail/template | 4 +--
srcpkgs/cloudflared/template | 19 ------------
srcpkgs/dbus-elogind/template | 8 ++---
srcpkgs/dbus/template | 8 ++---
srcpkgs/foot/template | 4 +--
srcpkgs/freetype/template | 4 +--
srcpkgs/fzf/template | 4 +--
srcpkgs/gnutls/template | 4 +--
srcpkgs/gogglesmm/template | 3 +-
srcpkgs/gsimplecal-gtk2 | 1 -
srcpkgs/gsimplecal-gtk2/patches/musl.patch | 19 ++++++++++++
srcpkgs/gsimplecal-gtk2/template | 25 ++++++++++++++++
srcpkgs/gsimplecal-gtk3/patches | 1 +
srcpkgs/gsimplecal-gtk3/template | 17 ++++-------
.../harfbuzz/patches/fix-char-signed.patch | 29 -------------------
srcpkgs/harfbuzz/template | 5 ++--
srcpkgs/hatari/template | 2 +-
srcpkgs/hunspell-pl_PL/template | 4 +--
srcpkgs/kismet/template | 6 ++--
srcpkgs/ksh/template | 4 +--
srcpkgs/lighttpd/template | 4 +--
srcpkgs/mate-settings-daemon/template | 3 +-
srcpkgs/mpop/template | 4 +--
srcpkgs/msmtp/template | 4 +--
srcpkgs/mutt/template | 6 ++--
srcpkgs/okteta/template | 4 +--
srcpkgs/openblas/template | 4 +--
srcpkgs/openjdk8/template | 2 +-
srcpkgs/qtcreator/template | 11 ++-----
srcpkgs/removed-packages/template | 1 -
srcpkgs/rsync/template | 7 ++---
srcpkgs/sc3-plugins/template | 2 +-
srcpkgs/tgt/template | 4 +--
srcpkgs/zlib/patches/2-CVE-2022-37434.patch | 29 -------------------
...-2022-37434.patch => CVE-2022-37434.patch} | 0
srcpkgs/zlib/template | 2 +-
40 files changed, 133 insertions(+), 160 deletions(-)
create mode 100644 srcpkgs/alarm-clock/template
delete mode 100644 srcpkgs/cloudflared/template
delete mode 120000 srcpkgs/gsimplecal-gtk2
create mode 100644 srcpkgs/gsimplecal-gtk2/patches/musl.patch
create mode 100644 srcpkgs/gsimplecal-gtk2/template
create mode 120000 srcpkgs/gsimplecal-gtk3/patches
delete mode 100644 srcpkgs/harfbuzz/patches/fix-char-signed.patch
delete mode 100644 srcpkgs/zlib/patches/2-CVE-2022-37434.patch
rename srcpkgs/zlib/patches/{1-CVE-2022-37434.patch => CVE-2022-37434.patch} (100%)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index e1efd9cc6586..711fcea6273d 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,10 +54,6 @@ _EOF
cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
cmake_args+=" -DCMAKE_BUILD_TYPE=None"
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
- cmake_args+=" -DQT_HOST_PATH=/usr"
- # QT_HOST_PATH isn't enough in my system,
- # which have binfmts support on and off
- cmake_args+=" -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/cmake"
if [[ $build_helper = *"qemu"* ]]; then
echo "SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)" \
diff --git a/common/shlibs b/common/shlibs
index ea6fde4ffe31..326943713f07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -105,7 +105,7 @@ libgtk-x11-2.0.so.0 gtk+-2.16.0_1
libgdk_pixbuf-2.0.so.0 gdk-pixbuf-2.22.0_1
libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-xlib-2.30.8_1
libgailutil.so.18 gtk+-2.16.0_1
-libfreetype.so.6 freetype-2.12.1_1
+libfreetype.so.6 freetype-2.3.9_1
libfontconfig.so.1 fontconfig-2.6.0_1
libX11-xcb.so.1 libX11-1.2_1
libX11.so.6 libX11-1.2_1
@@ -1153,10 +1153,10 @@ librygel-renderer-gst-2.6.so.2 librygel-0.26.0_1
librygel-ruih-2.0.so.1 librygel-0.26.0_1
librygel-server-2.6.so.2 librygel-0.26.0_1
librygel-db-2.6.so.2 librygel-0.28.0_1
-libharfbuzz.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-icu.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-subset.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-gobject.so.0 libharfbuzz-5.1.0_1
+libharfbuzz.so.0 libharfbuzz-0.9.4_1
+libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
+libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
+libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
libosinfo-1.0.so.0 libosinfo-0.2.0_1
libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
diff --git a/srcpkgs/alarm-clock/template b/srcpkgs/alarm-clock/template
new file mode 100644
index 000000000000..8c2fd84b812d
--- /dev/null
+++ b/srcpkgs/alarm-clock/template
@@ -0,0 +1,19 @@
+# Template file for 'alarm-clock'
+pkgname=alarm-clock
+version=1.4.9
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake gettext-devel glib-devel libtool intltool pkg-config"
+makedepends="gstreamer1-devel gtk+-devel libnotify-devel libunique1-devel"
+maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Simple GTK2 alarm clock for your desktop"
+homepage="https://github.com/shaggytwodope/alarm-clock"
+license="GPL-3.0-or-later"
+distfiles="https://github.com/shaggytwodope/alarm-clock/archive/v${version}.tar.gz"
+checksum=3724a42801befaee631d249edd8b15318bb72ae5f9db918c25de513f4c3f4538
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
diff --git a/srcpkgs/bluebird-themes/template b/srcpkgs/bluebird-themes/template
index 65f66d6da3ba..a9f4e852df12 100644
--- a/srcpkgs/bluebird-themes/template
+++ b/srcpkgs/bluebird-themes/template
@@ -4,7 +4,7 @@ version=1.3
revision=3
wrksrc=Bluebird-$version
build_style=gnu-configure
-hostmakedepends="sassc which glib-devel automake gdk-pixbuf tar librsvg"
+hostmakedepends="sassc which glib-devel automake gdk-pixbuf tar librsvg-utils"
short_desc="Elegant blue GTK2/3/Metacity/Xfwm theme"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
license="GPL-2.0-or-later"
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 7f7de90b5f05..118b7d607108 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,11 +1,11 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.0
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
-hostmakedepends="pkg-config automake libtool gettext-devel"
+hostmakedepends="pkg-config python-devel automake libtool gettext-devel"
makedepends="poppler-glib-devel libarchive-devel libSM-devel
libnotify-devel libcanberra-devel gpgme-devel gnutls-devel
enchant2-devel dbus-devel libetpan-devel libldap-devel
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
deleted file mode 100644
index 3cb6912ffda9..000000000000
--- a/srcpkgs/cloudflared/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'cloudflared'
-pkgname=cloudflared
-version=2022.7.1
-revision=1
-build_style=go
-go_import_path=github.com/cloudflare/cloudflared
-go_package="${go_import_path}/cmd/cloudflared"
-go_ldflags="-X \"main.Version=${version}\""
-short_desc="Cloudflare Tunnel client"
-maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
-license="Apache-2.0"
-homepage="https://developers.cloudflare.com/argo-tunnel/"
-changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
-distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
-checksum=3a822faaed7ae90be5ba4920f9226cd85367402d2c5a2bf2f0732c37cad6599d
-
-pre_build() {
- go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
-}
diff --git a/srcpkgs/dbus-elogind/template b/srcpkgs/dbus-elogind/template
index 61a6040d200d..7e92ccf7cd2b 100644
--- a/srcpkgs/dbus-elogind/template
+++ b/srcpkgs/dbus-elogind/template
@@ -1,7 +1,7 @@
# Template file for 'dbus-elogind'
# NOTE: keep this pkg synchronized with dbus
pkgname=dbus-elogind
-version=1.14.0
+version=1.12.20
revision=1
wrksrc="dbus-${version}"
build_style=gnu-configure
@@ -18,9 +18,9 @@ short_desc="Message bus system (built with elogind support)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
-changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
-distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
+distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
+checksum=f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
conf_files="/etc/dbus-1/*.conf"
replaces="dbus>=0"
provides="dbus-${version}_${revision}"
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aa6b118f52ae..09dd3296c8a6 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
# Template file for 'dbus'
# NOTE: keep this pkg synchronized with dbus-elogind
pkgname=dbus
-version=1.14.0
+version=1.12.20
revision=1
build_style=gnu-configure
configure_args="--disable-selinux --enable-inotify --with-dbus-user=dbus
@@ -15,9 +15,9 @@ short_desc="Message bus system"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
-changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
-distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
+distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
+checksum=f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
python_version=3
conf_files="/etc/dbus-1/*.conf"
diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index a21aba144cb6..d139879a5399 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
# Template file for 'foot'
pkgname=foot
-version=1.13.0
+version=1.12.1
revision=1
wrksrc=$pkgname
build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
homepage="https://codeberg.org/dnkl/foot"
changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9fd10584d40f6aac6b87c11a94e1fdfc4bac43aef9144f4aa84213257672da8c
+checksum=14e307ac89454b682bb9f1bc644043779f4462df656034fcc4c1e72b18fbffdd
conf_files="/etc/xdg/foot/foot.ini"
post_install() {
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 72549c71bd7e..75abb71ceaa2 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,11 +1,11 @@
# Template file for 'freetype'
pkgname=freetype
version=2.12.1
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel libpng-devel brotli-devel"
+makedepends="bzip2-devel libpng-devel"
short_desc="Font rendering engine and library API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, FTL"
diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 71e7b17e21d6..7e9383e3f341 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
# Template file for 'fzf'
pkgname=fzf
-version=0.32.1
+version=0.32.0
revision=1
build_style=go
go_import_path="github.com/junegunn/fzf"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/junegunn/fzf"
changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=c7afef61553b3b3e4e02819c5d560fa4acf33ecb39829aeba392c2e05457ca6a
+checksum=3502c15faeb0a6d553c68ab1a7f472af08afed94a1d016427a8ab053ef149a8f
post_install() {
cd ${wrksrc}
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index d8ea09e85f42..228bd0334166 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
# Template file for 'gnutls'
pkgname=gnutls
-version=3.7.7
+version=3.7.6
revision=1
build_style=gnu-configure
configure_args="--disable-guile --disable-static
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only, LGPL-2.1-or-later"
homepage="https://gnutls.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106
+checksum=77065719a345bfb18faa250134be4c53bef70c1bd61f6c0c23ceb8b44f0262ff
pre_check() {
# same as $PASS in tests/cert-tests/certtool.sh
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index b95341dfe54f..29579786726d 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -10,11 +10,12 @@ makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-dev
faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
depends="hicolor-icon-theme"
short_desc="Music Manager and Player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2 #unverified
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gsimplecal-gtk2 b/srcpkgs/gsimplecal-gtk2
deleted file mode 120000
index bd547b0783c2..000000000000
--- a/srcpkgs/gsimplecal-gtk2
+++ /dev/null
@@ -1 +0,0 @@
-gsimplecal-gtk3
\ No newline at end of file
diff --git a/srcpkgs/gsimplecal-gtk2/patches/musl.patch b/srcpkgs/gsimplecal-gtk2/patches/musl.patch
new file mode 100644
index 000000000000..eef2a786bb73
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk2/patches/musl.patch
@@ -0,0 +1,19 @@
+--- a/src/Unique.cpp.orig 2016-04-24 08:08:43.921536576 +0200
++++ b/src/Unique.cpp 2016-04-24 08:09:18.615896283 +0200
+@@ -1,10 +1,16 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <limits.h>
+ #include <signal.h>
+ #include <sys/sem.h>
++#ifdef HAVE_SYSCTL_H
+ #include <sys/sysctl.h>
++#endif
+ #include <sys/types.h>
+
+ #include "Unique.hpp"
diff --git a/srcpkgs/gsimplecal-gtk2/template b/srcpkgs/gsimplecal-gtk2/template
new file mode 100644
index 000000000000..73cf3bd39b88
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk2/template
@@ -0,0 +1,25 @@
+# Template file for 'gsimplecal-gtk2'
+pkgname=gsimplecal-gtk2
+version=2.1
+revision=4
+wrksrc="${pkgname%-*}-${version}"
+build_style=gnu-configure
+configure_args="--enable-gtk2"
+hostmakedepends="automake pkg-config"
+makedepends="gtk+-devel"
+short_desc="Simple and lightweight GTK calendar"
+maintainer="Jarbowski <jarbowski@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://dmedvinsky.github.io/gsimplecal/"
+distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
+checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
+
+replaces="gsimplecal-gtk3>=0"
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_install() {
+ vlicense COPYING
+}
diff --git a/srcpkgs/gsimplecal-gtk3/patches b/srcpkgs/gsimplecal-gtk3/patches
new file mode 120000
index 000000000000..7ee8024d19bb
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk3/patches
@@ -0,0 +1 @@
+../gsimplecal-gtk2/patches
\ No newline at end of file
diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template
index 21c75517bdb8..52acc624d51c 100644
--- a/srcpkgs/gsimplecal-gtk3/template
+++ b/srcpkgs/gsimplecal-gtk3/template
@@ -1,18 +1,19 @@
# Template file for 'gsimplecal-gtk3'
pkgname=gsimplecal-gtk3
-version=2.4.1
-revision=1
+version=2.1
+revision=4
wrksrc="${pkgname%-*}-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="gtk+3-devel"
short_desc="Simple and lightweight GTK calendar"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Jarbowski <jarbowski@gmail.com>"
license="BSD-3-Clause"
homepage="http://dmedvinsky.github.io/gsimplecal/"
-changelog="https://github.com/dmedvinsky/gsimplecal/raw/master/ChangeLog"
distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum=fd47df49ec26115bd6022d0e6a24648873c619e0406375d807fb18428d07d000
+checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
+
+replaces="gsimplecal-gtk2>=0"
pre_configure() {
./autogen.sh
@@ -21,9 +22,3 @@ pre_configure() {
post_install() {
vlicense COPYING
}
-
-gsimplecal-gtk2_package() {
- build_style=meta
- depends="gsimplecal-gtk3>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/harfbuzz/patches/fix-char-signed.patch b/srcpkgs/harfbuzz/patches/fix-char-signed.patch
deleted file mode 100644
index affcbc57dc55..000000000000
--- a/srcpkgs/harfbuzz/patches/fix-char-signed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/harfbuzz/harfbuzz/pull/3771
-From 81fe35159e4fdc5ca2c9436cc9ad2750bda64203 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Mon, 1 Aug 2022 07:45:25 +0000
-Subject: [PATCH] [repacker] fix signedness of char in tests
-
----
- src/test-repacker.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test-repacker.cc b/src/test-repacker.cc
-index 053c0c603..1b7e1f08b 100644
---- a/src/test-repacker.cc
-+++ b/src/test-repacker.cc
-@@ -112,9 +112,9 @@ static void start_lookup (int8_t type,
- hb_serialize_context_t* c)
- {
- char lookup[] = {
-- 0, type, // type
-+ 0, (char)type, // type
- 0, 0, // flag
-- 0, num_subtables, // num subtables
-+ 0, (char)num_subtables, // num subtables
- };
-
- start_object (lookup, 6, c);
---
-2.37.1
-
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 2fc515698f92..8e0947d775fb 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,7 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
-version=5.1.0
+reverts="5.1.0_1"
+version=4.4.1
revision=2
build_style=meson
build_helper="gir qemu"
@@ -14,7 +15,7 @@ license="MIT"
homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05
+checksum=c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee
libharfbuzz_package() {
short_desc+=" - runtime library"
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 4858805707ae..e05e77961d60 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config python3"
makedepends="SDL2-devel libpng-devel portaudio-devel zlib-devel"
depends="hicolor-icon-theme"
short_desc="Atari ST/STE/TT/Falcon emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index bfbcaae14013..db94240d6e7e 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
# Template file for 'hunspell-pl_PL'
pkgname=hunspell-pl_PL
-version=20220801
+version=20220501
revision=1
create_wrksrc=yes
short_desc="Polish dictionary for hunspell"
@@ -8,7 +8,7 @@ maintainer="m-cz <emcze@ya.ru>"
license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
homepage="https://sjp.pl/slownik/ort/"
distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=cc2874c7bf452255cbcd09d5083dd337f9c34daf2b6079bc97e398132a966424
+checksum=fd715b1facddfd680b8779f6f671a6763a0bf3b31f6e5909d52926ac27f7f1c7
post_extract() {
bsdtar -xf pl_PL.zip
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index aa14af915c45..3780e03f87a3 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
# Template file for 'kismet'
pkgname=kismet
-version=2022.08.R1
-revision=1
+version=2022.02.R1
+revision=4
_realver="${version//./-}"
wrksrc="${pkgname}-${_realver}"
build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://www.kismetwireless.net/"
distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz"
-checksum=2149cceac5526508653f4d02dcf7a694e3da3dc000a2372a1ee4bf9988279781
+checksum=aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8
system_groups="kismet"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 5f022424b7f0..be70d00c905b 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,7 +1,7 @@
# Template file for 'ksh'
pkgname=ksh
reverts="2020.0.0_1"
-version=1.0.2
+version=1.0.1
revision=1
wrksrc="ksh-${version}"
short_desc="AT&T's Korn shell (community branch ksh93u+m)"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="https://github.com/ksh93/ksh"
distfiles="https://github.com/ksh93/ksh/archive/v${version}.tar.gz"
-checksum=e62616caab07b2d090e9ad5e17f058d4b8b8f12b48f44017d9e5d6550dfd5c14
+checksum=4cbbee459df591426fea9e1705fa3200d168faf800451544d04fdb7013e33468
nocross=yes
register_shell="/bin/ksh"
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8a96ba55203d..6df12c8a5ed7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
# Template file for 'lighttpd'
pkgname=lighttpd
-version=1.4.66
+version=1.4.65
revision=1
build_style=meson
configure_args="-Dwith_brotli=false -Dwith_bzip=false
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://lighttpd.net"
distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=47ac6e60271aa0196e65472d02d019556dc7c6d09df3b65df2c1ab6866348e3b
+checksum=bf0fa68a629fbc404023a912b377e70049331d6797bcbb4b3e8df4c3b42328be
conf_files="/etc/lighttpd/lighttpd.conf"
system_accounts="_lighttpd"
diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template
index 43606ffbdc3c..b5db461e136b 100644
--- a/srcpkgs/mate-settings-daemon/template
+++ b/srcpkgs/mate-settings-daemon/template
@@ -1,13 +1,14 @@
# Template file for 'mate-settings-daemon'
pkgname=mate-settings-daemon
version=1.26.0
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse"
hostmakedepends="dbus-glib-devel glib-devel intltool itstool pkg-config polkit"
makedepends="dbus-glib-devel libXt-devel libXxf86misc-devel libcanberra-devel
libmatekbd-devel libmatemixer-devel libnotify-devel mate-desktop-devel nss-devel
polkit-devel"
+depends="alsa-plugins-pulseaudio"
short_desc="MATE Settings daemon (pulseaudio)"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index a718f7c06571..ba25741d8db8 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
# Template file for 'mpop'
pkgname=mpop
-version=1.4.17
+version=1.4.16
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/mpop/"
distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=42ae494bad2941d9f647c48c3ed98c38ba9aa5cf3fe48fb0fe06e5b6dadf8bd5
+checksum=870eb571eae6d23fb92ad0c84d79de9c38c5f624e3614937d574bfe49ba687f9
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 2664cd7cff9d..eb687ece82c7 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
# Template file for 'msmtp'
pkgname=msmtp
-version=1.8.22
+version=1.8.20
revision=1
build_style=gnu-configure
configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/msmtp/"
distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7
+checksum=d93ae2aafc0f48af7dc9d0b394df1bb800588b8b4e8d096d8b3cf225344eb111
build_options="idn sasl gnome msmtpd"
build_options_default="idn sasl msmtpd"
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e3b0218e4008..c237bab6699a 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
# Template file for 'mutt'
pkgname=mutt
-version=2.2.7
-revision=1
+version=2.2.6
+revision=2
build_style=gnu-configure
configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
--enable-gpgme --with-idn2 --with-ssl --without-sasl --with-gsasl
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="http://www.mutt.org"
changelog="http://mutt.org/relnotes/${version%.*}"
distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=eb13858f58bb369f477bf652d90e9b6aaddd0d610acbea3455049e5efad36df1
+checksum=ffa2d93517cfc606fe01daffc5f12e42062a1c134d3b9af78484ebc5430888d3
post_install() {
# provided by mime-types
diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template
index 9c5638e67cf2..7d3878ca031a 100644
--- a/srcpkgs/okteta/template
+++ b/srcpkgs/okteta/template
@@ -1,7 +1,7 @@
# Template file for 'okteta'
pkgname=okteta
reverts="4.14.3_1"
-version=0.26.9
+version=0.26.6
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://apps.kde.org/okteta/"
distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz"
-checksum=16854c4d4e94838219ae3115a42ba385fda5c87dc6c9865ac90d3774f8d05ffb
+checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c
okteta-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index a749863d1d4e..e308926c5abd 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,7 +1,7 @@
# Template file for 'openblas'
pkgname=openblas
reverts="0.3.19_1"
-version=0.3.21
+version=0.3.20
revision=1
wrksrc="OpenBLAS-${version}"
build_style=gnu-makefile
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
homepage="https://www.openblas.net/"
changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"
-checksum=f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca
+checksum=8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 5060224eaab8..ebf8aa2b56a6 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=2
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 0e4840d0e7f8..cdd49a872a6c 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
# Template file for 'qtcreator'
pkgname=qtcreator
-version=8.0.0
+version=7.0.2
revision=1
wrksrc="qt-creator-opensource-src-${version}"
build_style=cmake
@@ -16,9 +16,9 @@ short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
-changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changelog/changes-${version}.md"
+changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=323640f96c76d199fe5bf7b02cbf2dd1a3b6489ab7cc0adeaad3957d8dc96f17
+checksum=14dee285aa3aa56fb25ccbd7587382fb6cb05ae99a1a30237f0a0bbef3ceff7a
replaces="qtcreator-data>=0"
python_version=3
@@ -33,11 +33,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- CXXFLAGS+=" -latomic "
-fi
-
post_install() {
# Install the license with the annotation for
# the Qt Company GPL Exception 1.0
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30cb55c291fb..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -16,7 +16,6 @@ replaces="
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
- alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
appdata-tools<=0.1.8_2
diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 9563278c7b87..2f79c20f8f6b 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,11 +1,10 @@
# Template file for 'rsync'
pkgname=rsync
version=3.2.4
-revision=2
+revision=1
build_style=gnu-configure
-configure_args="--with-rrsync"
conf_files="/etc/rsyncd.conf"
-hostmakedepends="perl python3-commonmark"
+hostmakedepends="perl"
makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
openssl-devel libzstd-devel"
short_desc="Remote fast incremental file transfer tool"
@@ -20,7 +19,7 @@ checksum=6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1
CFLAGS="-DINET6"
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-simd"
+ configure_args=" --disable-simd"
fi
pre_check() {
diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template
index 45f54453e414..8511caea26e0 100644
--- a/srcpkgs/sc3-plugins/template
+++ b/srcpkgs/sc3-plugins/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
makedepends="fftw-devel libstk-devel"
depends="supercollider"
short_desc="Extension plugins for the SuperCollider3 audio synthesis server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-2.0-or-later"
homepage="https://github.com/supercollider/sc3-plugins"
distfiles="https://github.com/supercollider/sc3-plugins/archive/Version-${version}.tar.gz
diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index 72325672c896..316e126c922e 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
# Template file for 'tgt'
pkgname=tgt
-version=1.0.84
+version=1.0.83
revision=1
build_style=gnu-makefile
make_install_args="sbindir=/usr/bin"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://github.com/fujita/tgt"
distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=c5f5913fd5c4a1333590ad3ddcf80dd12592a5f773f3609619513dd583772486
+checksum=a9ddb0ff32d3396416df9639f9f398d14a6051f505b5772d7d196df99df8b8da
post_extract() {
sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
diff --git a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch b/srcpkgs/zlib/patches/2-CVE-2022-37434.patch
deleted file mode 100644
index c5c95a92b28a..000000000000
--- a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
-From: Mark Adler <fork@madler.net>
-Date: Mon, 8 Aug 2022 10:50:09 -0700
-Subject: [PATCH] Fix extra field processing bug that dereferences NULL
- state->head.
-
-The recent commit to fix a gzip header extra field processing bug
-introduced the new bug fixed here.
----
- inflate.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 7a7289749..2a3c4fe98 100644
---- a/inflate.c
-+++ b/inflate.c
-@@ -763,10 +763,10 @@ int flush;
- copy = state->length;
- if (copy > have) copy = have;
- if (copy) {
-- len = state->head->extra_len - state->length;
- if (state->head != Z_NULL &&
- state->head->extra != Z_NULL &&
-- len < state->head->extra_max) {
-+ (len = state->head->extra_len - state->length) <
-+ state->head->extra_max) {
- zmemcpy(state->head->extra + len, next,
- len + copy > state->head->extra_max ?
- state->head->extra_max - len : copy);
diff --git a/srcpkgs/zlib/patches/1-CVE-2022-37434.patch b/srcpkgs/zlib/patches/CVE-2022-37434.patch
similarity index 100%
rename from srcpkgs/zlib/patches/1-CVE-2022-37434.patch
rename to srcpkgs/zlib/patches/CVE-2022-37434.patch
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 17cf7ccaf9f4..b0ef4c68e35d 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
# Template file for 'zlib'
pkgname=zlib
version=1.2.12
-revision=4
+revision=3
bootstrap=yes
build_style=configure
configure_args="--prefix=/usr --shared"
From 82e19c04276852ac0cc15e9064d3a4894f9c3ec9 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Mon, 8 Aug 2022 17:07:23 +1000
Subject: [PATCH 6/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit 4bb64d1cec5444300b74dd3590fe132d28d05e10.
---
common/xbps-src/shutils/update_check.sh | 1 -
srcpkgs/PrusaSlicer/template | 32 ++--
srcpkgs/amtk/template | 24 ++-
srcpkgs/angband/template | 2 +-
srcpkgs/cargo-geiger/template | 5 +-
srcpkgs/freetype/template | 15 +-
srcpkgs/go/patches/fix-32bit-tests.patch | 13 --
srcpkgs/go/patches/fix-musl-tests.patch | 29 ----
srcpkgs/go/patches/fix-tests.patch | 150 ------------------
srcpkgs/go/template | 29 +---
srcpkgs/godot/template | 4 +-
srcpkgs/gpodder/template | 6 +-
srcpkgs/harfbuzz/template | 3 +-
srcpkgs/hatch/template | 6 +-
srcpkgs/hwinfo/template | 4 +-
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 ++
srcpkgs/libnvme/template | 5 +-
srcpkgs/luarocks-lua53/template | 5 +-
srcpkgs/mcelog/template | 4 +-
srcpkgs/mumble/files/mumble-server/log/run | 3 -
srcpkgs/mumble/files/mumble-server/run | 4 -
srcpkgs/mumble/patches/config.patch | 11 --
srcpkgs/mumble/template | 17 +-
.../nettle/patches/musl-ppc-use-auxval.patch | 21 +++
srcpkgs/nettle/patches/ppc64-elfv2.patch | 22 +++
srcpkgs/nettle/template | 5 +-
srcpkgs/nilfs-utils/template | 21 +--
srcpkgs/nspr/template | 4 +-
srcpkgs/nvme-cli/patches/musl.patch | 18 +++
srcpkgs/nvme-cli/template | 4 +-
srcpkgs/perl-Sub-HandlesVia/template | 4 +-
srcpkgs/python3-cached-property/template | 8 +-
srcpkgs/python3-virtualenv/template | 10 +-
srcpkgs/spacefm/template | 2 +-
.../thunderbird/patches/ROOT_CLIP_CHAIN.patch | 12 --
.../vala-panel-appmenu/patches/no-gtk2.patch | 7 -
srcpkgs/wayfire/template | 2 +-
srcpkgs/weston/template | 3 +-
srcpkgs/xarchiver/patches/doubleclick.patch | 75 ---------
srcpkgs/xarchiver/template | 2 +-
srcpkgs/xournal | 1 -
srcpkgs/xournal/template | 22 +++
srcpkgs/xournalpp/template | 8 +-
.../patches/mupdf-1.20.0.patch | 12 --
44 files changed, 184 insertions(+), 464 deletions(-)
delete mode 100644 srcpkgs/go/patches/fix-32bit-tests.patch
delete mode 100644 srcpkgs/go/patches/fix-musl-tests.patch
delete mode 100644 srcpkgs/go/patches/fix-tests.patch
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
delete mode 100644 srcpkgs/mumble/files/mumble-server/log/run
delete mode 100644 srcpkgs/mumble/files/mumble-server/run
delete mode 100644 srcpkgs/mumble/patches/config.patch
create mode 100644 srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
create mode 100644 srcpkgs/nettle/patches/ppc64-elfv2.patch
create mode 100644 srcpkgs/nvme-cli/patches/musl.patch
delete mode 100644 srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
delete mode 100644 srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
delete mode 100644 srcpkgs/xarchiver/patches/doubleclick.patch
delete mode 120000 srcpkgs/xournal
create mode 100644 srcpkgs/xournal/template
delete mode 100644 srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 80ab6e8889d8..7348260f54af 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -4,7 +4,6 @@ update_check() {
local i p url pkgurlname rx found_version consider
local update_override=$XBPS_SRCPKGDIR/$XBPS_TARGET_PKG/update
local original_pkgname=$pkgname
- local pkgname=$sourcepkg
local urlpfx urlsfx
local -A fetchedurls
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..46cd9d3dede6 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=1
+version=2.4.0
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
@@ -16,31 +16,21 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2
nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
post_extract() {
- # Mark tests that fail on certain targets
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- vsed -i tests/libslic3r/test_mutable_priority_queue.cpp \
- -e 's/\(TEST_CASE("Mutable priority queue - first pop", "\[MutableSkipHeapPriorityQueue\]\)\(")\)/\1[!mayfail]\2/'
- ;;
- i686*)
- vsed -i tests/libslic3r/test_voronoi.cpp \
- -e 's/\(TEST_CASE("Voronoi offset 2", "\[VoronoiOffset\]\)\(")\)/\1[!mayfail]\2/'
- vsed -i tests/fff_print/test_trianglemesh.cpp \
- -e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
- ;;
- esac
-}
-
-post_install() {
- vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
+ # this test suite fails on musl
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d"
+ fi
}
Slic3rPE_package() {
build_style=meta
- short_desc+=" (transitional dummy package)"
depends="${sourcepkg}>=${version}_${revision}"
}
+
+post_install() {
+ vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
+}
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
index 44a33686702f..6942c7c51eda 100644
--- a/srcpkgs/amtk/template
+++ b/srcpkgs/amtk/template
@@ -1,35 +1,29 @@
# Template file for 'amtk'
pkgname=amtk
-version=5.4.1
+version=5.2.0
revision=1
-build_style=meson
+build_style=gnu-configure
build_helper="gir"
-configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc)"
-hostmakedepends="pkg-config glib-devel gettext $(vopt_if gtk_doc gtk-doc)"
+configure_args="$(vopt_enable gir introspection)"
+hostmakedepends="pkg-config glib-devel"
makedepends="gtk+3-devel libglib-devel"
short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="https://gitlab.gnome.org/World/amtk"
+homepage="https://gitlab.gnome.org/Archive/amtk"
distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=7ebabc429b0eebb2b32360c9bfdbe368e489b35c3cdc086a856cfc9b3a466a72
+checksum=820545bb4cf87ecebc2c3638d6b6e58b8dbd60a419a9b43cf020124e5dad7078
-build_options="gir gtk_doc"
+build_options="gir"
build_options_default="gir"
-if ! [ "$CROSS_BUILD" ]; then
- build_options_default+="gtk_doc"
-fi
-
amtk-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel"
+ depends="amtk-${version}_${revision} gtk+3-devel libglib-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
+ vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
diff --git a/srcpkgs/angband/template b/srcpkgs/angband/template
index 7cf46c4e13ad..2ac3a0f27fa5 100644
--- a/srcpkgs/angband/template
+++ b/srcpkgs/angband/template
@@ -11,7 +11,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-or-later"
homepage="http://rephial.org/"
changelog="http://rephial.org/release/"
-distfiles="https://github.com/angband/angband/archive/refs/tags/${version}.tar.gz"
+distfiles="http://rephial.org/downloads/4.2/angband-${version}.tar.gz"
checksum=acd735c9d46bf86ee14337c71c56f743ad13ec2a95d62e7115604621e7560d0f
pre_configure() {
diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index 1fa9ab08ec20..0b2f201450b1 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,6 +1,6 @@
# Template file for 'cargo-geiger'
pkgname=cargo-geiger
-version=0.11.4
+version=0.11.3
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_wrksrc="${pkgname}"
@@ -11,9 +11,8 @@ short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
homepage="https://github.com/rust-secure-code/cargo-geiger"
-changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-geiger/master/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-geiger/archive/cargo-geiger-${version}.tar.gz"
-checksum=8f57da70a465c7fc2797b5142c51fd763e4569e0b3daf63205980be3a1af2576
+checksum=f6d6e860a4c597b6a4eed1ed9ab800eb13741744768f7d3a5b2c2faee3922169
post_install() {
vlicense LICENSE-MIT
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 75abb71ceaa2..ba4c6ad900c4 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
-version=2.12.1
-revision=1
+version=2.10.4
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -11,14 +11,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, FTL"
homepage="https://www.freetype.org/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f
+checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
post_patch() {
vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
}
post_install() {
- vlicense LICENSE.TXT
+ vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
}
@@ -26,10 +26,9 @@ freetype-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/bin/freetype-config
- vmove usr/share/man/man1/freetype-config.1
- vmove usr/share/aclocal
- vmove usr/include
+ for f in bin include share; do
+ vmove usr/${f}
+ done
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
deleted file mode 100644
index f5d8083b19f0..000000000000
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fixes go1.19 error on i686 -
- runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
-
---- a/go/src/cmd/go/script_test.go
-+++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
- "GO_TESTING_GOTOOLS", // for gccgo testing
- "GCCGO", // for gccgo testing
- "GCCGOTOOLDIR", // for gccgo testing
-+ "CGO_CFLAGS", // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
- }
-
- // setup sets up the test execution temporary directory and environment.
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
deleted file mode 100644
index f70cb456857b..000000000000
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
-
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
- {call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
- {call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
-
-- {call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
-- {call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
-- {call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
--
- {call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
- {call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
- {call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
- {call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
- {call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
-
-- {call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
-- {call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
-- {call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
--
- {call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
- {call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
- {call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
deleted file mode 100644
index c93415611413..000000000000
--- a/srcpkgs/go/patches/fix-tests.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
-
---- a/go/src/os/os_unix_test.go
-+++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
- }
- }
-
--func TestChown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestChown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = Chown(f.Name(), -1, gid); err != nil {
-- t.Fatalf("chown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = Chown(f.Name(), -1, g); err != nil {
-- t.Fatalf("chown %s -1 %d: %s", f.Name(), g, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), g)
--
-- // change back to gid to test fd.Chown
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
-- }
--}
--
--func TestFileChown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestFileChown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = f.Chown(-1, g); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), g, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), g)
--
-- // change back to gid to test fd.Chown
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
-- }
--}
--
--func TestLchown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestLchown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- linkname := f.Name() + "2"
-- if err := Symlink(f.Name(), linkname); err != nil {
-- if runtime.GOOS == "android" && IsPermission(err) {
-- t.Skip("skipping test on Android; permission error creating symlink")
-- }
-- t.Fatalf("link %s -> %s: %v", f.Name(), linkname, err)
-- }
-- defer Remove(linkname)
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = Lchown(linkname, -1, gid); err != nil {
-- if err, ok := err.(*PathError); ok && err.Err == syscall.ENOSYS {
-- t.Skip("lchown is unavailable")
-- }
-- t.Fatalf("lchown %s -1 %d: %s", linkname, gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, linkname, int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = Lchown(linkname, -1, g); err != nil {
-- t.Fatalf("lchown %s -1 %d: %s", linkname, g, err)
-- }
-- checkUidGid(t, linkname, int(sys.Uid), g)
--
-- // Check that link target's gid is unchanged.
-- checkUidGid(t, f.Name(), int(sys.Uid), int(sys.Gid))
-- }
--}
--
- // Issue 16919: Readdir must return a non-empty slice or an error.
- func TestReaddirRemoveRace(t *testing.T) {
- oldStat := *LstatP
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index a5fce0f153b6..2db64b795ed8 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,18 +1,17 @@
# Template file for 'go'
pkgname=go
-version=1.19
+version=1.18.3
revision=1
create_wrksrc=yes
build_wrksrc=go
hostmakedepends="go1.12-bootstrap"
-checkdepends="iana-etc clang gcc-fortran"
short_desc="Go Programming Language"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://go.dev/"
changelog="https://go.dev/doc/devel/release.html"
distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9
+checksum=0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d
nostrip=yes
noverifyrdeps=yes
@@ -32,24 +31,11 @@ if [ "$CROSS_BUILD" ]; then
fi
fi
-# Workaround for go-1.19 compilation error on i686
-# runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
-if [ "$XBPS_MACHINE" = i686 ]; then
- export CGO_CFLAGS="-fno-stack-protector"
-fi
-
-post_extract() {
- if [ "$(df . --output=fstype | tail -1)" = zfs ]; then
- # https://github.com/golang/go/issues/39905
- rm -v go/src/cmd/link/internal/ld/fallocate_test.go
- fi
-}
-
do_build() {
unset GCC CC CXX LD CFLAGS
# FIXME: work around leaking go build-style vars when built as a
# dependency
- unset CGO_CXXFLAGS CGO_ENABLED # CGO_CFLAGS
+ unset CGO_CXXFLAGS CGO_CFLAGS CGO_ENABLED
export GOROOT_BOOTSTRAP="/usr/lib/go1.12"
export GOROOT=$PWD
@@ -61,15 +47,6 @@ do_build() {
bash make.bash -v
}
-do_check() {
- if [ "$XBPS_LIBC" = musl ]; then
- # https://github.com/golang/go/issues/39857
- ./bin/go tool dist test -v -run "!^cgo_test$"
- else
- ./bin/go tool dist test -v
- fi
-}
-
do_install() {
local bindir
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index b1d393b582ac..c38f3f8c525a 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
# Template file for 'godot'
pkgname=godot
-version=3.5
+version=3.4
revision=1
archs="x86_64* i686* aarch64* armv7* ppc64*"
wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
license="MIT"
homepage="https://www.godotengine.org/"
distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
+checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
CFLAGS+=" -fPIE -fPIC"
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 79e6bcb07d23..738464c61ca0 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,7 +1,7 @@
# Template file for 'gpodder'
pkgname=gpodder
-version=3.11.0
-revision=1
+version=3.10.21
+revision=2
hostmakedepends="python3 intltool"
depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
@@ -14,7 +14,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/gpodder/gpodder"
distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=c96a3332e61e8277475497ec24fe0918c5cafc580a2f85fc7b34c2fd989873de
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
do_check() {
make releasetest
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 8e0947d775fb..4899fd5a1c38 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,8 +1,7 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
-reverts="5.1.0_1"
version=4.4.1
-revision=2
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
diff --git a/srcpkgs/hatch/template b/srcpkgs/hatch/template
index 52d222ae6c7d..5269561edf34 100644
--- a/srcpkgs/hatch/template
+++ b/srcpkgs/hatch/template
@@ -1,6 +1,6 @@
# Template file for 'hatch'
pkgname=hatch
-version=1.4.0
+version=1.3.1
revision=1
build_style=python3-pep517
# ignore backend tests, because updating hatchling when there is no new hatch
@@ -12,7 +12,7 @@ hostmakedepends="hatchling"
depends="python3-atomicwrites python3-click hatchling python3-httpx
python3-keyring python3-pexpect python3-platformdirs python3-pyperclip
python3-rich python3-tomli-w python3-tomlkit python3-userpath
- python3-virtualenv python3-hyperlink"
+ python3-virtualenv"
checkdepends="${depends} python3-pytest python3-pytest-mock
python3-pytest-xdist git python3-pip"
short_desc="Modern, extensible Python project management "
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://hatch.pypa.io/latest/"
changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history.md"
distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a1b06523cf66c759828f21145d8619044049b9ef660accef42d47612e7b7fda2
+checksum=fb1bdad4a22d3443137036b246898c5d3c7552ff4ba399b4605548cef0a22496
make_check_pre="env PYTHONPATH=./src"
post_install() {
diff --git a/srcpkgs/hwinfo/template b/srcpkgs/hwinfo/template
index e7510055d795..416261ae95bb 100644
--- a/srcpkgs/hwinfo/template
+++ b/srcpkgs/hwinfo/template
@@ -1,6 +1,6 @@
# Template file for 'hwinfo'
pkgname=hwinfo
-version=22.0
+version=21.82
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -13,7 +13,7 @@ maintainer="meator <meator.dev@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/openSUSE/hwinfo"
distfiles="https://github.com/openSUSE/hwinfo/archive/refs/tags/${version}.tar.gz"
-checksum=7ba4042f492e2337b6f18782737f6a5238841352d69457b128cbaf0e40ef2a6e
+checksum=b031dba3ad79676c11d7478ce3123a3551e6abf4b2262f0cc903d1bfedb8d4ee
disable_parallel_build=yes
if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index 56fc82e44277..aafe21aa9aa5 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,18 +1,17 @@
# Template file for 'libnvme'
pkgname=libnvme
-version=1.1
+version=1.0
revision=1
build_style=meson
configure_args="-Ddocs=man"
hostmakedepends="pkg-config swig"
makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
-checkdepends="perl"
short_desc="C Library for NVM Express on Linux"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/linux-nvme/libnvme"
distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=d000181356513733671409c747c88826155b60f45f76e7289d6bbf27a8f851b0
+checksum=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807
libnvme-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/luarocks-lua53/template b/srcpkgs/luarocks-lua53/template
index a925d7ddd64d..9ab25a87f5ec 100644
--- a/srcpkgs/luarocks-lua53/template
+++ b/srcpkgs/luarocks-lua53/template
@@ -1,6 +1,6 @@
# Template file for 'luarocks-lua53'
pkgname=luarocks-lua53
-version=3.9.1
+version=3.7.0
revision=1
wrksrc=luarocks-${version}
build_style=configure
@@ -17,9 +17,8 @@ short_desc="${_desc} (5.3.x)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://luarocks.org/"
-changelog="https://github.com/luarocks/luarocks/wiki/Release-history"
distfiles="https://luarocks.org/releases/luarocks-${version}.tar.gz"
-checksum=ffafd83b1c42aa38042166a59ac3b618c838ce4e63f4ace9d961a5679ef58253
+checksum=9255d97fee95cec5b54fc6ac718b11bf5029e45bed7873e053314919cd448551
alternatives="
luarocks:luarocks:/usr/bin/luarocks-5.3
luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.3"
diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index afae462569a2..4e495f3f5a20 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
# Template file for 'mcelog'
pkgname=mcelog
-version=185
+version=184
revision=1
archs="i686* x86_64*"
hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://www.mcelog.org/"
distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=594adaf9395e630de9c963350729b2c4f6354022aeac309c5aebdf57c4ff138b
+checksum=067d52006f0aa42045acc6d9c04d590362448bacd8ef415d42729e6f35825028
do_build() {
make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}
diff --git a/srcpkgs/mumble/files/mumble-server/log/run b/srcpkgs/mumble/files/mumble-server/log/run
deleted file mode 100644
index 6b01a89f5be9..000000000000
--- a/srcpkgs/mumble/files/mumble-server/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t murmur
diff --git a/srcpkgs/mumble/files/mumble-server/run b/srcpkgs/mumble/files/mumble-server/run
deleted file mode 100644
index ee17d0d1ed0d..000000000000
--- a/srcpkgs/mumble/files/mumble-server/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-[ -r ./conf ] && . ./conf
-exec chpst -u_murmur:_murmur mumble-server -fg -ini ${CONFIG_FILE:-/etc/murmur.ini} ${OPTS}
diff --git a/srcpkgs/mumble/patches/config.patch b/srcpkgs/mumble/patches/config.patch
deleted file mode 100644
index f85e1f1cefa8..000000000000
--- a/srcpkgs/mumble/patches/config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/murmur.ini
-+++ b/scripts/murmur.ini
-@@ -13,7 +13,7 @@
-
- ; Path to database. If blank, will search for
- ; murmur.sqlite in default locations or create it if not found.
--database=
-+database=/var/lib/murmur/murmur.sqlite
-
- ; Murmur defaults to using SQLite with its default rollback journal.
- ; In some situations, using SQLite's write-ahead log (WAL) can be
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 65f96a90f282..2d67fdfcac1d 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -29,25 +29,18 @@ build_options_default="jack portaudio"
export CMAKE_GENERATOR="Unix Makefiles"
post_install() {
- rm -f ${DESTDIR}/usr/share/man/man1/murmur-user-wrapper.1
- vconf scripts/murmur.ini
- vsv mumble-server
- ln -sf murmurd.1 ${DESTDIR}/usr/share/man/man1/mumble-server.1
+ vbin ${wrksrc}/scripts/murmur-user-wrapper
+ vsconf scripts/murmur.ini
vlicense LICENSE
}
murmur_package() {
- system_accounts="_murmur"
- _murmur_homedir="/var/lib/murmur"
- make_dirs="/var/lib/murmur 0750 _murmur _murmur"
- conf_files="/etc/murmur.ini"
- depends="qt5-plugin-sqlite"
short_desc+=" - Server software (mumble-server)"
pkg_install() {
- vmove etc/sv/mumble-server
- vmove etc/murmur.ini
vmove usr/bin/mumble-server
- vmove usr/share/man/man1/mumble-server.1
+ vmove usr/bin/murmur-user-wrapper
+ vmove usr/share/man/man1/murmur-user-wrapper.1
vmove usr/share/man/man1/murmurd.1
+ vmove usr/share/examples/mumble/murmur.ini
}
}
diff --git a/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
new file mode 100644
index 000000000000..ce7c74779e85
--- /dev/null
+++ b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
@@ -0,0 +1,21 @@
+This ensures that efficient capability checks are used on musl.
+
+--- a/fat-ppc.c
++++ b/fat-ppc.c
+@@ -42,12 +42,10 @@
+
+ #if defined(_AIX)
+ # include <sys/systemcfg.h>
+-#elif defined(__linux__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-# define USE_GETAUXVAL 1
+-# include <asm/cputable.h>
+-# include <sys/auxv.h>
+-# endif
++#elif defined(__linux__)
++# define USE_GETAUXVAL 1
++# include <asm/cputable.h>
++# include <sys/auxv.h>
+ #elif defined(__FreeBSD__)
+ # include <machine/cpu.h>
+ # ifdef PPC_FEATURE2_HAS_VEC_CRYPTO
diff --git a/srcpkgs/nettle/patches/ppc64-elfv2.patch b/srcpkgs/nettle/patches/ppc64-elfv2.patch
new file mode 100644
index 000000000000..22f76582e0e1
--- /dev/null
+++ b/srcpkgs/nettle/patches/ppc64-elfv2.patch
@@ -0,0 +1,22 @@
+Ensure that ELFv2 ABI is used on all ppc64, including big endian.
+
+--- a/powerpc64/machine.m4
++++ b/powerpc64/machine.m4
+@@ -1,7 +1,7 @@
+ define(`PROLOGUE',
+ `.globl C_NAME($1)
+ DECLARE_FUNC(C_NAME($1))
+-ifelse(WORDS_BIGENDIAN,no,
++ifelse(`no',`no',
+ `ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ C_NAME($1):
+ addis 2,12,(.TOC.-C_NAME($1))@ha
+@@ -17,7 +17,7 @@ ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ undefine(`FUNC_ALIGN')')
+
+ define(`EPILOGUE',
+-`ifelse(WORDS_BIGENDIAN,no,
++`ifelse(`no',`no',
+ `.size C_NAME($1), . - C_NAME($1)',
+ `.size .C_NAME($1), . - .C_NAME($1)
+ .size C_NAME($1), . - .C_NAME($1)')')
diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template
index 26b926bf9cbe..25eca0dcab04 100644
--- a/srcpkgs/nettle/template
+++ b/srcpkgs/nettle/template
@@ -1,6 +1,6 @@
# Template file for 'nettle'
pkgname=nettle
-version=3.8
+version=3.7.3
revision=1
build_style=gnu-configure
configure_args="--enable-shared"
@@ -10,9 +10,8 @@ short_desc="Low-level cryptographic library"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://www.lysator.liu.se/~nisse/nettle/"
-changelog="https://git.lysator.liu.se/nettle/nettle/-/raw/master/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7576c68481c198f644b08c160d1a4850ba9449e308069455b5213319f234e8e6
+checksum=661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0
nettle-devel_package() {
depends="gmp-devel ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index 89175e29a449..c58b411bcdab 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -1,33 +1,36 @@
# Template file for 'nilfs-utils'
pkgname=nilfs-utils
-version=2.2.9
+version=2.2.8
revision=1
build_style=gnu-configure
-configure_args="--without-selinux"
+configure_args="--sbindir=/usr/bin --enable-libmount"
make_install_args="sbindir=/usr/bin"
-makedepends="libblkid-devel libmount-devel libuuid-devel"
+hostmakedepends="automake libtool"
+makedepends="libuuid-devel libmount-devel"
conf_files="/etc/nilfs_cleanerd.conf"
short_desc="Log-structured file system for Linux - userspace utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
-homepage="https://nilfs.sourceforge.io/"
-distfiles="https://nilfs.sourceforge.io/download/${pkgname}-${version}.tar.bz2"
-checksum=5df63998c2084182c8c608a29b47b1771b825b4b5fa7916c12cca2fcb7577a97
+homepage="http://nilfs.sourceforge.net/"
+distfiles="http://nilfs.sourceforge.net/download/$pkgname-$version.tar.bz2"
+checksum=5a29f8f59db03edf8dd1e68dfd80ff4713e0aa184cfa83a6326ac8af93d9bda6
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin/
}
libnilfs_package() {
- short_desc="${short_desc/utils/libraries}"
+ short_desc="NILFS userspace runtime libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
}
}
-
nilfs-utils-devel_package() {
depends="${makedepends} libnilfs>=${version}_${revision}"
- short_desc="${short_desc/utils/development files}"
+ short_desc="NILFS userspace development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index f45eae77b031..d85963d3f6c6 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
# Template file for 'nspr'
pkgname=nspr
-version=4.34.1
+version=4.34
revision=1
build_wrksrc=nspr
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="http://www.mozilla.org/projects/nspr/"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=c5b8354c48b632b8f4c1970628146c0e0c0ca8f32c7315d7d5736c002e03774f
+checksum=beef011cd15d8f40794984d17014366513cec5719bf1a78f5e8a3e3a1cebf99c
CFLAGS="-D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
diff --git a/srcpkgs/nvme-cli/patches/musl.patch b/srcpkgs/nvme-cli/patches/musl.patch
new file mode 100644
index 000000000000..4ebfba11d38f
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/musl.patch
@@ -0,0 +1,18 @@
+commit ddf3610e8326d014360c9550d54a73f97b40e862
+Author: q66 <daniel@octaforge.org>
+Date: Wed Apr 27 04:20:41 2022 +0200
+
+ fix build on musl
+
+diff --git a/util/base64.c b/util/base64.c
+index e386c11..dad4492 100644
+--- a/util/base64.c
++++ b/util/base64.c
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <sys/types.h>
+
+ static const char base64_table[65] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index fb64fece0644..d4e7bc892403 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
# Template file for 'nvme-cli'
pkgname=nvme-cli
-version=2.1.1
+version=2.0
revision=1
build_style=meson
configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -11,7 +11,7 @@ maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-2.0-only"
homepage="http://nvmexpress.org"
distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=cc8bd36b9aa71243e2bace238aa5505244fef3fef5418b0c61f75d1988458272
+checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
conf_files="/etc/nvme/*.conf"
if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
diff --git a/srcpkgs/perl-Sub-HandlesVia/template b/srcpkgs/perl-Sub-HandlesVia/template
index c76976791ab3..adb6d69553b2 100644
--- a/srcpkgs/perl-Sub-HandlesVia/template
+++ b/srcpkgs/perl-Sub-HandlesVia/template
@@ -1,6 +1,6 @@
# Template file for 'perl-Sub-HandlesVia'
pkgname=perl-Sub-HandlesVia
-version=0.034
+version=0.033
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Sub-HandlesVia"
distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
-checksum=7c6865f664782af1418ef1a0c112901e331f166f9a9550104d9d32a84ac80515
+checksum=b003821f30007dad977d7a8a93ae27d5563a746f955a8471a6d004447678198d
diff --git a/srcpkgs/python3-cached-property/template b/srcpkgs/python3-cached-property/template
index 6978a26349e7..7d088f3cd023 100644
--- a/srcpkgs/python3-cached-property/template
+++ b/srcpkgs/python3-cached-property/template
@@ -1,7 +1,7 @@
# Template file for 'python3-cached-property'
pkgname=python3-cached-property
-version=1.5.2
-revision=1
+version=1.5.1
+revision=5
wrksrc="cached-property-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,9 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/pydanny/cached-property"
distfiles="${PYPI_SITE}/c/cached-property/cached-property-${version}.tar.gz"
-checksum=9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130
-# upstream testcode use @coroutine
-make_check=no
+checksum=9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index ce3721e75092..f5593aa78c6b 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
# Template file for 'python3-virtualenv'
pkgname=python3-virtualenv
-version=20.16.3
+version=20.15.1
revision=1
wrksrc="virtualenv-${version}"
build_style=python3-module
@@ -8,18 +8,18 @@ hostmakedepends="python3-setuptools_scm"
depends="python3-setuptools python3-platformdirs python3-distlib python3-filelock python3-six"
checkdepends="python3-pytest-mock python3-flaky python3-devel python3-pip $depends"
short_desc="Virtual Python environment builder"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="MIT"
homepage="https://virtualenv.pypa.io/"
changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=d86ea0bb50e06252d79e6c241507cb904fcd66090c3271381372d6221a3970f9
+checksum=288171134a2ff3bfb1a2f54f119e77cd1b81c29fc1265a2356f3e8d14c7d58c4
alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
do_check() {
- # excluded tests depend on pytest-freezegun, not packaged in Void, or python2
+ # excluded tests depend on pytest-freezegun, not packaged in Void
vsed -e '/addopts/d' -i setup.cfg
- PYTHONPATH=src python3 -m pytest -k 'not (test_periodic_update or test_get_wheel_download_cached or test_py_pyc_missing)'
+ PYTHONPATH=src python3 -m pytest -k 'not (test_periodic_update or test_get_wheel_download_cached)'
}
post_install() {
diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index bae644840887..f89a4cd5ad5c 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
configure_args="$(vopt_with gtk3)"
hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel)
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="Multi-panel tabbed file manager"
diff --git a/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch b/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
deleted file mode 100644
index d048d1238d6e..000000000000
--- a/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: FreeBSD
---- a/gfx/webrender_bindings/webrender_ffi.h.orig 2022-05-23 17:12:36 UTC
-+++ b/gfx/webrender_bindings/webrender_ffi.h
-@@ -77,8 +77,6 @@ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpo
- struct WrPipelineIdAndEpoch;
- using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
-
--const uint64_t ROOT_CLIP_CHAIN = ~0;
--
- } // namespace wr
- } // namespace mozilla
-
diff --git a/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch b/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
deleted file mode 100644
index 6af2f0266a2f..000000000000
--- a/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/subprojects/appmenu-gtk-module/meson_options.txt
-+++ b/subprojects/appmenu-gtk-module/meson_options.txt
-@@ -1,3 +1,3 @@
--option('gtk', type: 'array', choices : ['2','3'], value: ['2','3'], description: 'Supported GTK versions')
-+option('gtk', type: 'array', choices : ['2','3'], value: ['3'], description: 'Supported GTK versions')
- option('tests', type : 'boolean', value : false, description: 'Parser tests')
- option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference')
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index a564cd99f232..6a9e874d1723 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -7,7 +7,7 @@ _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
build_style=meson
configure_args="-Dprint_trace=false"
hostmakedepends="pkg-config wayland-devel"
-makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel
+makedepends="wf-config-devel wlroots-devel cairo-devel
$(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
depends="xorg-server-xwayland"
short_desc="3D wayland compositor"
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index b517c10c98ca..4eb882a6c22e 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -11,8 +11,7 @@ makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel
pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel
poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel
libinput-devel libxcb-devel libXcursor-devel colord-devel dbus-devel
- $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel)
- libevdev-devel"
+ $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel)"
short_desc="Reference implementation of a Wayland compositor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/xarchiver/patches/doubleclick.patch b/srcpkgs/xarchiver/patches/doubleclick.patch
deleted file mode 100644
index aaac2c6b16e0..000000000000
--- a/srcpkgs/xarchiver/patches/doubleclick.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From f245d8714690af30064a2e5ec94bd2374288c2b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
-Date: Sat, 2 Jul 2022 23:47:36 +0200
-Subject: [PATCH 1/2] Simplify code
-
-The state of the modifier keys is available in event->state.
----
- src/window.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/window.c b/src/window.c
-index 1ec0e02c..e9760386 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -2620,11 +2620,7 @@ gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *even
-
- if (event->button == 1)
- {
-- GdkModifierType state;
--
-- gdk_event_get_state((GdkEvent *) event, &state);
--
-- if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
-+ if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
- return TRUE;
- else
- return FALSE;
-
-From 5d18fd23e8242678dbe47c232bc60b47f8fd75b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
-Date: Sat, 2 Jul 2022 23:51:40 +0200
-Subject: [PATCH 2/2] Re-enable left mouse button double clicks
-
-Check the time between two left mouse button clicks and if they are
-fast enough, fake a double-click event.
-
-Left mouse button double clicks have been unintentionally disabled by
-the change in commit e81d108c429e29b13ef1759c05033a6f3c645ac1 in order
-to allow dragging of multiple rows.
-
-This fixes github issue #148, reported by aianson.
----
- src/window.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/window.c b/src/window.c
-index e9760386..b9591aed 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -2597,6 +2597,7 @@ void xa_location_entry_activated (GtkEntry *entry,gpointer user_data)
-
- gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *event, XArchive *archive)
- {
-+ static guint32 last_button1;
- XEntry *entry;
- GtkTreePath *path;
- GtkTreeIter iter;
-@@ -2620,10 +2621,17 @@ gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *even
-
- if (event->button == 1)
- {
-+ if (event->time - last_button1 > 250)
-+ {
-+ last_button1 = event->time;
-+
- if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
- return TRUE;
- else
- return FALSE;
-+ }
-+ else
-+ event->button = 2;
- }
-
- if (!gtk_tree_selection_iter_is_selected(selection, &iter))
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index c0403f69ac47..56c781bea0dd 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,7 +1,7 @@
# Template file for 'xarchiver'
pkgname=xarchiver
version=0.5.4.18
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-doc --enable-gtk2=no"
hostmakedepends="pkg-config intltool"
diff --git a/srcpkgs/xournal b/srcpkgs/xournal
deleted file mode 120000
index f050a0a34269..000000000000
--- a/srcpkgs/xournal
+++ /dev/null
@@ -1 +0,0 @@
-xournalpp
\ No newline at end of file
diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
new file mode 100644
index 000000000000..36f11cead862
--- /dev/null
+++ b/srcpkgs/xournal/template
@@ -0,0 +1,22 @@
+# Template file for 'xournal'
+pkgname=xournal
+version=0.4.8.2016
+revision=4
+build_style=gnu-configure
+make_install_args="desktop-install"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
+depends="hicolor-icon-theme desktop-file-utils ghostscript"
+short_desc="GPL Notetaking, sketching, and journal-keeping"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://xournal.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+ vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+ vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+ po/Makefile.in.in
+}
diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 769d103e6459..e235dcfe40fb 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
# Template file for 'xournalpp'
pkgname=xournalpp
version=1.1.1
-revision=2
+revision=1
build_style=cmake
hostmakedepends="pkg-config gettext"
makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel
@@ -21,9 +21,3 @@ fi
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" libexecinfo-devel";;
esac
-
-xournal_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
diff --git a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch b/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
deleted file mode 100644
index 53b76fe358cb..000000000000
--- a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-from https://gitlab.alpinelinux.org/alpine/aports/-/commit/5c2d1886fdead7c00a00ddcd5d04aaa8d1f53377
---- a/zathura-pdf-mupdf/search.c
-+++ b/zathura-pdf-mupdf/search.c
-@@ -41,7 +41,7 @@
-
- fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad);
- int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
-- text, hit_bbox, N_SEARCH_RESULTS);
-+ text, NULL, hit_bbox, N_SEARCH_RESULTS);
-
- fz_rect r;
- for (int i = 0; i < num_results; i++) {
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (17 preceding siblings ...)
2022-08-10 7:33 ` ajtcode71
@ 2022-08-10 7:59 ` ajtcode71
2022-08-10 8:01 ` ajtcode71
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-10 7:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages master
https://github.com/void-linux/void-packages/pull/38336
darktable: update to 4.0.0
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/38336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-38336.patch --]
[-- Type: text/x-diff, Size: 88844 bytes --]
From 8057b39679d2f14004fcf8a67548713d5e3e2f20 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 1/6] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From c283f3c38ba202d01dbe65a27d9f1a873a2c6586 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 01:15:10 +1000
Subject: [PATCH 2/6] New Version 4.0.0 - Tested amd64 and aarch64.
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index a0c243ca585d..2cd9988db5eb 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,6 +1,6 @@
# Template file for 'darktable'
pkgname=darktable
-version=3.8.1
+version=4.0.0
revision=1
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
From 8f866acd346ff9bb71b4e6f38df48d02f56333b5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <anthonyt1120@gmail.com>
Date: Fri, 29 Jul 2022 02:25:02 +1000
Subject: [PATCH 3/6] updated checksum
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 2cd9988db5eb..9d0ba9ba7012 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -23,7 +23,7 @@ license="GPL-3.0-or-later"
homepage="http://www.darktable.org/"
changelog="https://github.com/darktable-org/darktable/releases"
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
-checksum=81ee069054dbde580749b2d3a81cda01b7d169a82ba48731823f3ea560b2bef6
+checksum=1416f8f59717e65a6220541aaa12eacca93888ce5176f2c9ab6c17b9cc53cc2d
# 2022-01-05
# avif doesn't load correctly, disable avif by default for now:
From f2937c2eb6cf5411f8c27b8888c8eeb37e3918f5 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:31:35 +1000
Subject: [PATCH 4/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit abf0389c6b7e1a28bb8a9af056b26dc6675f9881.
---
srcpkgs/cloudflared/template | 1 -
srcpkgs/opendht/template | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index b31cf78f4c53..3cb6912ffda9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -13,7 +13,6 @@ homepage="https://developers.cloudflare.com/argo-tunnel/"
changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
checksum=3a822faaed7ae90be5ba4920f9226cd85367402d2c5a2bf2f0732c37cad6599d
-broken="vendor/github.com/lucas-clemente/quic-go/internal/qtls/go119.go: can't be built on Go 1.19 yet"
pre_build() {
go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index 5b8c520eaa84..6b9f70d6b281 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,7 +1,7 @@
# Template file for 'opendht'
pkgname=opendht
-version=2.4.9
-revision=1
+version=2.4.4
+revision=2
build_style=cmake
configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
-DOPENDHT_TESTS_NETWORK=OFF"
@@ -11,8 +11,8 @@ short_desc="Distributed Hash Table implementation"
maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-3.0-or-later"
homepage="https://github.com/savoirfairelinux/opendht"
-distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/v${version}.tar.gz"
-checksum=ede4a0adee7e5d98d9681cfd2bab83421b153afcdb5efa1a925986a0a3a0ac8a
+distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz"
+checksum=a4b452423f9a55f3c53ceaeeb43ec50f2747fdc89a546caa74cd79b93b6ede08
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 81646da46d71124d21f471f8fdd33dff3df4f032 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Wed, 10 Aug 2022 08:57:24 +1000
Subject: [PATCH 5/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit 28c098573def8000345bf6eb5e623be893c93a37.
---
common/build-style/cmake.sh | 4 ---
common/shlibs | 10 +++----
srcpkgs/alarm-clock/template | 19 ++++++++++++
srcpkgs/bluebird-themes/template | 2 +-
srcpkgs/claws-mail/template | 4 +--
srcpkgs/cloudflared/template | 19 ------------
srcpkgs/dbus-elogind/template | 8 ++---
srcpkgs/dbus/template | 8 ++---
srcpkgs/foot/template | 4 +--
srcpkgs/freetype/template | 4 +--
srcpkgs/fzf/template | 4 +--
srcpkgs/gnutls/template | 4 +--
srcpkgs/gogglesmm/template | 3 +-
srcpkgs/gsimplecal-gtk2 | 1 -
srcpkgs/gsimplecal-gtk2/patches/musl.patch | 19 ++++++++++++
srcpkgs/gsimplecal-gtk2/template | 25 ++++++++++++++++
srcpkgs/gsimplecal-gtk3/patches | 1 +
srcpkgs/gsimplecal-gtk3/template | 17 ++++-------
.../harfbuzz/patches/fix-char-signed.patch | 29 -------------------
srcpkgs/harfbuzz/template | 5 ++--
srcpkgs/hatari/template | 2 +-
srcpkgs/hunspell-pl_PL/template | 4 +--
srcpkgs/kismet/template | 6 ++--
srcpkgs/ksh/template | 4 +--
srcpkgs/lighttpd/template | 4 +--
srcpkgs/mate-settings-daemon/template | 3 +-
srcpkgs/mpop/template | 4 +--
srcpkgs/msmtp/template | 4 +--
srcpkgs/mutt/template | 6 ++--
srcpkgs/okteta/template | 4 +--
srcpkgs/openblas/template | 4 +--
srcpkgs/openjdk8/template | 2 +-
srcpkgs/qtcreator/template | 11 ++-----
srcpkgs/removed-packages/template | 1 -
srcpkgs/rsync/template | 7 ++---
srcpkgs/sc3-plugins/template | 2 +-
srcpkgs/tgt/template | 4 +--
srcpkgs/zlib/patches/2-CVE-2022-37434.patch | 29 -------------------
...-2022-37434.patch => CVE-2022-37434.patch} | 0
srcpkgs/zlib/template | 2 +-
40 files changed, 133 insertions(+), 160 deletions(-)
create mode 100644 srcpkgs/alarm-clock/template
delete mode 100644 srcpkgs/cloudflared/template
delete mode 120000 srcpkgs/gsimplecal-gtk2
create mode 100644 srcpkgs/gsimplecal-gtk2/patches/musl.patch
create mode 100644 srcpkgs/gsimplecal-gtk2/template
create mode 120000 srcpkgs/gsimplecal-gtk3/patches
delete mode 100644 srcpkgs/harfbuzz/patches/fix-char-signed.patch
delete mode 100644 srcpkgs/zlib/patches/2-CVE-2022-37434.patch
rename srcpkgs/zlib/patches/{1-CVE-2022-37434.patch => CVE-2022-37434.patch} (100%)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index e1efd9cc6586..711fcea6273d 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,10 +54,6 @@ _EOF
cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
cmake_args+=" -DCMAKE_BUILD_TYPE=None"
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
- cmake_args+=" -DQT_HOST_PATH=/usr"
- # QT_HOST_PATH isn't enough in my system,
- # which have binfmts support on and off
- cmake_args+=" -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/cmake"
if [[ $build_helper = *"qemu"* ]]; then
echo "SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)" \
diff --git a/common/shlibs b/common/shlibs
index ea6fde4ffe31..326943713f07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -105,7 +105,7 @@ libgtk-x11-2.0.so.0 gtk+-2.16.0_1
libgdk_pixbuf-2.0.so.0 gdk-pixbuf-2.22.0_1
libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-xlib-2.30.8_1
libgailutil.so.18 gtk+-2.16.0_1
-libfreetype.so.6 freetype-2.12.1_1
+libfreetype.so.6 freetype-2.3.9_1
libfontconfig.so.1 fontconfig-2.6.0_1
libX11-xcb.so.1 libX11-1.2_1
libX11.so.6 libX11-1.2_1
@@ -1153,10 +1153,10 @@ librygel-renderer-gst-2.6.so.2 librygel-0.26.0_1
librygel-ruih-2.0.so.1 librygel-0.26.0_1
librygel-server-2.6.so.2 librygel-0.26.0_1
librygel-db-2.6.so.2 librygel-0.28.0_1
-libharfbuzz.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-icu.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-subset.so.0 libharfbuzz-5.1.0_1
-libharfbuzz-gobject.so.0 libharfbuzz-5.1.0_1
+libharfbuzz.so.0 libharfbuzz-0.9.4_1
+libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
+libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
+libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
libosinfo-1.0.so.0 libosinfo-0.2.0_1
libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
diff --git a/srcpkgs/alarm-clock/template b/srcpkgs/alarm-clock/template
new file mode 100644
index 000000000000..8c2fd84b812d
--- /dev/null
+++ b/srcpkgs/alarm-clock/template
@@ -0,0 +1,19 @@
+# Template file for 'alarm-clock'
+pkgname=alarm-clock
+version=1.4.9
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake gettext-devel glib-devel libtool intltool pkg-config"
+makedepends="gstreamer1-devel gtk+-devel libnotify-devel libunique1-devel"
+maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Simple GTK2 alarm clock for your desktop"
+homepage="https://github.com/shaggytwodope/alarm-clock"
+license="GPL-3.0-or-later"
+distfiles="https://github.com/shaggytwodope/alarm-clock/archive/v${version}.tar.gz"
+checksum=3724a42801befaee631d249edd8b15318bb72ae5f9db918c25de513f4c3f4538
+
+CFLAGS="-fcommon"
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
diff --git a/srcpkgs/bluebird-themes/template b/srcpkgs/bluebird-themes/template
index 65f66d6da3ba..a9f4e852df12 100644
--- a/srcpkgs/bluebird-themes/template
+++ b/srcpkgs/bluebird-themes/template
@@ -4,7 +4,7 @@ version=1.3
revision=3
wrksrc=Bluebird-$version
build_style=gnu-configure
-hostmakedepends="sassc which glib-devel automake gdk-pixbuf tar librsvg"
+hostmakedepends="sassc which glib-devel automake gdk-pixbuf tar librsvg-utils"
short_desc="Elegant blue GTK2/3/Metacity/Xfwm theme"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
license="GPL-2.0-or-later"
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 7f7de90b5f05..118b7d607108 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,11 +1,11 @@
# Template file for 'claws-mail'
pkgname=claws-mail
version=4.1.0
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
--enable-enchant --enable-gnutls"
-hostmakedepends="pkg-config automake libtool gettext-devel"
+hostmakedepends="pkg-config python-devel automake libtool gettext-devel"
makedepends="poppler-glib-devel libarchive-devel libSM-devel
libnotify-devel libcanberra-devel gpgme-devel gnutls-devel
enchant2-devel dbus-devel libetpan-devel libldap-devel
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
deleted file mode 100644
index 3cb6912ffda9..000000000000
--- a/srcpkgs/cloudflared/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'cloudflared'
-pkgname=cloudflared
-version=2022.7.1
-revision=1
-build_style=go
-go_import_path=github.com/cloudflare/cloudflared
-go_package="${go_import_path}/cmd/cloudflared"
-go_ldflags="-X \"main.Version=${version}\""
-short_desc="Cloudflare Tunnel client"
-maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
-license="Apache-2.0"
-homepage="https://developers.cloudflare.com/argo-tunnel/"
-changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
-distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
-checksum=3a822faaed7ae90be5ba4920f9226cd85367402d2c5a2bf2f0732c37cad6599d
-
-pre_build() {
- go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
-}
diff --git a/srcpkgs/dbus-elogind/template b/srcpkgs/dbus-elogind/template
index 61a6040d200d..7e92ccf7cd2b 100644
--- a/srcpkgs/dbus-elogind/template
+++ b/srcpkgs/dbus-elogind/template
@@ -1,7 +1,7 @@
# Template file for 'dbus-elogind'
# NOTE: keep this pkg synchronized with dbus
pkgname=dbus-elogind
-version=1.14.0
+version=1.12.20
revision=1
wrksrc="dbus-${version}"
build_style=gnu-configure
@@ -18,9 +18,9 @@ short_desc="Message bus system (built with elogind support)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
-changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
-distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
+distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
+checksum=f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
conf_files="/etc/dbus-1/*.conf"
replaces="dbus>=0"
provides="dbus-${version}_${revision}"
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index aa6b118f52ae..09dd3296c8a6 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
# Template file for 'dbus'
# NOTE: keep this pkg synchronized with dbus-elogind
pkgname=dbus
-version=1.14.0
+version=1.12.20
revision=1
build_style=gnu-configure
configure_args="--disable-selinux --enable-inotify --with-dbus-user=dbus
@@ -15,9 +15,9 @@ short_desc="Message bus system"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
-changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
-distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.12/NEWS"
+distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"
+checksum=f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
python_version=3
conf_files="/etc/dbus-1/*.conf"
diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index a21aba144cb6..d139879a5399 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
# Template file for 'foot'
pkgname=foot
-version=1.13.0
+version=1.12.1
revision=1
wrksrc=$pkgname
build_style=meson
@@ -15,7 +15,7 @@ license="MIT"
homepage="https://codeberg.org/dnkl/foot"
changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9fd10584d40f6aac6b87c11a94e1fdfc4bac43aef9144f4aa84213257672da8c
+checksum=14e307ac89454b682bb9f1bc644043779f4462df656034fcc4c1e72b18fbffdd
conf_files="/etc/xdg/foot/foot.ini"
post_install() {
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 72549c71bd7e..75abb71ceaa2 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,11 +1,11 @@
# Template file for 'freetype'
pkgname=freetype
version=2.12.1
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel libpng-devel brotli-devel"
+makedepends="bzip2-devel libpng-devel"
short_desc="Font rendering engine and library API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, FTL"
diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 71e7b17e21d6..7e9383e3f341 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
# Template file for 'fzf'
pkgname=fzf
-version=0.32.1
+version=0.32.0
revision=1
build_style=go
go_import_path="github.com/junegunn/fzf"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/junegunn/fzf"
changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=c7afef61553b3b3e4e02819c5d560fa4acf33ecb39829aeba392c2e05457ca6a
+checksum=3502c15faeb0a6d553c68ab1a7f472af08afed94a1d016427a8ab053ef149a8f
post_install() {
cd ${wrksrc}
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index d8ea09e85f42..228bd0334166 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
# Template file for 'gnutls'
pkgname=gnutls
-version=3.7.7
+version=3.7.6
revision=1
build_style=gnu-configure
configure_args="--disable-guile --disable-static
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only, LGPL-2.1-or-later"
homepage="https://gnutls.org"
distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106
+checksum=77065719a345bfb18faa250134be4c53bef70c1bd61f6c0c23ceb8b44f0262ff
pre_check() {
# same as $PASS in tests/cert-tests/certtool.sh
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index b95341dfe54f..29579786726d 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -10,11 +10,12 @@ makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-dev
faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
depends="hicolor-icon-theme"
short_desc="Music Manager and Player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-3.0-or-later"
homepage="http://gogglesmm.github.io/"
distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz"
checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380
+python_version=2 #unverified
nocross="Tries to execute compiled code"
case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gsimplecal-gtk2 b/srcpkgs/gsimplecal-gtk2
deleted file mode 120000
index bd547b0783c2..000000000000
--- a/srcpkgs/gsimplecal-gtk2
+++ /dev/null
@@ -1 +0,0 @@
-gsimplecal-gtk3
\ No newline at end of file
diff --git a/srcpkgs/gsimplecal-gtk2/patches/musl.patch b/srcpkgs/gsimplecal-gtk2/patches/musl.patch
new file mode 100644
index 000000000000..eef2a786bb73
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk2/patches/musl.patch
@@ -0,0 +1,19 @@
+--- a/src/Unique.cpp.orig 2016-04-24 08:08:43.921536576 +0200
++++ b/src/Unique.cpp 2016-04-24 08:09:18.615896283 +0200
+@@ -1,10 +1,16 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <limits.h>
+ #include <signal.h>
+ #include <sys/sem.h>
++#ifdef HAVE_SYSCTL_H
+ #include <sys/sysctl.h>
++#endif
+ #include <sys/types.h>
+
+ #include "Unique.hpp"
diff --git a/srcpkgs/gsimplecal-gtk2/template b/srcpkgs/gsimplecal-gtk2/template
new file mode 100644
index 000000000000..73cf3bd39b88
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk2/template
@@ -0,0 +1,25 @@
+# Template file for 'gsimplecal-gtk2'
+pkgname=gsimplecal-gtk2
+version=2.1
+revision=4
+wrksrc="${pkgname%-*}-${version}"
+build_style=gnu-configure
+configure_args="--enable-gtk2"
+hostmakedepends="automake pkg-config"
+makedepends="gtk+-devel"
+short_desc="Simple and lightweight GTK calendar"
+maintainer="Jarbowski <jarbowski@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://dmedvinsky.github.io/gsimplecal/"
+distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
+checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
+
+replaces="gsimplecal-gtk3>=0"
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_install() {
+ vlicense COPYING
+}
diff --git a/srcpkgs/gsimplecal-gtk3/patches b/srcpkgs/gsimplecal-gtk3/patches
new file mode 120000
index 000000000000..7ee8024d19bb
--- /dev/null
+++ b/srcpkgs/gsimplecal-gtk3/patches
@@ -0,0 +1 @@
+../gsimplecal-gtk2/patches
\ No newline at end of file
diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template
index 21c75517bdb8..52acc624d51c 100644
--- a/srcpkgs/gsimplecal-gtk3/template
+++ b/srcpkgs/gsimplecal-gtk3/template
@@ -1,18 +1,19 @@
# Template file for 'gsimplecal-gtk3'
pkgname=gsimplecal-gtk3
-version=2.4.1
-revision=1
+version=2.1
+revision=4
wrksrc="${pkgname%-*}-${version}"
build_style=gnu-configure
hostmakedepends="automake pkg-config"
makedepends="gtk+3-devel"
short_desc="Simple and lightweight GTK calendar"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Jarbowski <jarbowski@gmail.com>"
license="BSD-3-Clause"
homepage="http://dmedvinsky.github.io/gsimplecal/"
-changelog="https://github.com/dmedvinsky/gsimplecal/raw/master/ChangeLog"
distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
-checksum=fd47df49ec26115bd6022d0e6a24648873c619e0406375d807fb18428d07d000
+checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
+
+replaces="gsimplecal-gtk2>=0"
pre_configure() {
./autogen.sh
@@ -21,9 +22,3 @@ pre_configure() {
post_install() {
vlicense COPYING
}
-
-gsimplecal-gtk2_package() {
- build_style=meta
- depends="gsimplecal-gtk3>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/harfbuzz/patches/fix-char-signed.patch b/srcpkgs/harfbuzz/patches/fix-char-signed.patch
deleted file mode 100644
index affcbc57dc55..000000000000
--- a/srcpkgs/harfbuzz/patches/fix-char-signed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/harfbuzz/harfbuzz/pull/3771
-From 81fe35159e4fdc5ca2c9436cc9ad2750bda64203 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Mon, 1 Aug 2022 07:45:25 +0000
-Subject: [PATCH] [repacker] fix signedness of char in tests
-
----
- src/test-repacker.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test-repacker.cc b/src/test-repacker.cc
-index 053c0c603..1b7e1f08b 100644
---- a/src/test-repacker.cc
-+++ b/src/test-repacker.cc
-@@ -112,9 +112,9 @@ static void start_lookup (int8_t type,
- hb_serialize_context_t* c)
- {
- char lookup[] = {
-- 0, type, // type
-+ 0, (char)type, // type
- 0, 0, // flag
-- 0, num_subtables, // num subtables
-+ 0, (char)num_subtables, // num subtables
- };
-
- start_object (lookup, 6, c);
---
-2.37.1
-
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 2fc515698f92..8e0947d775fb 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,7 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
-version=5.1.0
+reverts="5.1.0_1"
+version=4.4.1
revision=2
build_style=meson
build_helper="gir qemu"
@@ -14,7 +15,7 @@ license="MIT"
homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05
+checksum=c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee
libharfbuzz_package() {
short_desc+=" - runtime library"
diff --git a/srcpkgs/hatari/template b/srcpkgs/hatari/template
index 4858805707ae..e05e77961d60 100644
--- a/srcpkgs/hatari/template
+++ b/srcpkgs/hatari/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config python3"
makedepends="SDL2-devel libpng-devel portaudio-devel zlib-devel"
depends="hicolor-icon-theme"
short_desc="Atari ST/STE/TT/Falcon emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-2.0-or-later"
homepage="http://hatari.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index bfbcaae14013..db94240d6e7e 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
# Template file for 'hunspell-pl_PL'
pkgname=hunspell-pl_PL
-version=20220801
+version=20220501
revision=1
create_wrksrc=yes
short_desc="Polish dictionary for hunspell"
@@ -8,7 +8,7 @@ maintainer="m-cz <emcze@ya.ru>"
license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
homepage="https://sjp.pl/slownik/ort/"
distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=cc2874c7bf452255cbcd09d5083dd337f9c34daf2b6079bc97e398132a966424
+checksum=fd715b1facddfd680b8779f6f671a6763a0bf3b31f6e5909d52926ac27f7f1c7
post_extract() {
bsdtar -xf pl_PL.zip
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index aa14af915c45..3780e03f87a3 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
# Template file for 'kismet'
pkgname=kismet
-version=2022.08.R1
-revision=1
+version=2022.02.R1
+revision=4
_realver="${version//./-}"
wrksrc="${pkgname}-${_realver}"
build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://www.kismetwireless.net/"
distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz"
-checksum=2149cceac5526508653f4d02dcf7a694e3da3dc000a2372a1ee4bf9988279781
+checksum=aaae4747f14734a73f601af013c0eee26e13680f5e3675dfce09b7de2e68b8a8
system_groups="kismet"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 5f022424b7f0..be70d00c905b 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,7 +1,7 @@
# Template file for 'ksh'
pkgname=ksh
reverts="2020.0.0_1"
-version=1.0.2
+version=1.0.1
revision=1
wrksrc="ksh-${version}"
short_desc="AT&T's Korn shell (community branch ksh93u+m)"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="https://github.com/ksh93/ksh"
distfiles="https://github.com/ksh93/ksh/archive/v${version}.tar.gz"
-checksum=e62616caab07b2d090e9ad5e17f058d4b8b8f12b48f44017d9e5d6550dfd5c14
+checksum=4cbbee459df591426fea9e1705fa3200d168faf800451544d04fdb7013e33468
nocross=yes
register_shell="/bin/ksh"
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8a96ba55203d..6df12c8a5ed7 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,6 +1,6 @@
# Template file for 'lighttpd'
pkgname=lighttpd
-version=1.4.66
+version=1.4.65
revision=1
build_style=meson
configure_args="-Dwith_brotli=false -Dwith_bzip=false
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://lighttpd.net"
distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=47ac6e60271aa0196e65472d02d019556dc7c6d09df3b65df2c1ab6866348e3b
+checksum=bf0fa68a629fbc404023a912b377e70049331d6797bcbb4b3e8df4c3b42328be
conf_files="/etc/lighttpd/lighttpd.conf"
system_accounts="_lighttpd"
diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template
index 43606ffbdc3c..b5db461e136b 100644
--- a/srcpkgs/mate-settings-daemon/template
+++ b/srcpkgs/mate-settings-daemon/template
@@ -1,13 +1,14 @@
# Template file for 'mate-settings-daemon'
pkgname=mate-settings-daemon
version=1.26.0
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse"
hostmakedepends="dbus-glib-devel glib-devel intltool itstool pkg-config polkit"
makedepends="dbus-glib-devel libXt-devel libXxf86misc-devel libcanberra-devel
libmatekbd-devel libmatemixer-devel libnotify-devel mate-desktop-devel nss-devel
polkit-devel"
+depends="alsa-plugins-pulseaudio"
short_desc="MATE Settings daemon (pulseaudio)"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index a718f7c06571..ba25741d8db8 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
# Template file for 'mpop'
pkgname=mpop
-version=1.4.17
+version=1.4.16
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/mpop/"
distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=42ae494bad2941d9f647c48c3ed98c38ba9aa5cf3fe48fb0fe06e5b6dadf8bd5
+checksum=870eb571eae6d23fb92ad0c84d79de9c38c5f624e3614937d574bfe49ba687f9
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 2664cd7cff9d..eb687ece82c7 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
# Template file for 'msmtp'
pkgname=msmtp
-version=1.8.22
+version=1.8.20
revision=1
build_style=gnu-configure
configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/msmtp/"
distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7
+checksum=d93ae2aafc0f48af7dc9d0b394df1bb800588b8b4e8d096d8b3cf225344eb111
build_options="idn sasl gnome msmtpd"
build_options_default="idn sasl msmtpd"
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e3b0218e4008..c237bab6699a 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
# Template file for 'mutt'
pkgname=mutt
-version=2.2.7
-revision=1
+version=2.2.6
+revision=2
build_style=gnu-configure
configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
--enable-gpgme --with-idn2 --with-ssl --without-sasl --with-gsasl
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="http://www.mutt.org"
changelog="http://mutt.org/relnotes/${version%.*}"
distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=eb13858f58bb369f477bf652d90e9b6aaddd0d610acbea3455049e5efad36df1
+checksum=ffa2d93517cfc606fe01daffc5f12e42062a1c134d3b9af78484ebc5430888d3
post_install() {
# provided by mime-types
diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template
index 9c5638e67cf2..7d3878ca031a 100644
--- a/srcpkgs/okteta/template
+++ b/srcpkgs/okteta/template
@@ -1,7 +1,7 @@
# Template file for 'okteta'
pkgname=okteta
reverts="4.14.3_1"
-version=0.26.9
+version=0.26.6
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://apps.kde.org/okteta/"
distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz"
-checksum=16854c4d4e94838219ae3115a42ba385fda5c87dc6c9865ac90d3774f8d05ffb
+checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c
okteta-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index a749863d1d4e..e308926c5abd 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,7 +1,7 @@
# Template file for 'openblas'
pkgname=openblas
reverts="0.3.19_1"
-version=0.3.21
+version=0.3.20
revision=1
wrksrc="OpenBLAS-${version}"
build_style=gnu-makefile
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
homepage="https://www.openblas.net/"
changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"
-checksum=f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca
+checksum=8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 5060224eaab8..ebf8aa2b56a6 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=2
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 0e4840d0e7f8..cdd49a872a6c 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
# Template file for 'qtcreator'
pkgname=qtcreator
-version=8.0.0
+version=7.0.2
revision=1
wrksrc="qt-creator-opensource-src-${version}"
build_style=cmake
@@ -16,9 +16,9 @@ short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator"
-changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changelog/changes-${version}.md"
+changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=323640f96c76d199fe5bf7b02cbf2dd1a3b6489ab7cc0adeaad3957d8dc96f17
+checksum=14dee285aa3aa56fb25ccbd7587382fb6cb05ae99a1a30237f0a0bbef3ceff7a
replaces="qtcreator-data>=0"
python_version=3
@@ -33,11 +33,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- CXXFLAGS+=" -latomic "
-fi
-
post_install() {
# Install the license with the annotation for
# the Qt Company GPL Exception 1.0
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30cb55c291fb..392f1e39e130 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -16,7 +16,6 @@ replaces="
Venom<=0.5.5_1
XorCurses<=0.2.2_1
acme-client<=0.1.16_5
- alarm-clock<=1.4.9_1
albert<=0.16.1_4
apg<=2.2.3_5
appdata-tools<=0.1.8_2
diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 9563278c7b87..2f79c20f8f6b 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,11 +1,10 @@
# Template file for 'rsync'
pkgname=rsync
version=3.2.4
-revision=2
+revision=1
build_style=gnu-configure
-configure_args="--with-rrsync"
conf_files="/etc/rsyncd.conf"
-hostmakedepends="perl python3-commonmark"
+hostmakedepends="perl"
makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
openssl-devel libzstd-devel"
short_desc="Remote fast incremental file transfer tool"
@@ -20,7 +19,7 @@ checksum=6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1
CFLAGS="-DINET6"
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-simd"
+ configure_args=" --disable-simd"
fi
pre_check() {
diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template
index 45f54453e414..8511caea26e0 100644
--- a/srcpkgs/sc3-plugins/template
+++ b/srcpkgs/sc3-plugins/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config"
makedepends="fftw-devel libstk-devel"
depends="supercollider"
short_desc="Extension plugins for the SuperCollider3 audio synthesis server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jarbowski <jarbowski@cock.lu>"
license="GPL-2.0-or-later"
homepage="https://github.com/supercollider/sc3-plugins"
distfiles="https://github.com/supercollider/sc3-plugins/archive/Version-${version}.tar.gz
diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index 72325672c896..316e126c922e 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
# Template file for 'tgt'
pkgname=tgt
-version=1.0.84
+version=1.0.83
revision=1
build_style=gnu-makefile
make_install_args="sbindir=/usr/bin"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://github.com/fujita/tgt"
distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=c5f5913fd5c4a1333590ad3ddcf80dd12592a5f773f3609619513dd583772486
+checksum=a9ddb0ff32d3396416df9639f9f398d14a6051f505b5772d7d196df99df8b8da
post_extract() {
sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
diff --git a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch b/srcpkgs/zlib/patches/2-CVE-2022-37434.patch
deleted file mode 100644
index c5c95a92b28a..000000000000
--- a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
-From: Mark Adler <fork@madler.net>
-Date: Mon, 8 Aug 2022 10:50:09 -0700
-Subject: [PATCH] Fix extra field processing bug that dereferences NULL
- state->head.
-
-The recent commit to fix a gzip header extra field processing bug
-introduced the new bug fixed here.
----
- inflate.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 7a7289749..2a3c4fe98 100644
---- a/inflate.c
-+++ b/inflate.c
-@@ -763,10 +763,10 @@ int flush;
- copy = state->length;
- if (copy > have) copy = have;
- if (copy) {
-- len = state->head->extra_len - state->length;
- if (state->head != Z_NULL &&
- state->head->extra != Z_NULL &&
-- len < state->head->extra_max) {
-+ (len = state->head->extra_len - state->length) <
-+ state->head->extra_max) {
- zmemcpy(state->head->extra + len, next,
- len + copy > state->head->extra_max ?
- state->head->extra_max - len : copy);
diff --git a/srcpkgs/zlib/patches/1-CVE-2022-37434.patch b/srcpkgs/zlib/patches/CVE-2022-37434.patch
similarity index 100%
rename from srcpkgs/zlib/patches/1-CVE-2022-37434.patch
rename to srcpkgs/zlib/patches/CVE-2022-37434.patch
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 17cf7ccaf9f4..b0ef4c68e35d 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
# Template file for 'zlib'
pkgname=zlib
version=1.2.12
-revision=4
+revision=3
bootstrap=yes
build_style=configure
configure_args="--prefix=/usr --shared"
From 82e19c04276852ac0cc15e9064d3a4894f9c3ec9 Mon Sep 17 00:00:00 2001
From: ajtcode71 <90679701+ajtcode71@users.noreply.github.com>
Date: Mon, 8 Aug 2022 17:07:23 +1000
Subject: [PATCH 6/6] Revert "Merge branch 'void-linux:master' into master"
This reverts commit 4bb64d1cec5444300b74dd3590fe132d28d05e10.
---
common/xbps-src/shutils/update_check.sh | 1 -
srcpkgs/PrusaSlicer/template | 32 ++--
srcpkgs/amtk/template | 24 ++-
srcpkgs/angband/template | 2 +-
srcpkgs/cargo-geiger/template | 5 +-
srcpkgs/freetype/template | 15 +-
srcpkgs/go/patches/fix-32bit-tests.patch | 13 --
srcpkgs/go/patches/fix-musl-tests.patch | 29 ----
srcpkgs/go/patches/fix-tests.patch | 150 ------------------
srcpkgs/go/template | 29 +---
srcpkgs/godot/template | 4 +-
srcpkgs/gpodder/template | 6 +-
srcpkgs/harfbuzz/template | 3 +-
srcpkgs/hatch/template | 6 +-
srcpkgs/hwinfo/template | 4 +-
srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 ++
srcpkgs/libnvme/template | 5 +-
srcpkgs/luarocks-lua53/template | 5 +-
srcpkgs/mcelog/template | 4 +-
srcpkgs/mumble/files/mumble-server/log/run | 3 -
srcpkgs/mumble/files/mumble-server/run | 4 -
srcpkgs/mumble/patches/config.patch | 11 --
srcpkgs/mumble/template | 17 +-
.../nettle/patches/musl-ppc-use-auxval.patch | 21 +++
srcpkgs/nettle/patches/ppc64-elfv2.patch | 22 +++
srcpkgs/nettle/template | 5 +-
srcpkgs/nilfs-utils/template | 21 +--
srcpkgs/nspr/template | 4 +-
srcpkgs/nvme-cli/patches/musl.patch | 18 +++
srcpkgs/nvme-cli/template | 4 +-
srcpkgs/perl-Sub-HandlesVia/template | 4 +-
srcpkgs/python3-cached-property/template | 8 +-
srcpkgs/python3-virtualenv/template | 10 +-
srcpkgs/spacefm/template | 2 +-
.../thunderbird/patches/ROOT_CLIP_CHAIN.patch | 12 --
.../vala-panel-appmenu/patches/no-gtk2.patch | 7 -
srcpkgs/wayfire/template | 2 +-
srcpkgs/weston/template | 3 +-
srcpkgs/xarchiver/patches/doubleclick.patch | 75 ---------
srcpkgs/xarchiver/template | 2 +-
srcpkgs/xournal | 1 -
srcpkgs/xournal/template | 22 +++
srcpkgs/xournalpp/template | 8 +-
.../patches/mupdf-1.20.0.patch | 12 --
44 files changed, 184 insertions(+), 464 deletions(-)
delete mode 100644 srcpkgs/go/patches/fix-32bit-tests.patch
delete mode 100644 srcpkgs/go/patches/fix-musl-tests.patch
delete mode 100644 srcpkgs/go/patches/fix-tests.patch
create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
delete mode 100644 srcpkgs/mumble/files/mumble-server/log/run
delete mode 100644 srcpkgs/mumble/files/mumble-server/run
delete mode 100644 srcpkgs/mumble/patches/config.patch
create mode 100644 srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
create mode 100644 srcpkgs/nettle/patches/ppc64-elfv2.patch
create mode 100644 srcpkgs/nvme-cli/patches/musl.patch
delete mode 100644 srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
delete mode 100644 srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
delete mode 100644 srcpkgs/xarchiver/patches/doubleclick.patch
delete mode 120000 srcpkgs/xournal
create mode 100644 srcpkgs/xournal/template
delete mode 100644 srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 80ab6e8889d8..7348260f54af 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -4,7 +4,6 @@ update_check() {
local i p url pkgurlname rx found_version consider
local update_override=$XBPS_SRCPKGDIR/$XBPS_TARGET_PKG/update
local original_pkgname=$pkgname
- local pkgname=$sourcepkg
local urlpfx urlsfx
local -A fetchedurls
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..46cd9d3dede6 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=1
+version=2.4.0
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
@@ -16,31 +16,21 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2
nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
post_extract() {
- # Mark tests that fail on certain targets
- case "$XBPS_TARGET_MACHINE" in
- *-musl)
- vsed -i tests/libslic3r/test_mutable_priority_queue.cpp \
- -e 's/\(TEST_CASE("Mutable priority queue - first pop", "\[MutableSkipHeapPriorityQueue\]\)\(")\)/\1[!mayfail]\2/'
- ;;
- i686*)
- vsed -i tests/libslic3r/test_voronoi.cpp \
- -e 's/\(TEST_CASE("Voronoi offset 2", "\[VoronoiOffset\]\)\(")\)/\1[!mayfail]\2/'
- vsed -i tests/fff_print/test_trianglemesh.cpp \
- -e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
- ;;
- esac
-}
-
-post_install() {
- vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
+ # this test suite fails on musl
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d"
+ fi
}
Slic3rPE_package() {
build_style=meta
- short_desc+=" (transitional dummy package)"
depends="${sourcepkg}>=${version}_${revision}"
}
+
+post_install() {
+ vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
+}
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
index 44a33686702f..6942c7c51eda 100644
--- a/srcpkgs/amtk/template
+++ b/srcpkgs/amtk/template
@@ -1,35 +1,29 @@
# Template file for 'amtk'
pkgname=amtk
-version=5.4.1
+version=5.2.0
revision=1
-build_style=meson
+build_style=gnu-configure
build_helper="gir"
-configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc)"
-hostmakedepends="pkg-config glib-devel gettext $(vopt_if gtk_doc gtk-doc)"
+configure_args="$(vopt_enable gir introspection)"
+hostmakedepends="pkg-config glib-devel"
makedepends="gtk+3-devel libglib-devel"
short_desc="Actions, Menus and Toolbars Kit for GTK+ applications"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="https://gitlab.gnome.org/World/amtk"
+homepage="https://gitlab.gnome.org/Archive/amtk"
distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=7ebabc429b0eebb2b32360c9bfdbe368e489b35c3cdc086a856cfc9b3a466a72
+checksum=820545bb4cf87ecebc2c3638d6b6e58b8dbd60a419a9b43cf020124e5dad7078
-build_options="gir gtk_doc"
+build_options="gir"
build_options_default="gir"
-if ! [ "$CROSS_BUILD" ]; then
- build_options_default+="gtk_doc"
-fi
-
amtk-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel"
+ depends="amtk-${version}_${revision} gtk+3-devel libglib-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
+ vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
diff --git a/srcpkgs/angband/template b/srcpkgs/angband/template
index 7cf46c4e13ad..2ac3a0f27fa5 100644
--- a/srcpkgs/angband/template
+++ b/srcpkgs/angband/template
@@ -11,7 +11,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-or-later"
homepage="http://rephial.org/"
changelog="http://rephial.org/release/"
-distfiles="https://github.com/angband/angband/archive/refs/tags/${version}.tar.gz"
+distfiles="http://rephial.org/downloads/4.2/angband-${version}.tar.gz"
checksum=acd735c9d46bf86ee14337c71c56f743ad13ec2a95d62e7115604621e7560d0f
pre_configure() {
diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index 1fa9ab08ec20..0b2f201450b1 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,6 +1,6 @@
# Template file for 'cargo-geiger'
pkgname=cargo-geiger
-version=0.11.4
+version=0.11.3
revision=1
wrksrc="${pkgname}-${pkgname}-${version}"
build_wrksrc="${pkgname}"
@@ -11,9 +11,8 @@ short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
homepage="https://github.com/rust-secure-code/cargo-geiger"
-changelog="https://raw.githubusercontent.com/rust-secure-code/cargo-geiger/master/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-geiger/archive/cargo-geiger-${version}.tar.gz"
-checksum=8f57da70a465c7fc2797b5142c51fd763e4569e0b3daf63205980be3a1af2576
+checksum=f6d6e860a4c597b6a4eed1ed9ab800eb13741744768f7d3a5b2c2faee3922169
post_install() {
vlicense LICENSE-MIT
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 75abb71ceaa2..ba4c6ad900c4 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
-version=2.12.1
-revision=1
+version=2.10.4
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -11,14 +11,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, FTL"
homepage="https://www.freetype.org/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f
+checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
post_patch() {
vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
}
post_install() {
- vlicense LICENSE.TXT
+ vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
}
@@ -26,10 +26,9 @@ freetype-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/bin/freetype-config
- vmove usr/share/man/man1/freetype-config.1
- vmove usr/share/aclocal
- vmove usr/include
+ for f in bin include share; do
+ vmove usr/${f}
+ done
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
deleted file mode 100644
index f5d8083b19f0..000000000000
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fixes go1.19 error on i686 -
- runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
-
---- a/go/src/cmd/go/script_test.go
-+++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
- "GO_TESTING_GOTOOLS", // for gccgo testing
- "GCCGO", // for gccgo testing
- "GCCGOTOOLDIR", // for gccgo testing
-+ "CGO_CFLAGS", // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
- }
-
- // setup sets up the test execution temporary directory and environment.
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
deleted file mode 100644
index f70cb456857b..000000000000
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
-
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
- {call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
- {call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
-
-- {call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
-- {call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
-- {call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
--
- {call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
- {call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
- {call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
- {call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
- {call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
-
-- {call: "Setgroups([]int{0,1,2,3})", fn: func() error { return syscall.Setgroups([]int{0, 1, 2, 3}) }, filter: "Groups:", expect: "\t0 1 2 3"},
-- {call: "Setgroups(nil)", fn: func() error { return syscall.Setgroups(nil) }, filter: "Groups:", expect: ""},
-- {call: "Setgroups([]int{0})", fn: func() error { return syscall.Setgroups([]int{0}) }, filter: "Groups:", expect: "\t0"},
--
- {call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
- {call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
- {call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
deleted file mode 100644
index c93415611413..000000000000
--- a/srcpkgs/go/patches/fix-tests.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
-
---- a/go/src/os/os_unix_test.go
-+++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
- }
- }
-
--func TestChown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestChown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = Chown(f.Name(), -1, gid); err != nil {
-- t.Fatalf("chown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = Chown(f.Name(), -1, g); err != nil {
-- t.Fatalf("chown %s -1 %d: %s", f.Name(), g, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), g)
--
-- // change back to gid to test fd.Chown
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
-- }
--}
--
--func TestFileChown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestFileChown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = f.Chown(-1, g); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), g, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), g)
--
-- // change back to gid to test fd.Chown
-- if err = f.Chown(-1, gid); err != nil {
-- t.Fatalf("fchown %s -1 %d: %s", f.Name(), gid, err)
-- }
-- checkUidGid(t, f.Name(), int(sys.Uid), gid)
-- }
--}
--
--func TestLchown(t *testing.T) {
-- // Use TempDir() to make sure we're on a local file system,
-- // so that the group ids returned by Getgroups will be allowed
-- // on the file. On NFS, the Getgroups groups are
-- // basically useless.
-- f := newFile("TestLchown", t)
-- defer Remove(f.Name())
-- defer f.Close()
-- dir, err := f.Stat()
-- if err != nil {
-- t.Fatalf("stat %s: %s", f.Name(), err)
-- }
--
-- linkname := f.Name() + "2"
-- if err := Symlink(f.Name(), linkname); err != nil {
-- if runtime.GOOS == "android" && IsPermission(err) {
-- t.Skip("skipping test on Android; permission error creating symlink")
-- }
-- t.Fatalf("link %s -> %s: %v", f.Name(), linkname, err)
-- }
-- defer Remove(linkname)
--
-- // Can't change uid unless root, but can try
-- // changing the group id. First try our current group.
-- gid := Getgid()
-- t.Log("gid:", gid)
-- if err = Lchown(linkname, -1, gid); err != nil {
-- if err, ok := err.(*PathError); ok && err.Err == syscall.ENOSYS {
-- t.Skip("lchown is unavailable")
-- }
-- t.Fatalf("lchown %s -1 %d: %s", linkname, gid, err)
-- }
-- sys := dir.Sys().(*syscall.Stat_t)
-- checkUidGid(t, linkname, int(sys.Uid), gid)
--
-- // Then try all the auxiliary groups.
-- groups, err := Getgroups()
-- if err != nil {
-- t.Fatalf("getgroups: %s", err)
-- }
-- t.Log("groups: ", groups)
-- for _, g := range groups {
-- if err = Lchown(linkname, -1, g); err != nil {
-- t.Fatalf("lchown %s -1 %d: %s", linkname, g, err)
-- }
-- checkUidGid(t, linkname, int(sys.Uid), g)
--
-- // Check that link target's gid is unchanged.
-- checkUidGid(t, f.Name(), int(sys.Uid), int(sys.Gid))
-- }
--}
--
- // Issue 16919: Readdir must return a non-empty slice or an error.
- func TestReaddirRemoveRace(t *testing.T) {
- oldStat := *LstatP
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index a5fce0f153b6..2db64b795ed8 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,18 +1,17 @@
# Template file for 'go'
pkgname=go
-version=1.19
+version=1.18.3
revision=1
create_wrksrc=yes
build_wrksrc=go
hostmakedepends="go1.12-bootstrap"
-checkdepends="iana-etc clang gcc-fortran"
short_desc="Go Programming Language"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://go.dev/"
changelog="https://go.dev/doc/devel/release.html"
distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=9419cc70dc5a2523f29a77053cafff658ed21ef3561d9b6b020280ebceab28b9
+checksum=0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d
nostrip=yes
noverifyrdeps=yes
@@ -32,24 +31,11 @@ if [ "$CROSS_BUILD" ]; then
fi
fi
-# Workaround for go-1.19 compilation error on i686
-# runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
-if [ "$XBPS_MACHINE" = i686 ]; then
- export CGO_CFLAGS="-fno-stack-protector"
-fi
-
-post_extract() {
- if [ "$(df . --output=fstype | tail -1)" = zfs ]; then
- # https://github.com/golang/go/issues/39905
- rm -v go/src/cmd/link/internal/ld/fallocate_test.go
- fi
-}
-
do_build() {
unset GCC CC CXX LD CFLAGS
# FIXME: work around leaking go build-style vars when built as a
# dependency
- unset CGO_CXXFLAGS CGO_ENABLED # CGO_CFLAGS
+ unset CGO_CXXFLAGS CGO_CFLAGS CGO_ENABLED
export GOROOT_BOOTSTRAP="/usr/lib/go1.12"
export GOROOT=$PWD
@@ -61,15 +47,6 @@ do_build() {
bash make.bash -v
}
-do_check() {
- if [ "$XBPS_LIBC" = musl ]; then
- # https://github.com/golang/go/issues/39857
- ./bin/go tool dist test -v -run "!^cgo_test$"
- else
- ./bin/go tool dist test -v
- fi
-}
-
do_install() {
local bindir
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index b1d393b582ac..c38f3f8c525a 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
# Template file for 'godot'
pkgname=godot
-version=3.5
+version=3.4
revision=1
archs="x86_64* i686* aarch64* armv7* ppc64*"
wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
license="MIT"
homepage="https://www.godotengine.org/"
distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36
+checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
CFLAGS+=" -fPIE -fPIC"
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 79e6bcb07d23..738464c61ca0 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,7 +1,7 @@
# Template file for 'gpodder'
pkgname=gpodder
-version=3.11.0
-revision=1
+version=3.10.21
+revision=2
hostmakedepends="python3 intltool"
depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
@@ -14,7 +14,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/gpodder/gpodder"
distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=c96a3332e61e8277475497ec24fe0918c5cafc580a2f85fc7b34c2fd989873de
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
do_check() {
make releasetest
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 8e0947d775fb..4899fd5a1c38 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,8 +1,7 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
-reverts="5.1.0_1"
version=4.4.1
-revision=2
+revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
diff --git a/srcpkgs/hatch/template b/srcpkgs/hatch/template
index 52d222ae6c7d..5269561edf34 100644
--- a/srcpkgs/hatch/template
+++ b/srcpkgs/hatch/template
@@ -1,6 +1,6 @@
# Template file for 'hatch'
pkgname=hatch
-version=1.4.0
+version=1.3.1
revision=1
build_style=python3-pep517
# ignore backend tests, because updating hatchling when there is no new hatch
@@ -12,7 +12,7 @@ hostmakedepends="hatchling"
depends="python3-atomicwrites python3-click hatchling python3-httpx
python3-keyring python3-pexpect python3-platformdirs python3-pyperclip
python3-rich python3-tomli-w python3-tomlkit python3-userpath
- python3-virtualenv python3-hyperlink"
+ python3-virtualenv"
checkdepends="${depends} python3-pytest python3-pytest-mock
python3-pytest-xdist git python3-pip"
short_desc="Modern, extensible Python project management "
@@ -21,7 +21,7 @@ license="MIT"
homepage="https://hatch.pypa.io/latest/"
changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history.md"
distfiles="${PYPI_SITE}/h/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a1b06523cf66c759828f21145d8619044049b9ef660accef42d47612e7b7fda2
+checksum=fb1bdad4a22d3443137036b246898c5d3c7552ff4ba399b4605548cef0a22496
make_check_pre="env PYTHONPATH=./src"
post_install() {
diff --git a/srcpkgs/hwinfo/template b/srcpkgs/hwinfo/template
index e7510055d795..416261ae95bb 100644
--- a/srcpkgs/hwinfo/template
+++ b/srcpkgs/hwinfo/template
@@ -1,6 +1,6 @@
# Template file for 'hwinfo'
pkgname=hwinfo
-version=22.0
+version=21.82
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -13,7 +13,7 @@ maintainer="meator <meator.dev@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/openSUSE/hwinfo"
distfiles="https://github.com/openSUSE/hwinfo/archive/refs/tags/${version}.tar.gz"
-checksum=7ba4042f492e2337b6f18782737f6a5238841352d69457b128cbaf0e40ef2a6e
+checksum=b031dba3ad79676c11d7478ce3123a3551e6abf4b2262f0cc903d1bfedb8d4ee
disable_parallel_build=yes
if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+
+ const char *scope = NULL;
+- char *p = strchr(tmp, SCOPE_DELIMITER);
++ char *p = strchr(tmp, '%');
+ if (p) {
+ *p = '\0';
+ scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
index 56fc82e44277..aafe21aa9aa5 100644
--- a/srcpkgs/libnvme/template
+++ b/srcpkgs/libnvme/template
@@ -1,18 +1,17 @@
# Template file for 'libnvme'
pkgname=libnvme
-version=1.1
+version=1.0
revision=1
build_style=meson
configure_args="-Ddocs=man"
hostmakedepends="pkg-config swig"
makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
-checkdepends="perl"
short_desc="C Library for NVM Express on Linux"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://github.com/linux-nvme/libnvme"
distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
-checksum=d000181356513733671409c747c88826155b60f45f76e7289d6bbf27a8f851b0
+checksum=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807
libnvme-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/luarocks-lua53/template b/srcpkgs/luarocks-lua53/template
index a925d7ddd64d..9ab25a87f5ec 100644
--- a/srcpkgs/luarocks-lua53/template
+++ b/srcpkgs/luarocks-lua53/template
@@ -1,6 +1,6 @@
# Template file for 'luarocks-lua53'
pkgname=luarocks-lua53
-version=3.9.1
+version=3.7.0
revision=1
wrksrc=luarocks-${version}
build_style=configure
@@ -17,9 +17,8 @@ short_desc="${_desc} (5.3.x)"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://luarocks.org/"
-changelog="https://github.com/luarocks/luarocks/wiki/Release-history"
distfiles="https://luarocks.org/releases/luarocks-${version}.tar.gz"
-checksum=ffafd83b1c42aa38042166a59ac3b618c838ce4e63f4ace9d961a5679ef58253
+checksum=9255d97fee95cec5b54fc6ac718b11bf5029e45bed7873e053314919cd448551
alternatives="
luarocks:luarocks:/usr/bin/luarocks-5.3
luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.3"
diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index afae462569a2..4e495f3f5a20 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
# Template file for 'mcelog'
pkgname=mcelog
-version=185
+version=184
revision=1
archs="i686* x86_64*"
hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="http://www.mcelog.org/"
distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=594adaf9395e630de9c963350729b2c4f6354022aeac309c5aebdf57c4ff138b
+checksum=067d52006f0aa42045acc6d9c04d590362448bacd8ef415d42729e6f35825028
do_build() {
make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}
diff --git a/srcpkgs/mumble/files/mumble-server/log/run b/srcpkgs/mumble/files/mumble-server/log/run
deleted file mode 100644
index 6b01a89f5be9..000000000000
--- a/srcpkgs/mumble/files/mumble-server/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t murmur
diff --git a/srcpkgs/mumble/files/mumble-server/run b/srcpkgs/mumble/files/mumble-server/run
deleted file mode 100644
index ee17d0d1ed0d..000000000000
--- a/srcpkgs/mumble/files/mumble-server/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-[ -r ./conf ] && . ./conf
-exec chpst -u_murmur:_murmur mumble-server -fg -ini ${CONFIG_FILE:-/etc/murmur.ini} ${OPTS}
diff --git a/srcpkgs/mumble/patches/config.patch b/srcpkgs/mumble/patches/config.patch
deleted file mode 100644
index f85e1f1cefa8..000000000000
--- a/srcpkgs/mumble/patches/config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/murmur.ini
-+++ b/scripts/murmur.ini
-@@ -13,7 +13,7 @@
-
- ; Path to database. If blank, will search for
- ; murmur.sqlite in default locations or create it if not found.
--database=
-+database=/var/lib/murmur/murmur.sqlite
-
- ; Murmur defaults to using SQLite with its default rollback journal.
- ; In some situations, using SQLite's write-ahead log (WAL) can be
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 65f96a90f282..2d67fdfcac1d 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -29,25 +29,18 @@ build_options_default="jack portaudio"
export CMAKE_GENERATOR="Unix Makefiles"
post_install() {
- rm -f ${DESTDIR}/usr/share/man/man1/murmur-user-wrapper.1
- vconf scripts/murmur.ini
- vsv mumble-server
- ln -sf murmurd.1 ${DESTDIR}/usr/share/man/man1/mumble-server.1
+ vbin ${wrksrc}/scripts/murmur-user-wrapper
+ vsconf scripts/murmur.ini
vlicense LICENSE
}
murmur_package() {
- system_accounts="_murmur"
- _murmur_homedir="/var/lib/murmur"
- make_dirs="/var/lib/murmur 0750 _murmur _murmur"
- conf_files="/etc/murmur.ini"
- depends="qt5-plugin-sqlite"
short_desc+=" - Server software (mumble-server)"
pkg_install() {
- vmove etc/sv/mumble-server
- vmove etc/murmur.ini
vmove usr/bin/mumble-server
- vmove usr/share/man/man1/mumble-server.1
+ vmove usr/bin/murmur-user-wrapper
+ vmove usr/share/man/man1/murmur-user-wrapper.1
vmove usr/share/man/man1/murmurd.1
+ vmove usr/share/examples/mumble/murmur.ini
}
}
diff --git a/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
new file mode 100644
index 000000000000..ce7c74779e85
--- /dev/null
+++ b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
@@ -0,0 +1,21 @@
+This ensures that efficient capability checks are used on musl.
+
+--- a/fat-ppc.c
++++ b/fat-ppc.c
+@@ -42,12 +42,10 @@
+
+ #if defined(_AIX)
+ # include <sys/systemcfg.h>
+-#elif defined(__linux__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-# define USE_GETAUXVAL 1
+-# include <asm/cputable.h>
+-# include <sys/auxv.h>
+-# endif
++#elif defined(__linux__)
++# define USE_GETAUXVAL 1
++# include <asm/cputable.h>
++# include <sys/auxv.h>
+ #elif defined(__FreeBSD__)
+ # include <machine/cpu.h>
+ # ifdef PPC_FEATURE2_HAS_VEC_CRYPTO
diff --git a/srcpkgs/nettle/patches/ppc64-elfv2.patch b/srcpkgs/nettle/patches/ppc64-elfv2.patch
new file mode 100644
index 000000000000..22f76582e0e1
--- /dev/null
+++ b/srcpkgs/nettle/patches/ppc64-elfv2.patch
@@ -0,0 +1,22 @@
+Ensure that ELFv2 ABI is used on all ppc64, including big endian.
+
+--- a/powerpc64/machine.m4
++++ b/powerpc64/machine.m4
+@@ -1,7 +1,7 @@
+ define(`PROLOGUE',
+ `.globl C_NAME($1)
+ DECLARE_FUNC(C_NAME($1))
+-ifelse(WORDS_BIGENDIAN,no,
++ifelse(`no',`no',
+ `ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ C_NAME($1):
+ addis 2,12,(.TOC.-C_NAME($1))@ha
+@@ -17,7 +17,7 @@ ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ undefine(`FUNC_ALIGN')')
+
+ define(`EPILOGUE',
+-`ifelse(WORDS_BIGENDIAN,no,
++`ifelse(`no',`no',
+ `.size C_NAME($1), . - C_NAME($1)',
+ `.size .C_NAME($1), . - .C_NAME($1)
+ .size C_NAME($1), . - .C_NAME($1)')')
diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template
index 26b926bf9cbe..25eca0dcab04 100644
--- a/srcpkgs/nettle/template
+++ b/srcpkgs/nettle/template
@@ -1,6 +1,6 @@
# Template file for 'nettle'
pkgname=nettle
-version=3.8
+version=3.7.3
revision=1
build_style=gnu-configure
configure_args="--enable-shared"
@@ -10,9 +10,8 @@ short_desc="Low-level cryptographic library"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://www.lysator.liu.se/~nisse/nettle/"
-changelog="https://git.lysator.liu.se/nettle/nettle/-/raw/master/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7576c68481c198f644b08c160d1a4850ba9449e308069455b5213319f234e8e6
+checksum=661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0
nettle-devel_package() {
depends="gmp-devel ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index 89175e29a449..c58b411bcdab 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -1,33 +1,36 @@
# Template file for 'nilfs-utils'
pkgname=nilfs-utils
-version=2.2.9
+version=2.2.8
revision=1
build_style=gnu-configure
-configure_args="--without-selinux"
+configure_args="--sbindir=/usr/bin --enable-libmount"
make_install_args="sbindir=/usr/bin"
-makedepends="libblkid-devel libmount-devel libuuid-devel"
+hostmakedepends="automake libtool"
+makedepends="libuuid-devel libmount-devel"
conf_files="/etc/nilfs_cleanerd.conf"
short_desc="Log-structured file system for Linux - userspace utils"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
-homepage="https://nilfs.sourceforge.io/"
-distfiles="https://nilfs.sourceforge.io/download/${pkgname}-${version}.tar.bz2"
-checksum=5df63998c2084182c8c608a29b47b1771b825b4b5fa7916c12cca2fcb7577a97
+homepage="http://nilfs.sourceforge.net/"
+distfiles="http://nilfs.sourceforge.net/download/$pkgname-$version.tar.bz2"
+checksum=5a29f8f59db03edf8dd1e68dfd80ff4713e0aa184cfa83a6326ac8af93d9bda6
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin/
}
libnilfs_package() {
- short_desc="${short_desc/utils/libraries}"
+ short_desc="NILFS userspace runtime libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
}
}
-
nilfs-utils-devel_package() {
depends="${makedepends} libnilfs>=${version}_${revision}"
- short_desc="${short_desc/utils/development files}"
+ short_desc="NILFS userspace development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index f45eae77b031..d85963d3f6c6 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
# Template file for 'nspr'
pkgname=nspr
-version=4.34.1
+version=4.34
revision=1
build_wrksrc=nspr
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="http://www.mozilla.org/projects/nspr/"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=c5b8354c48b632b8f4c1970628146c0e0c0ca8f32c7315d7d5736c002e03774f
+checksum=beef011cd15d8f40794984d17014366513cec5719bf1a78f5e8a3e3a1cebf99c
CFLAGS="-D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
diff --git a/srcpkgs/nvme-cli/patches/musl.patch b/srcpkgs/nvme-cli/patches/musl.patch
new file mode 100644
index 000000000000..4ebfba11d38f
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/musl.patch
@@ -0,0 +1,18 @@
+commit ddf3610e8326d014360c9550d54a73f97b40e862
+Author: q66 <daniel@octaforge.org>
+Date: Wed Apr 27 04:20:41 2022 +0200
+
+ fix build on musl
+
+diff --git a/util/base64.c b/util/base64.c
+index e386c11..dad4492 100644
+--- a/util/base64.c
++++ b/util/base64.c
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <sys/types.h>
+
+ static const char base64_table[65] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index fb64fece0644..d4e7bc892403 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,6 +1,6 @@
# Template file for 'nvme-cli'
pkgname=nvme-cli
-version=2.1.1
+version=2.0
revision=1
build_style=meson
configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
@@ -11,7 +11,7 @@ maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-2.0-only"
homepage="http://nvmexpress.org"
distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=cc8bd36b9aa71243e2bace238aa5505244fef3fef5418b0c61f75d1988458272
+checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
conf_files="/etc/nvme/*.conf"
if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
diff --git a/srcpkgs/perl-Sub-HandlesVia/template b/srcpkgs/perl-Sub-HandlesVia/template
index c76976791ab3..adb6d69553b2 100644
--- a/srcpkgs/perl-Sub-HandlesVia/template
+++ b/srcpkgs/perl-Sub-HandlesVia/template
@@ -1,6 +1,6 @@
# Template file for 'perl-Sub-HandlesVia'
pkgname=perl-Sub-HandlesVia
-version=0.034
+version=0.033
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Sub-HandlesVia"
distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-${version}.tar.gz"
-checksum=7c6865f664782af1418ef1a0c112901e331f166f9a9550104d9d32a84ac80515
+checksum=b003821f30007dad977d7a8a93ae27d5563a746f955a8471a6d004447678198d
diff --git a/srcpkgs/python3-cached-property/template b/srcpkgs/python3-cached-property/template
index 6978a26349e7..7d088f3cd023 100644
--- a/srcpkgs/python3-cached-property/template
+++ b/srcpkgs/python3-cached-property/template
@@ -1,7 +1,7 @@
# Template file for 'python3-cached-property'
pkgname=python3-cached-property
-version=1.5.2
-revision=1
+version=1.5.1
+revision=5
wrksrc="cached-property-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,9 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/pydanny/cached-property"
distfiles="${PYPI_SITE}/c/cached-property/cached-property-${version}.tar.gz"
-checksum=9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130
-# upstream testcode use @coroutine
-make_check=no
+checksum=9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index ce3721e75092..f5593aa78c6b 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
# Template file for 'python3-virtualenv'
pkgname=python3-virtualenv
-version=20.16.3
+version=20.15.1
revision=1
wrksrc="virtualenv-${version}"
build_style=python3-module
@@ -8,18 +8,18 @@ hostmakedepends="python3-setuptools_scm"
depends="python3-setuptools python3-platformdirs python3-distlib python3-filelock python3-six"
checkdepends="python3-pytest-mock python3-flaky python3-devel python3-pip $depends"
short_desc="Virtual Python environment builder"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="MIT"
homepage="https://virtualenv.pypa.io/"
changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=d86ea0bb50e06252d79e6c241507cb904fcd66090c3271381372d6221a3970f9
+checksum=288171134a2ff3bfb1a2f54f119e77cd1b81c29fc1265a2356f3e8d14c7d58c4
alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
do_check() {
- # excluded tests depend on pytest-freezegun, not packaged in Void, or python2
+ # excluded tests depend on pytest-freezegun, not packaged in Void
vsed -e '/addopts/d' -i setup.cfg
- PYTHONPATH=src python3 -m pytest -k 'not (test_periodic_update or test_get_wheel_download_cached or test_py_pyc_missing)'
+ PYTHONPATH=src python3 -m pytest -k 'not (test_periodic_update or test_get_wheel_download_cached)'
}
post_install() {
diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index bae644840887..f89a4cd5ad5c 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
configure_args="$(vopt_with gtk3)"
hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel)
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
depends="hicolor-icon-theme desktop-file-utils"
short_desc="Multi-panel tabbed file manager"
diff --git a/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch b/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
deleted file mode 100644
index d048d1238d6e..000000000000
--- a/srcpkgs/thunderbird/patches/ROOT_CLIP_CHAIN.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: FreeBSD
---- a/gfx/webrender_bindings/webrender_ffi.h.orig 2022-05-23 17:12:36 UTC
-+++ b/gfx/webrender_bindings/webrender_ffi.h
-@@ -77,8 +77,6 @@ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpo
- struct WrPipelineIdAndEpoch;
- using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
-
--const uint64_t ROOT_CLIP_CHAIN = ~0;
--
- } // namespace wr
- } // namespace mozilla
-
diff --git a/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch b/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
deleted file mode 100644
index 6af2f0266a2f..000000000000
--- a/srcpkgs/vala-panel-appmenu/patches/no-gtk2.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/subprojects/appmenu-gtk-module/meson_options.txt
-+++ b/subprojects/appmenu-gtk-module/meson_options.txt
-@@ -1,3 +1,3 @@
--option('gtk', type: 'array', choices : ['2','3'], value: ['2','3'], description: 'Supported GTK versions')
-+option('gtk', type: 'array', choices : ['2','3'], value: ['3'], description: 'Supported GTK versions')
- option('tests', type : 'boolean', value : false, description: 'Parser tests')
- option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference')
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index a564cd99f232..6a9e874d1723 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -7,7 +7,7 @@ _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
build_style=meson
configure_args="-Dprint_trace=false"
hostmakedepends="pkg-config wayland-devel"
-makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel
+makedepends="wf-config-devel wlroots-devel cairo-devel
$(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
depends="xorg-server-xwayland"
short_desc="3D wayland compositor"
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index b517c10c98ca..4eb882a6c22e 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -11,8 +11,7 @@ makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel
pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel
poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel
libinput-devel libxcb-devel libXcursor-devel colord-devel dbus-devel
- $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel)
- libevdev-devel"
+ $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel)"
short_desc="Reference implementation of a Wayland compositor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/xarchiver/patches/doubleclick.patch b/srcpkgs/xarchiver/patches/doubleclick.patch
deleted file mode 100644
index aaac2c6b16e0..000000000000
--- a/srcpkgs/xarchiver/patches/doubleclick.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From f245d8714690af30064a2e5ec94bd2374288c2b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
-Date: Sat, 2 Jul 2022 23:47:36 +0200
-Subject: [PATCH 1/2] Simplify code
-
-The state of the modifier keys is available in event->state.
----
- src/window.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/window.c b/src/window.c
-index 1ec0e02c..e9760386 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -2620,11 +2620,7 @@ gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *even
-
- if (event->button == 1)
- {
-- GdkModifierType state;
--
-- gdk_event_get_state((GdkEvent *) event, &state);
--
-- if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
-+ if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
- return TRUE;
- else
- return FALSE;
-
-From 5d18fd23e8242678dbe47c232bc60b47f8fd75b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= <ib@wupperonline.de>
-Date: Sat, 2 Jul 2022 23:51:40 +0200
-Subject: [PATCH 2/2] Re-enable left mouse button double clicks
-
-Check the time between two left mouse button clicks and if they are
-fast enough, fake a double-click event.
-
-Left mouse button double clicks have been unintentionally disabled by
-the change in commit e81d108c429e29b13ef1759c05033a6f3c645ac1 in order
-to allow dragging of multiple rows.
-
-This fixes github issue #148, reported by aianson.
----
- src/window.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/window.c b/src/window.c
-index e9760386..b9591aed 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -2597,6 +2597,7 @@ void xa_location_entry_activated (GtkEntry *entry,gpointer user_data)
-
- gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *event, XArchive *archive)
- {
-+ static guint32 last_button1;
- XEntry *entry;
- GtkTreePath *path;
- GtkTreeIter iter;
-@@ -2620,10 +2621,17 @@ gboolean xa_treeview_mouse_button_press (GtkWidget *widget, GdkEventButton *even
-
- if (event->button == 1)
- {
-+ if (event->time - last_button1 > 250)
-+ {
-+ last_button1 = event->time;
-+
- if (gtk_tree_selection_iter_is_selected(selection, &iter) && ((event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0))
- return TRUE;
- else
- return FALSE;
-+ }
-+ else
-+ event->button = 2;
- }
-
- if (!gtk_tree_selection_iter_is_selected(selection, &iter))
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index c0403f69ac47..56c781bea0dd 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,7 +1,7 @@
# Template file for 'xarchiver'
pkgname=xarchiver
version=0.5.4.18
-revision=2
+revision=1
build_style=gnu-configure
configure_args="--disable-doc --enable-gtk2=no"
hostmakedepends="pkg-config intltool"
diff --git a/srcpkgs/xournal b/srcpkgs/xournal
deleted file mode 120000
index f050a0a34269..000000000000
--- a/srcpkgs/xournal
+++ /dev/null
@@ -1 +0,0 @@
-xournalpp
\ No newline at end of file
diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
new file mode 100644
index 000000000000..36f11cead862
--- /dev/null
+++ b/srcpkgs/xournal/template
@@ -0,0 +1,22 @@
+# Template file for 'xournal'
+pkgname=xournal
+version=0.4.8.2016
+revision=4
+build_style=gnu-configure
+make_install_args="desktop-install"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
+depends="hicolor-icon-theme desktop-file-utils ghostscript"
+short_desc="GPL Notetaking, sketching, and journal-keeping"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://xournal.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+ vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+ vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+ po/Makefile.in.in
+}
diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index 769d103e6459..e235dcfe40fb 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
# Template file for 'xournalpp'
pkgname=xournalpp
version=1.1.1
-revision=2
+revision=1
build_style=cmake
hostmakedepends="pkg-config gettext"
makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel
@@ -21,9 +21,3 @@ fi
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" libexecinfo-devel";;
esac
-
-xournal_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
diff --git a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch b/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
deleted file mode 100644
index 53b76fe358cb..000000000000
--- a/srcpkgs/zathura-pdf-mupdf/patches/mupdf-1.20.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-from https://gitlab.alpinelinux.org/alpine/aports/-/commit/5c2d1886fdead7c00a00ddcd5d04aaa8d1f53377
---- a/zathura-pdf-mupdf/search.c
-+++ b/zathura-pdf-mupdf/search.c
-@@ -41,7 +41,7 @@
-
- fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS, fz_quad);
- int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
-- text, hit_bbox, N_SEARCH_RESULTS);
-+ text, NULL, hit_bbox, N_SEARCH_RESULTS);
-
- fz_rect r;
- for (int i = 0; i < num_results; i++) {
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (18 preceding siblings ...)
2022-08-10 7:59 ` ajtcode71
@ 2022-08-10 8:01 ` ajtcode71
2022-08-10 8:01 ` ajtcode71
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-10 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
New comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1210306557
Comment:
> So, I haven't updated the package to `4.0.0` because things tend to break on major versions with darktable. I have `4.0.0` running locally, but there are hand full of small issues I didn't want everyone else to experience. I'd rather wait for a `4.0.1`.
>
> Sorry I didn't see this earlier. Please @ me next time.
Ok no problem.. Should I close this PR?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (19 preceding siblings ...)
2022-08-10 8:01 ` ajtcode71
@ 2022-08-10 8:01 ` ajtcode71
2022-08-10 8:43 ` paper42
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ajtcode71 @ 2022-08-10 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
New comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1210306557
Comment:
> So, I haven't updated the package to `4.0.0` because things tend to break on major versions with darktable. I have `4.0.0` running locally, but there are hand full of small issues I didn't want everyone else to experience. I'd rather wait for a `4.0.1`.
>
> Sorry I didn't see this earlier. Please @ me next time.
@lemmi
Ok no problem.. Should I close this PR?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (20 preceding siblings ...)
2022-08-10 8:01 ` ajtcode71
@ 2022-08-10 8:43 ` paper42
2022-08-11 0:49 ` lemmi
2022-08-11 0:49 ` [PR PATCH] [Closed]: " lemmi
23 siblings, 0 replies; 25+ messages in thread
From: paper42 @ 2022-08-10 8:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1210355209
Comment:
This PR touches unrelated files, please fix that and make sure that it contains only one commit with the correct commit message
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (21 preceding siblings ...)
2022-08-10 8:43 ` paper42
@ 2022-08-11 0:49 ` lemmi
2022-08-11 0:49 ` [PR PATCH] [Closed]: " lemmi
23 siblings, 0 replies; 25+ messages in thread
From: lemmi @ 2022-08-11 0:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 748 bytes --]
New comment by lemmi on void-packages repository
https://github.com/void-linux/void-packages/pull/38336#issuecomment-1211445421
Comment:
@ajtcode71 If you don't mind, I'd rather have this closed. It's also missing the lensfun update to go along side. I usually keep an eye on darktable, as regularly use it myself.
I pushed what I use to my branches, if you want to build it locally:
https://github.com/lemmi/void-packages/tree/darktable
https://github.com/lemmi/void-packages/tree/lensfun
Couple of issues I had, that held up the update:
- segfaults on website export
- avif image support still not working
- random crashes I wasn't able to reproduce
Sorry I didn't catch this earlier and if this caused unnecessary work for you.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Closed]: darktable: update to 4.0.0
2022-07-28 15:22 [PR PATCH] New Version 4.0.0 - Test compiled amd64 and aarch64 ajtcode71
` (22 preceding siblings ...)
2022-08-11 0:49 ` lemmi
@ 2022-08-11 0:49 ` lemmi
23 siblings, 0 replies; 25+ messages in thread
From: lemmi @ 2022-08-11 0:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
There's a closed pull request on the void-packages repository
darktable: update to 4.0.0
https://github.com/void-linux/void-packages/pull/38336
Description:
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, AMD64-LIBC
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64 (crossbuild)
^ permalink raw reply [flat|nested] 25+ messages in thread