* [PR PATCH] ne: update to 3.2
@ 2022-10-04 11:01 tpar2911
2022-10-04 12:02 ` Duncaen
` (17 more replies)
0 siblings, 18 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 11:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
There is a new pull request by tpar2911 against master on the void-packages repository
https://github.com/tpar2911/void-packages ne
https://github.com/void-linux/void-packages/pull/39699
ne: update to 3.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39699.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ne-39699.patch --]
[-- Type: text/x-diff, Size: 991 bytes --]
From 30c91a4fd00578cf2a6361c6cbc01e6e16c225bc Mon Sep 17 00:00:00 2001
From: tpar2911 <tadej.paris@protonmail.com>
Date: Tue, 4 Oct 2022 12:22:55 +0200
Subject: [PATCH] ne: update to 3.2
---
srcpkgs/ne/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf40..ca08ce21c150 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
# Template file for 'ne'
pkgname=ne
-version=3.3.1
+version=3.3.2
revision=1
build_style=gnu-makefile
hostmakedepends="perl texinfo"
@@ -12,6 +12,7 @@ homepage="http://ne.di.unimi.it/"
changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
do_build() {
make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
@ 2022-10-04 12:02 ` Duncaen
2022-10-04 12:02 ` Duncaen
` (16 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Duncaen @ 2022-10-04 12:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1266884631
Comment:
The commit title should be `ne: update to 3.3.2.`, the checksum is also wrong, not sure how this would be able to build.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
2022-10-04 12:02 ` Duncaen
@ 2022-10-04 12:02 ` Duncaen
2022-10-04 17:42 ` [PR PATCH] [Updated] " tpar2911
` (15 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Duncaen @ 2022-10-04 12:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1266884631
Comment:
The commit title should be `ne: update to 3.3.2.`, the checksum was changed wrong, not sure how this would be able to build.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
2022-10-04 12:02 ` Duncaen
2022-10-04 12:02 ` Duncaen
@ 2022-10-04 17:42 ` tpar2911
2022-10-04 17:43 ` tpar2911
` (14 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
There is an updated pull request by tpar2911 against master on the void-packages repository
https://github.com/tpar2911/void-packages ne
https://github.com/void-linux/void-packages/pull/39699
ne: update to 3.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39699.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ne-39699.patch --]
[-- Type: text/x-diff, Size: 25851 bytes --]
From 30c91a4fd00578cf2a6361c6cbc01e6e16c225bc Mon Sep 17 00:00:00 2001
From: tpar2911 <tadej.paris@protonmail.com>
Date: Tue, 4 Oct 2022 12:22:55 +0200
Subject: [PATCH 01/19] ne: update to 3.2
---
srcpkgs/ne/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf40..ca08ce21c150 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
# Template file for 'ne'
pkgname=ne
-version=3.3.1
+version=3.3.2
revision=1
build_style=gnu-makefile
hostmakedepends="perl texinfo"
@@ -12,6 +12,7 @@ homepage="http://ne.di.unimi.it/"
changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
do_build() {
make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
From 363e66c389fc01bc6f645df1a05c0d7e82aef425 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 4 Oct 2022 08:54:07 +0200
Subject: [PATCH 02/19] ioping: update to 1.3.
---
srcpkgs/ioping/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ioping/template b/srcpkgs/ioping/template
index 43a2cfd652f1..0adaf0ab06ae 100644
--- a/srcpkgs/ioping/template
+++ b/srcpkgs/ioping/template
@@ -1,6 +1,6 @@
# Template file for 'ioping'
pkgname=ioping
-version=1.2
+version=1.3
revision=1
build_style=gnu-makefile
short_desc="Simple disk I/O latency measuring tool"
@@ -8,7 +8,7 @@ maintainer="teldra <teldra@rotce.de>"
license="GPL-3.0-or-later"
homepage="https://github.com/koct9i/ioping/"
distfiles="https://github.com/koct9i/ioping/archive/v${version}.tar.gz"
-checksum=d3e4497c653a1e96df67c72ce2b70da18e9f5e3b93179a5bb57a6e30ceacfa75
+checksum=7aa48e70aaa766bc112dea57ebbe56700626871052380709df3a26f46766e8c8
do_install() {
vbin ioping
From 94d912a4ed545325adb8dbef7085f3011542238b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 4 Oct 2022 10:48:06 +0200
Subject: [PATCH 03/19] yt-dlp: update to 2022.10.04.
---
srcpkgs/yt-dlp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index fb8d8be82bb1..22ab525add6c 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
# Template file for 'yt-dlp'
pkgname=yt-dlp
-version=2022.09.01
+version=2022.10.04
revision=1
wrksrc="$pkgname"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
homepage="https://github.com/yt-dlp/yt-dlp"
changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=675ff266e9400c47bb4df947ab3e7d5e9d4c362abcadd2c61ba341e86590f1df
+checksum=bd3cf6413cd92a400ff015633372a1454906414226f924b57c1f5826b9abc1a8
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 94bc52995267e57a9fc04be85efb040a6234e395 Mon Sep 17 00:00:00 2001
From: onli <onli@paskuda.biz>
Date: Mon, 3 Oct 2022 21:28:09 +0200
Subject: [PATCH 04/19] minitube: update to 3.9.3
---
srcpkgs/minitube/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template
index 528e8fa1b0db..915458a43a6a 100644
--- a/srcpkgs/minitube/template
+++ b/srcpkgs/minitube/template
@@ -1,6 +1,6 @@
# Template file for 'minitube'
pkgname=minitube
-version=3.9.1
+version=3.9.3
revision=1
build_style=qmake
hostmakedepends="qt5-tools qt5-host-tools qt5-qmake git"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://flavio.tordini.org/minitube"
distfiles="https://github.com/flaviotordini/minitube/releases/download/${version}/minitube-${version}.tar.bz2"
-checksum=7063d3db599c0c9c3ddfea39a14cf708bd5bc9ff1dbb66acb4bd1eb1b7a86a47
+checksum=0e2e70ff366218353f145a48fb1cc65def540a47082485dc918f8dab904a648c
pre_configure() {
# Provided by Gottox
From 35c996707a4636b5c8a944dfc1e0e027e296b7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 4 Oct 2022 10:15:13 +0200
Subject: [PATCH 05/19] arti: update to 1.0.1.
---
srcpkgs/arti/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index be5d565ec77f..0705b6d938b2 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,6 +1,6 @@
# Template file for 'arti'
pkgname=arti
-version=1.0.0
+version=1.0.1
revision=1
wrksrc="arti-arti-v${version}"
build_style=cargo
@@ -14,7 +14,7 @@ license="Apache-2.0, MIT"
homepage="https://gitlab.torproject.org/tpo/core/arti"
changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=4aa5f2f8ce98b913a843542f26895b2f4819829fa3dec9082fa1e8da5e274267
+checksum=9a326c820144f26999abe987273910ccfc5e0bb6843d5c2c59905eb46e38a980
if [ "$XBPS_CHECK_PKGS" ]; then
case "$XBPS_TARGET_MACHINE" in
From 7b260fa20d37db43d6a4f212383169c3483d8fbf Mon Sep 17 00:00:00 2001
From: Wrath <39569621+wrathgewp@users.noreply.github.com>
Date: Tue, 4 Oct 2022 11:09:11 +0200
Subject: [PATCH 06/19] nextcloud-client: update to 3.6.0
fixed revision number
---
srcpkgs/nextcloud-client/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 857663ac7427..3a233ce58192 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,6 +1,6 @@
# Template file for 'nextcloud-client'
pkgname=nextcloud-client
-version=3.5.4
+version=3.6.0
revision=1
wrksrc="desktop-${version}"
build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://nextcloud.com/clients/"
changelog="https://github.com/nextcloud/desktop/releases"
distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=f6222403063f83d52577ab4c53060eec8d0dc499e56975e44767b53d9b6e896f
+checksum=d7c1d3f6a867566c1f9a629c8c0d954ba69ebc4107c0faa975a1ccf42842d0df
# https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
make_check=ci-skip
From 6055baddff4102ac20f2e936ce7159cb8611c265 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 4 Oct 2022 08:41:52 +0200
Subject: [PATCH 07/19] py3status: update to 3.47.
---
srcpkgs/py3status/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index ed167bce6825..5d749a93034f 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
# Template file for 'py3status'
pkgname=py3status
-version=3.45
+version=3.47
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://github.com/ultrabug/py3status"
changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9221e47591f5f167ed9ab053f1967114458afd9bcc28f90a3339ce44a7b5d0a5
+checksum=fb29a3c6bdf14b426350d81984416e33c82f02a5aac916ca0a16be17b5a9c98f
post_install() {
vlicense LICENSE
From b57ce55603daeb920193461e1aedd7e58e3ca484 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 4 Oct 2022 08:49:54 +0200
Subject: [PATCH 08/19] hdparm: update to 9.65.
---
srcpkgs/hdparm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template
index 7f2cef9558a7..cde340c77084 100644
--- a/srcpkgs/hdparm/template
+++ b/srcpkgs/hdparm/template
@@ -1,6 +1,6 @@
# Template file for 'hdparm'
pkgname=hdparm
-version=9.64
+version=9.65
revision=1
build_style=gnu-makefile
make_install_args="exec_prefix=/usr sbindir=/usr/bin"
@@ -9,7 +9,7 @@ maintainer="teldra <teldra@rotce.de>"
license="0BSD" # Upstream is very unclear and names their stuff 'bsd-style'
homepage="https://sourceforge.net/projects/hdparm/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=315b956951c3fea027287de204381534217c0bd0f37b4935877fe2db0cab859a
+checksum=d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b
post_install() {
vlicense LICENSE.TXT
From da7947cf4296b433ea974880cdffb151fc2dcabc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Oct 2022 08:17:43 -0400
Subject: [PATCH 09/19] python3-psycopg: update to 3.1.2.
---
srcpkgs/python3-psycopg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-psycopg/template b/srcpkgs/python3-psycopg/template
index ca04d790e1c6..18f9be7c88a7 100644
--- a/srcpkgs/python3-psycopg/template
+++ b/srcpkgs/python3-psycopg/template
@@ -1,6 +1,6 @@
# Template file for 'python3-psycopg'
pkgname=python3-psycopg
-version=3.1.1
+version=3.1.2
revision=1
wrksrc="psycopg-${version}"
build_style=python3-module
@@ -12,5 +12,5 @@ license="LGPL-3.0-or-later"
homepage="https://www.psycopg.org"
changelog="https://raw.githubusercontent.com/psycopg/psycopg/master/docs/news.rst"
distfiles="${PYPI_SITE}/p/psycopg/psycopg-${version}.tar.gz"
-checksum=3ee0af9cf944d9579441c15702835a949788b5a57894823f0a916c2598c96f40
+checksum=57b356b1dc86a45f0a6388ca6fde77360639eb24c9aae033ee8fbbed713dce79
make_check=no # requires running postgres server on system
From 6df5a8c290989dc3f8ed4a5821ffe8bcb70762ba Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Oct 2022 08:33:35 -0400
Subject: [PATCH 10/19] python3-Werkzeug: add missing dependency
python3-MarkupSafe.
---
srcpkgs/python3-Werkzeug/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
index cc74734ba4f8..4fdf52d46b6b 100644
--- a/srcpkgs/python3-Werkzeug/template
+++ b/srcpkgs/python3-Werkzeug/template
@@ -1,12 +1,12 @@
# Template file for 'python3-Werkzeug'
pkgname=python3-Werkzeug
version=2.2.2
-revision=1
+revision=2
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-pytest python3-hypothesis python3-requests python3-MarkupSafe"
+depends="python3-MarkupSafe"
+checkdepends="python3-pytest python3-hypothesis python3-requests ${depends}"
short_desc="Swiss Army knife of Python web development (Python3)"
maintainer="Markus Berger <pulux@pf4sh.de>"
license="BSD-3-Clause"
From 0c6dd26f368f626eeb02256a385a59556615e86e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Oct 2022 08:52:45 -0400
Subject: [PATCH 11/19] python3-responses: update to 0.21.0.
---
srcpkgs/python3-responses/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
index f788069a9fd2..4201a852e51c 100644
--- a/srcpkgs/python3-responses/template
+++ b/srcpkgs/python3-responses/template
@@ -1,17 +1,17 @@
# Template file for 'python3-responses'
pkgname=python3-responses
-version=0.16.0
+version=0.21.0
revision=1
wrksrc="responses-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-requests python3-urllib3 python3-six"
+depends="python3-requests python3-urllib3"
short_desc="Utility for mocking out the Python Requests library"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="Apache-2.0"
homepage="https://github.com/getsentry/responses"
changelog="https://raw.githubusercontent.com/getsentry/responses/master/CHANGES"
distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
-checksum=a2e3aca2a8277e61257cd3b1c154b1dd0d782b1ae3d38b7fa37cbe3feb531791
+checksum=b82502eb5f09a0289d8e209e7bad71ef3978334f56d09b444253d5ad67bf5253
# testing requires unpackaged plugin pytest-localserver
make_check=no
From 74ebfa90e6ca9d37e6b5df6a70a67638586960b7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Oct 2022 09:05:13 -0400
Subject: [PATCH 12/19] python3-confuse: update to 2.0.0.
---
srcpkgs/python3-confuse/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
index 05a9764fa7e5..f922b75e0da5 100644
--- a/srcpkgs/python3-confuse/template
+++ b/srcpkgs/python3-confuse/template
@@ -1,10 +1,10 @@
# Template file for 'python3-confuse'
pkgname=python3-confuse
-version=1.7.0
+version=2.0.0
revision=1
wrksrc="confuse-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
depends="python3-yaml"
checkdepends="${depends} python3-pytest"
short_desc="Painless YAML config files for Python"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://github.com/beetbox/confuse"
changelog="https://raw.githubusercontent.com/beetbox/confuse/master/docs/changelog.rst"
distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
-checksum=c9fe8474516a62397f8e52fcf89547bb2f2737b1a4a6f6dec11a286f0b3a7401
+checksum=acc57c45ec2a9850a90fe7c29812bbdd8405e48a49c1a22899df915d0aca941f
post_install() {
vlicense LICENSE
From 072f2a7d20986fa75fd687843b503ba74786c867 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 4 Oct 2022 09:21:45 -0500
Subject: [PATCH 13/19] perl-Test-Most: update to 0.38.
---
srcpkgs/perl-Test-Most/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Test-Most/template b/srcpkgs/perl-Test-Most/template
index 7683e70b18b7..bcac0bd3575b 100644
--- a/srcpkgs/perl-Test-Most/template
+++ b/srcpkgs/perl-Test-Most/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Test-Most'
pkgname=perl-Test-Most
-version=0.37
-revision=2
+version=0.38
+revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Test-Most"
distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=533370141eb9f18cf4ac380f6ded2ab57802a6e184008a80fd2304bfcc474fc7
+checksum=089eb894f7bace4c37c6334e0e290eb20338ee10223af0c82cbe7281c78382df
From a821f5e7cd391ef4729cd4779a02cd7d96b3cc5c Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 4 Oct 2022 09:23:48 -0500
Subject: [PATCH 14/19] perl-Test-Simple: update to 1.302191.
---
srcpkgs/perl-Test-Simple/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index a3335a267f3f..31e9c94393f9 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -1,6 +1,6 @@
# Template file for 'perl-Test-Simple'
pkgname=perl-Test-Simple
-version=1.302190
+version=1.302191
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Test-Simple"
distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=fbb15226f1c605c4466a8c6ba02030083d54333d34fa76c02549cae7014c3a0e
+checksum=a82f652bc4f2ef1ddcae99d04fc0f8924a35386066a2ab363aabf8372bc5a7ab
From f515cc8452711861d7ed7549c85e8c4293f698c5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 4 Oct 2022 19:41:44 +0530
Subject: [PATCH 15/19] python3-chess: update to 1.9.3.
---
srcpkgs/python3-chess/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-chess/template b/srcpkgs/python3-chess/template
index c16874544d79..9c531f470236 100644
--- a/srcpkgs/python3-chess/template
+++ b/srcpkgs/python3-chess/template
@@ -1,6 +1,6 @@
# Template file for 'python3-chess'
pkgname=python3-chess
-version=1.9.2
+version=1.9.3
revision=1
wrksrc="python-chess-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/niklasf/python-chess"
changelog="https://raw.githubusercontent.com/niklasf/python-chess/master/CHANGELOG.rst"
distfiles="https://github.com/niklasf/python-chess/archive/refs/tags/v${version}.tar.gz"
-checksum=05d35036b1f4d8ad9bb9f7b471e38d21790a068a1654974fbc633e764256a894
+checksum=0fa325c1944b7781996ff66e3b5056a5e5d3c33c8200b9279493d8054a3a0502
From 333cdd6ad4cb9556f3526470866340fe87cd8fd1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Sep 2022 01:29:51 +0530
Subject: [PATCH 16/19] python3-keyring: update to 23.9.3.
Adopt.
---
srcpkgs/python3-keyring/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 35b44a7380a2..908e160000ec 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,20 +1,19 @@
# Template file for 'python3-keyring'
pkgname=python3-keyring
-version=23.7.0
+version=23.9.3
revision=1
wrksrc="keyring-${version}"
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
-depends="python3-SecretStorage"
-checkdepends="python3-pytest
- python3-pytest-flake8 python3-pytest-cov"
+depends="python3-SecretStorage python3-jeepney python3-jaraco.classes"
+checkdepends="${depends} python3-pytest-xdist"
short_desc="Python interface to the system keyring service"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jaraco/keyring"
changelog="https://raw.githubusercontent.com/jaraco/keyring/master/CHANGES.rst"
distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=782e1cd1132e91bf459fcd243bcf25b326015c1ac0b198e4408f91fa6791062b
+checksum=69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5
post_install() {
vlicense LICENSE
From 3cbd3a09ab020fcfd9c7de20577fb2b0f4f3b26b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 24 Sep 2022 01:34:48 +0530
Subject: [PATCH 17/19] coursera-dl: patch for python3>=3.9
---
.../patches/fix-upstream-issue-778.patch | 48 +++++++++++++++++++
srcpkgs/coursera-dl/template | 8 ++--
2 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
diff --git a/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch b/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
new file mode 100644
index 000000000000..659d936a9c43
--- /dev/null
+++ b/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
@@ -0,0 +1,48 @@
+From c8796e567698be166cb15f54e095140c1a9b567e Mon Sep 17 00:00:00 2001
+From: "Heino H. Gehlsen" <heino@gehlsen.dk>
+Date: Sun, 27 Dec 2020 13:28:35 +0100
+Subject: [PATCH] Fix AttributeError: 'HTMLParser' object has no attribute
+ 'unescape'
+
+https://github.com/coursera-dl/coursera-dl/pull/789
+---
+ coursera/utils.py | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/coursera/utils.py b/coursera/utils.py
+index 9ba577af..f271bb9f 100644
+--- a/coursera/utils.py
++++ b/coursera/utils.py
+@@ -21,7 +21,11 @@
+
+ import six
+ from six import iteritems
+-from six.moves import html_parser
++if six.PY34:
++ import html
++else:
++ from six.moves import html_parser
++ html = html_parser.HTMLParser()
+ from six.moves.urllib.parse import ParseResult
+ from six.moves.urllib_parse import unquote_plus
+
+@@ -98,8 +102,7 @@ def random_string(length):
+
+
+ def unescape_html(s):
+- h = html_parser.HTMLParser()
+- s = h.unescape(s)
++ s = html.unescape(s)
+ s = unquote_plus(s)
+ return unescape(s, HTML_UNESCAPE_TABLE)
+
+@@ -114,8 +117,7 @@ def clean_filename(s, minimal_change=False):
+ """
+
+ # First, deal with URL encoded strings
+- h = html_parser.HTMLParser()
+- s = h.unescape(s)
++ s = html.unescape(s)
+ s = unquote_plus(s)
+
+ # Strip forbidden characters
diff --git a/srcpkgs/coursera-dl/template b/srcpkgs/coursera-dl/template
index 9c569678e49c..a79cecd680d1 100644
--- a/srcpkgs/coursera-dl/template
+++ b/srcpkgs/coursera-dl/template
@@ -1,16 +1,16 @@
# Template file for 'coursera-dl'
pkgname=coursera-dl
version=0.11.5
-revision=3
+revision=4
build_style=python3-module
-pycompile_module="coursera"
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-setuptools python3-pyasn1 python3-ConfigArgParse
python3-BeautifulSoup4 python3-requests python3-six python3-keyring
python3-urllib3"
+checkdepends="${depends} python3-keyrings-alt python3-mock python3-pytest-xdist"
short_desc="Script for downloading Coursera.org videos and naming them"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="https://github.com/coursera-dl/coursera-dl"
-distfiles="${PYPI_SITE}/c/coursera-dl/coursera-dl-${version}.tar.gz"
-checksum=66a84558dfcfcbdc487dcabcfc0d7c4a8569cc604b051b1d51bc95d52a369745
+distfiles="https://github.com/coursera-dl/coursera-dl/archive/refs/tags/${version}.tar.gz"
+checksum=27e382435084ec91ef89ab6c1d46f4756b708e4badf5307a8f18b9ad31971014
From 827d4e7edddb5a2b24cc7651c997e0d46e9b1e55 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 4 Oct 2022 20:26:47 +0530
Subject: [PATCH 18/19] Komikku: fix appdata file
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 2 +-
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 0b66eb387e75..0fd7cdf7d015 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
# Template file for 'Komikku'
pkgname=Komikku
version=0.40.0
-revision=1
+revision=2
wrksrc=Komikku-v${version}
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
From 27053479d4514a39169c28c56b89e8624f363485 Mon Sep 17 00:00:00 2001
From: tpar2911 <tadej.paris@protonmail.com>
Date: Tue, 4 Oct 2022 19:43:02 +0200
Subject: [PATCH 19/19] ne: update to 3.3.2.
---
srcpkgs/ne/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index ca08ce21c150..d40caaf2fd97 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -11,8 +11,7 @@ license="GPL-3.0-only"
homepage="http://ne.di.unimi.it/"
changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
-9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
do_build() {
make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (2 preceding siblings ...)
2022-10-04 17:42 ` [PR PATCH] [Updated] " tpar2911
@ 2022-10-04 17:43 ` tpar2911
2022-10-04 17:46 ` [PR PATCH] [Closed]: " tpar2911
` (13 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 17:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
There is an updated pull request by tpar2911 against master on the void-packages repository
https://github.com/tpar2911/void-packages ne
https://github.com/void-linux/void-packages/pull/39699
ne: update to 3.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39699.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ne-39699.patch --]
[-- Type: text/x-diff, Size: 25851 bytes --]
From 30c91a4fd00578cf2a6361c6cbc01e6e16c225bc Mon Sep 17 00:00:00 2001
From: tpar2911 <tadej.paris@protonmail.com>
Date: Tue, 4 Oct 2022 12:22:55 +0200
Subject: [PATCH 01/19] ne: update to 3.2
---
srcpkgs/ne/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf40..ca08ce21c150 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
# Template file for 'ne'
pkgname=ne
-version=3.3.1
+version=3.3.2
revision=1
build_style=gnu-makefile
hostmakedepends="perl texinfo"
@@ -12,6 +12,7 @@ homepage="http://ne.di.unimi.it/"
changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
do_build() {
make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
From 363e66c389fc01bc6f645df1a05c0d7e82aef425 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 4 Oct 2022 08:54:07 +0200
Subject: [PATCH 02/19] ioping: update to 1.3.
---
srcpkgs/ioping/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ioping/template b/srcpkgs/ioping/template
index 43a2cfd652f1..0adaf0ab06ae 100644
--- a/srcpkgs/ioping/template
+++ b/srcpkgs/ioping/template
@@ -1,6 +1,6 @@
# Template file for 'ioping'
pkgname=ioping
-version=1.2
+version=1.3
revision=1
build_style=gnu-makefile
short_desc="Simple disk I/O latency measuring tool"
@@ -8,7 +8,7 @@ maintainer="teldra <teldra@rotce.de>"
license="GPL-3.0-or-later"
homepage="https://github.com/koct9i/ioping/"
distfiles="https://github.com/koct9i/ioping/archive/v${version}.tar.gz"
-checksum=d3e4497c653a1e96df67c72ce2b70da18e9f5e3b93179a5bb57a6e30ceacfa75
+checksum=7aa48e70aaa766bc112dea57ebbe56700626871052380709df3a26f46766e8c8
do_install() {
vbin ioping
From 94d912a4ed545325adb8dbef7085f3011542238b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 4 Oct 2022 10:48:06 +0200
Subject: [PATCH 03/19] yt-dlp: update to 2022.10.04.
---
srcpkgs/yt-dlp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index fb8d8be82bb1..22ab525add6c 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
# Template file for 'yt-dlp'
pkgname=yt-dlp
-version=2022.09.01
+version=2022.10.04
revision=1
wrksrc="$pkgname"
build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
homepage="https://github.com/yt-dlp/yt-dlp"
changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=675ff266e9400c47bb4df947ab3e7d5e9d4c362abcadd2c61ba341e86590f1df
+checksum=bd3cf6413cd92a400ff015633372a1454906414226f924b57c1f5826b9abc1a8
do_check() {
PYTHON=/usr/bin/python3 make offlinetest
From 94bc52995267e57a9fc04be85efb040a6234e395 Mon Sep 17 00:00:00 2001
From: onli <onli@paskuda.biz>
Date: Mon, 3 Oct 2022 21:28:09 +0200
Subject: [PATCH 04/19] minitube: update to 3.9.3
---
srcpkgs/minitube/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template
index 528e8fa1b0db..915458a43a6a 100644
--- a/srcpkgs/minitube/template
+++ b/srcpkgs/minitube/template
@@ -1,6 +1,6 @@
# Template file for 'minitube'
pkgname=minitube
-version=3.9.1
+version=3.9.3
revision=1
build_style=qmake
hostmakedepends="qt5-tools qt5-host-tools qt5-qmake git"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://flavio.tordini.org/minitube"
distfiles="https://github.com/flaviotordini/minitube/releases/download/${version}/minitube-${version}.tar.bz2"
-checksum=7063d3db599c0c9c3ddfea39a14cf708bd5bc9ff1dbb66acb4bd1eb1b7a86a47
+checksum=0e2e70ff366218353f145a48fb1cc65def540a47082485dc918f8dab904a648c
pre_configure() {
# Provided by Gottox
From 35c996707a4636b5c8a944dfc1e0e027e296b7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 4 Oct 2022 10:15:13 +0200
Subject: [PATCH 05/19] arti: update to 1.0.1.
---
srcpkgs/arti/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index be5d565ec77f..0705b6d938b2 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,6 +1,6 @@
# Template file for 'arti'
pkgname=arti
-version=1.0.0
+version=1.0.1
revision=1
wrksrc="arti-arti-v${version}"
build_style=cargo
@@ -14,7 +14,7 @@ license="Apache-2.0, MIT"
homepage="https://gitlab.torproject.org/tpo/core/arti"
changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=4aa5f2f8ce98b913a843542f26895b2f4819829fa3dec9082fa1e8da5e274267
+checksum=9a326c820144f26999abe987273910ccfc5e0bb6843d5c2c59905eb46e38a980
if [ "$XBPS_CHECK_PKGS" ]; then
case "$XBPS_TARGET_MACHINE" in
From 7b260fa20d37db43d6a4f212383169c3483d8fbf Mon Sep 17 00:00:00 2001
From: Wrath <39569621+wrathgewp@users.noreply.github.com>
Date: Tue, 4 Oct 2022 11:09:11 +0200
Subject: [PATCH 06/19] nextcloud-client: update to 3.6.0
fixed revision number
---
srcpkgs/nextcloud-client/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 857663ac7427..3a233ce58192 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,6 +1,6 @@
# Template file for 'nextcloud-client'
pkgname=nextcloud-client
-version=3.5.4
+version=3.6.0
revision=1
wrksrc="desktop-${version}"
build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://nextcloud.com/clients/"
changelog="https://github.com/nextcloud/desktop/releases"
distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=f6222403063f83d52577ab4c53060eec8d0dc499e56975e44767b53d9b6e896f
+checksum=d7c1d3f6a867566c1f9a629c8c0d954ba69ebc4107c0faa975a1ccf42842d0df
# https://github.com/void-linux/void-packages/pull/33358#discussion_r724518549
make_check=ci-skip
From 6055baddff4102ac20f2e936ce7159cb8611c265 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 4 Oct 2022 08:41:52 +0200
Subject: [PATCH 07/19] py3status: update to 3.47.
---
srcpkgs/py3status/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index ed167bce6825..5d749a93034f 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
# Template file for 'py3status'
pkgname=py3status
-version=3.45
+version=3.47
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://github.com/ultrabug/py3status"
changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9221e47591f5f167ed9ab053f1967114458afd9bcc28f90a3339ce44a7b5d0a5
+checksum=fb29a3c6bdf14b426350d81984416e33c82f02a5aac916ca0a16be17b5a9c98f
post_install() {
vlicense LICENSE
From b57ce55603daeb920193461e1aedd7e58e3ca484 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 4 Oct 2022 08:49:54 +0200
Subject: [PATCH 08/19] hdparm: update to 9.65.
---
srcpkgs/hdparm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template
index 7f2cef9558a7..cde340c77084 100644
--- a/srcpkgs/hdparm/template
+++ b/srcpkgs/hdparm/template
@@ -1,6 +1,6 @@
# Template file for 'hdparm'
pkgname=hdparm
-version=9.64
+version=9.65
revision=1
build_style=gnu-makefile
make_install_args="exec_prefix=/usr sbindir=/usr/bin"
@@ -9,7 +9,7 @@ maintainer="teldra <teldra@rotce.de>"
license="0BSD" # Upstream is very unclear and names their stuff 'bsd-style'
homepage="https://sourceforge.net/projects/hdparm/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=315b956951c3fea027287de204381534217c0bd0f37b4935877fe2db0cab859a
+checksum=d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b
post_install() {
vlicense LICENSE.TXT
From da7947cf4296b433ea974880cdffb151fc2dcabc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Oct 2022 08:17:43 -0400
Subject: [PATCH 09/19] python3-psycopg: update to 3.1.2.
---
srcpkgs/python3-psycopg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-psycopg/template b/srcpkgs/python3-psycopg/template
index ca04d790e1c6..18f9be7c88a7 100644
--- a/srcpkgs/python3-psycopg/template
+++ b/srcpkgs/python3-psycopg/template
@@ -1,6 +1,6 @@
# Template file for 'python3-psycopg'
pkgname=python3-psycopg
-version=3.1.1
+version=3.1.2
revision=1
wrksrc="psycopg-${version}"
build_style=python3-module
@@ -12,5 +12,5 @@ license="LGPL-3.0-or-later"
homepage="https://www.psycopg.org"
changelog="https://raw.githubusercontent.com/psycopg/psycopg/master/docs/news.rst"
distfiles="${PYPI_SITE}/p/psycopg/psycopg-${version}.tar.gz"
-checksum=3ee0af9cf944d9579441c15702835a949788b5a57894823f0a916c2598c96f40
+checksum=57b356b1dc86a45f0a6388ca6fde77360639eb24c9aae033ee8fbbed713dce79
make_check=no # requires running postgres server on system
From 6df5a8c290989dc3f8ed4a5821ffe8bcb70762ba Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Oct 2022 08:33:35 -0400
Subject: [PATCH 10/19] python3-Werkzeug: add missing dependency
python3-MarkupSafe.
---
srcpkgs/python3-Werkzeug/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
index cc74734ba4f8..4fdf52d46b6b 100644
--- a/srcpkgs/python3-Werkzeug/template
+++ b/srcpkgs/python3-Werkzeug/template
@@ -1,12 +1,12 @@
# Template file for 'python3-Werkzeug'
pkgname=python3-Werkzeug
version=2.2.2
-revision=1
+revision=2
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-pytest python3-hypothesis python3-requests python3-MarkupSafe"
+depends="python3-MarkupSafe"
+checkdepends="python3-pytest python3-hypothesis python3-requests ${depends}"
short_desc="Swiss Army knife of Python web development (Python3)"
maintainer="Markus Berger <pulux@pf4sh.de>"
license="BSD-3-Clause"
From 0c6dd26f368f626eeb02256a385a59556615e86e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Oct 2022 08:52:45 -0400
Subject: [PATCH 11/19] python3-responses: update to 0.21.0.
---
srcpkgs/python3-responses/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
index f788069a9fd2..4201a852e51c 100644
--- a/srcpkgs/python3-responses/template
+++ b/srcpkgs/python3-responses/template
@@ -1,17 +1,17 @@
# Template file for 'python3-responses'
pkgname=python3-responses
-version=0.16.0
+version=0.21.0
revision=1
wrksrc="responses-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-requests python3-urllib3 python3-six"
+depends="python3-requests python3-urllib3"
short_desc="Utility for mocking out the Python Requests library"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="Apache-2.0"
homepage="https://github.com/getsentry/responses"
changelog="https://raw.githubusercontent.com/getsentry/responses/master/CHANGES"
distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
-checksum=a2e3aca2a8277e61257cd3b1c154b1dd0d782b1ae3d38b7fa37cbe3feb531791
+checksum=b82502eb5f09a0289d8e209e7bad71ef3978334f56d09b444253d5ad67bf5253
# testing requires unpackaged plugin pytest-localserver
make_check=no
From 74ebfa90e6ca9d37e6b5df6a70a67638586960b7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 4 Oct 2022 09:05:13 -0400
Subject: [PATCH 12/19] python3-confuse: update to 2.0.0.
---
srcpkgs/python3-confuse/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
index 05a9764fa7e5..f922b75e0da5 100644
--- a/srcpkgs/python3-confuse/template
+++ b/srcpkgs/python3-confuse/template
@@ -1,10 +1,10 @@
# Template file for 'python3-confuse'
pkgname=python3-confuse
-version=1.7.0
+version=2.0.0
revision=1
wrksrc="confuse-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
depends="python3-yaml"
checkdepends="${depends} python3-pytest"
short_desc="Painless YAML config files for Python"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://github.com/beetbox/confuse"
changelog="https://raw.githubusercontent.com/beetbox/confuse/master/docs/changelog.rst"
distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
-checksum=c9fe8474516a62397f8e52fcf89547bb2f2737b1a4a6f6dec11a286f0b3a7401
+checksum=acc57c45ec2a9850a90fe7c29812bbdd8405e48a49c1a22899df915d0aca941f
post_install() {
vlicense LICENSE
From 072f2a7d20986fa75fd687843b503ba74786c867 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 4 Oct 2022 09:21:45 -0500
Subject: [PATCH 13/19] perl-Test-Most: update to 0.38.
---
srcpkgs/perl-Test-Most/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Test-Most/template b/srcpkgs/perl-Test-Most/template
index 7683e70b18b7..bcac0bd3575b 100644
--- a/srcpkgs/perl-Test-Most/template
+++ b/srcpkgs/perl-Test-Most/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Test-Most'
pkgname=perl-Test-Most
-version=0.37
-revision=2
+version=0.38
+revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Test-Most"
distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=533370141eb9f18cf4ac380f6ded2ab57802a6e184008a80fd2304bfcc474fc7
+checksum=089eb894f7bace4c37c6334e0e290eb20338ee10223af0c82cbe7281c78382df
From a821f5e7cd391ef4729cd4779a02cd7d96b3cc5c Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 4 Oct 2022 09:23:48 -0500
Subject: [PATCH 14/19] perl-Test-Simple: update to 1.302191.
---
srcpkgs/perl-Test-Simple/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template
index a3335a267f3f..31e9c94393f9 100644
--- a/srcpkgs/perl-Test-Simple/template
+++ b/srcpkgs/perl-Test-Simple/template
@@ -1,6 +1,6 @@
# Template file for 'perl-Test-Simple'
pkgname=perl-Test-Simple
-version=1.302190
+version=1.302191
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Test-Simple"
distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz"
-checksum=fbb15226f1c605c4466a8c6ba02030083d54333d34fa76c02549cae7014c3a0e
+checksum=a82f652bc4f2ef1ddcae99d04fc0f8924a35386066a2ab363aabf8372bc5a7ab
From f515cc8452711861d7ed7549c85e8c4293f698c5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 4 Oct 2022 19:41:44 +0530
Subject: [PATCH 15/19] python3-chess: update to 1.9.3.
---
srcpkgs/python3-chess/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-chess/template b/srcpkgs/python3-chess/template
index c16874544d79..9c531f470236 100644
--- a/srcpkgs/python3-chess/template
+++ b/srcpkgs/python3-chess/template
@@ -1,6 +1,6 @@
# Template file for 'python3-chess'
pkgname=python3-chess
-version=1.9.2
+version=1.9.3
revision=1
wrksrc="python-chess-${version}"
build_style=python3-module
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/niklasf/python-chess"
changelog="https://raw.githubusercontent.com/niklasf/python-chess/master/CHANGELOG.rst"
distfiles="https://github.com/niklasf/python-chess/archive/refs/tags/v${version}.tar.gz"
-checksum=05d35036b1f4d8ad9bb9f7b471e38d21790a068a1654974fbc633e764256a894
+checksum=0fa325c1944b7781996ff66e3b5056a5e5d3c33c8200b9279493d8054a3a0502
From 333cdd6ad4cb9556f3526470866340fe87cd8fd1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 22 Sep 2022 01:29:51 +0530
Subject: [PATCH 16/19] python3-keyring: update to 23.9.3.
Adopt.
---
srcpkgs/python3-keyring/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 35b44a7380a2..908e160000ec 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,20 +1,19 @@
# Template file for 'python3-keyring'
pkgname=python3-keyring
-version=23.7.0
+version=23.9.3
revision=1
wrksrc="keyring-${version}"
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
-depends="python3-SecretStorage"
-checkdepends="python3-pytest
- python3-pytest-flake8 python3-pytest-cov"
+depends="python3-SecretStorage python3-jeepney python3-jaraco.classes"
+checkdepends="${depends} python3-pytest-xdist"
short_desc="Python interface to the system keyring service"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jaraco/keyring"
changelog="https://raw.githubusercontent.com/jaraco/keyring/master/CHANGES.rst"
distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=782e1cd1132e91bf459fcd243bcf25b326015c1ac0b198e4408f91fa6791062b
+checksum=69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5
post_install() {
vlicense LICENSE
From 3cbd3a09ab020fcfd9c7de20577fb2b0f4f3b26b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 24 Sep 2022 01:34:48 +0530
Subject: [PATCH 17/19] coursera-dl: patch for python3>=3.9
---
.../patches/fix-upstream-issue-778.patch | 48 +++++++++++++++++++
srcpkgs/coursera-dl/template | 8 ++--
2 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
diff --git a/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch b/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
new file mode 100644
index 000000000000..659d936a9c43
--- /dev/null
+++ b/srcpkgs/coursera-dl/patches/fix-upstream-issue-778.patch
@@ -0,0 +1,48 @@
+From c8796e567698be166cb15f54e095140c1a9b567e Mon Sep 17 00:00:00 2001
+From: "Heino H. Gehlsen" <heino@gehlsen.dk>
+Date: Sun, 27 Dec 2020 13:28:35 +0100
+Subject: [PATCH] Fix AttributeError: 'HTMLParser' object has no attribute
+ 'unescape'
+
+https://github.com/coursera-dl/coursera-dl/pull/789
+---
+ coursera/utils.py | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/coursera/utils.py b/coursera/utils.py
+index 9ba577af..f271bb9f 100644
+--- a/coursera/utils.py
++++ b/coursera/utils.py
+@@ -21,7 +21,11 @@
+
+ import six
+ from six import iteritems
+-from six.moves import html_parser
++if six.PY34:
++ import html
++else:
++ from six.moves import html_parser
++ html = html_parser.HTMLParser()
+ from six.moves.urllib.parse import ParseResult
+ from six.moves.urllib_parse import unquote_plus
+
+@@ -98,8 +102,7 @@ def random_string(length):
+
+
+ def unescape_html(s):
+- h = html_parser.HTMLParser()
+- s = h.unescape(s)
++ s = html.unescape(s)
+ s = unquote_plus(s)
+ return unescape(s, HTML_UNESCAPE_TABLE)
+
+@@ -114,8 +117,7 @@ def clean_filename(s, minimal_change=False):
+ """
+
+ # First, deal with URL encoded strings
+- h = html_parser.HTMLParser()
+- s = h.unescape(s)
++ s = html.unescape(s)
+ s = unquote_plus(s)
+
+ # Strip forbidden characters
diff --git a/srcpkgs/coursera-dl/template b/srcpkgs/coursera-dl/template
index 9c569678e49c..a79cecd680d1 100644
--- a/srcpkgs/coursera-dl/template
+++ b/srcpkgs/coursera-dl/template
@@ -1,16 +1,16 @@
# Template file for 'coursera-dl'
pkgname=coursera-dl
version=0.11.5
-revision=3
+revision=4
build_style=python3-module
-pycompile_module="coursera"
hostmakedepends="python3-setuptools"
depends="python3-attrs python3-setuptools python3-pyasn1 python3-ConfigArgParse
python3-BeautifulSoup4 python3-requests python3-six python3-keyring
python3-urllib3"
+checkdepends="${depends} python3-keyrings-alt python3-mock python3-pytest-xdist"
short_desc="Script for downloading Coursera.org videos and naming them"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="https://github.com/coursera-dl/coursera-dl"
-distfiles="${PYPI_SITE}/c/coursera-dl/coursera-dl-${version}.tar.gz"
-checksum=66a84558dfcfcbdc487dcabcfc0d7c4a8569cc604b051b1d51bc95d52a369745
+distfiles="https://github.com/coursera-dl/coursera-dl/archive/refs/tags/${version}.tar.gz"
+checksum=27e382435084ec91ef89ab6c1d46f4756b708e4badf5307a8f18b9ad31971014
From 827d4e7edddb5a2b24cc7651c997e0d46e9b1e55 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 4 Oct 2022 20:26:47 +0530
Subject: [PATCH 18/19] Komikku: fix appdata file
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 2 +-
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 0b66eb387e75..0fd7cdf7d015 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
# Template file for 'Komikku'
pkgname=Komikku
version=0.40.0
-revision=1
+revision=2
wrksrc=Komikku-v${version}
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
From 27053479d4514a39169c28c56b89e8624f363485 Mon Sep 17 00:00:00 2001
From: tpar2911 <tadej.paris@protonmail.com>
Date: Tue, 4 Oct 2022 19:43:02 +0200
Subject: [PATCH 19/19] ne: update to 3.3.2.
---
srcpkgs/ne/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index ca08ce21c150..d40caaf2fd97 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -11,8 +11,7 @@ license="GPL-3.0-only"
homepage="http://ne.di.unimi.it/"
changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
-9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
do_build() {
make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Closed]: ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (3 preceding siblings ...)
2022-10-04 17:43 ` tpar2911
@ 2022-10-04 17:46 ` tpar2911
2022-10-04 17:50 ` tpar2911
` (12 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 17:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]
There's a closed pull request on the void-packages repository
ne: update to 3.2
https://github.com/void-linux/void-packages/pull/39699
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (4 preceding siblings ...)
2022-10-04 17:46 ` [PR PATCH] [Closed]: " tpar2911
@ 2022-10-04 17:50 ` tpar2911
2022-10-04 17:53 ` Duncaen
` (11 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by tpar2911 on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267351813
Comment:
I see where I've made the mistakes. I'll fix them and create a new pull request. Thank you
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (5 preceding siblings ...)
2022-10-04 17:50 ` tpar2911
@ 2022-10-04 17:53 ` Duncaen
2022-10-04 17:53 ` Duncaen
` (10 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Duncaen @ 2022-10-04 17:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267355201
Comment:
Please don't open new PRs, you can fix the problems and force push to the same branch you opened the PR for.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (6 preceding siblings ...)
2022-10-04 17:53 ` Duncaen
@ 2022-10-04 17:53 ` Duncaen
2022-10-04 18:06 ` tpar2911
` (9 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Duncaen @ 2022-10-04 17:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267355201
Comment:
Please don't open new PRs for the same package, you can fix the problems and force push to the same branch you opened the PR for.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (7 preceding siblings ...)
2022-10-04 17:53 ` Duncaen
@ 2022-10-04 18:06 ` tpar2911
2022-10-04 18:28 ` ne: update to 3.3.2 tpar2911
` (8 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 18:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by tpar2911 on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267368096
Comment:
I understand, I'll do that.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (8 preceding siblings ...)
2022-10-04 18:06 ` tpar2911
@ 2022-10-04 18:28 ` tpar2911
2022-10-04 18:28 ` tpar2911
` (7 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 18:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New comment by tpar2911 on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267403040
Comment:
I think I've fixed the issue. The file change should be correct now.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (9 preceding siblings ...)
2022-10-04 18:28 ` ne: update to 3.3.2 tpar2911
@ 2022-10-04 18:28 ` tpar2911
2022-10-04 18:33 ` Duncaen
` (6 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 18:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by tpar2911 on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267405425
Comment:
This is my first contribution on GitHub, so thank you for your patience.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (10 preceding siblings ...)
2022-10-04 18:28 ` tpar2911
@ 2022-10-04 18:33 ` Duncaen
2022-10-04 18:35 ` tpar2911
` (5 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Duncaen @ 2022-10-04 18:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267418343
Comment:
There are still unrelated commits in the PR and there should be just one commit.
Probably easier to reset your branch to master and the redo the commit.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (11 preceding siblings ...)
2022-10-04 18:33 ` Duncaen
@ 2022-10-04 18:35 ` tpar2911
2022-10-04 20:38 ` tpar2911
` (4 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New comment by tpar2911 on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267423554
Comment:
Alright, I'll do that.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (12 preceding siblings ...)
2022-10-04 18:35 ` tpar2911
@ 2022-10-04 20:38 ` tpar2911
2022-10-04 20:45 ` Duncaen
` (3 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by tpar2911 on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267549850
Comment:
I'm sorry I seem to be stuck. What would i need to do in order to do this?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (13 preceding siblings ...)
2022-10-04 20:38 ` tpar2911
@ 2022-10-04 20:45 ` Duncaen
2022-10-04 21:10 ` tpar2911
` (2 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Duncaen @ 2022-10-04 20:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267557536
Comment:
You could do something like:
```
git switch master
git branch -D ne
git switch -c ne
... do the changes and commit..
git push -f origin ne
```
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (14 preceding siblings ...)
2022-10-04 20:45 ` Duncaen
@ 2022-10-04 21:10 ` tpar2911
2022-10-04 21:14 ` Duncaen
2022-10-04 21:16 ` tpar2911
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 21:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
New comment by tpar2911 on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267581991
Comment:
I have followed the steps, yet there are no changes reflected in the pull request... I think I messed up somewhere before. Do you know a different way to remove those unrelated commits from the PR?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (15 preceding siblings ...)
2022-10-04 21:10 ` tpar2911
@ 2022-10-04 21:14 ` Duncaen
2022-10-04 21:16 ` tpar2911
17 siblings, 0 replies; 21+ messages in thread
From: Duncaen @ 2022-10-04 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267585298
Comment:
Not sure, this should have fixed it as its the same branch in clean. Maybe its because it was closed.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
` (16 preceding siblings ...)
2022-10-04 21:14 ` Duncaen
@ 2022-10-04 21:16 ` tpar2911
17 siblings, 0 replies; 21+ messages in thread
From: tpar2911 @ 2022-10-04 21:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by tpar2911 on void-packages repository
https://github.com/void-linux/void-packages/pull/39699#issuecomment-1267586982
Comment:
I see. Thanks anyway for your help.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2.
2022-11-06 7:25 [PR PATCH] " mobinmob
2023-01-24 5:50 ` kruceter
@ 2023-01-28 11:09 ` mobinmob
1 sibling, 0 replies; 21+ messages in thread
From: mobinmob @ 2023-01-28 11:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/40354#issuecomment-1407375610
Comment:
@kruceter Thanks :) Ι disabled parallel builds.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: ne: update to 3.3.2.
2022-11-06 7:25 [PR PATCH] " mobinmob
@ 2023-01-24 5:50 ` kruceter
2023-01-28 11:09 ` mobinmob
1 sibling, 0 replies; 21+ messages in thread
From: kruceter @ 2023-01-24 5:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4128 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/40354#issuecomment-1401427502
Comment:
Failing `armv6l-musl` is just a coincidence. From what I see in CI logs, it tries to generate headers while using gcc parallelly when generation had not yet been finished.
To prove my point, here is the extrace output:
```sh
/usr/bin/perl /usr/bin/makeinfo -D autohelp ne.texinfo
/usr/bin/perl /usr/bin/makeinfo -D autohelp ne.texinfo
/usr/bin/perl /usr/bin/makeinfo -D autohelp ne.texinfo
/bin/bash /builddir/.xbps-ne/wrappers/arm-linux-musleabihf-gcc -fstack-clash-protection '-D_FORTIFY_SOURCE=2' -O2 -pipe '-march=armv6' '-mfpu=vfp' '-mfloat-abi=hard' '-std=c99' -D_GNU_SOURCE -I/usr/arm-linux-musleabihf/usr/include '-ffile-prefix-map=/builddir/ne-3.3.2=.' -c -o ansi.o ansi.c
/usr/bin/arm-linux-musleabihf-gcc -fstack-clash-protection '-D_FORTIFY_SOURCE=2' -O2 -pipe '-march=armv6' '-mfpu=vfp' '-mfloat-abi=hard' '-std=c99' -D_GNU_SOURCE -I/usr/arm-linux-musleabihf/usr/include '-ffile-prefix-map=/builddir/ne-3.3.2=.' -c -o ansi.o ansi.c
/usr/lib/gcc/arm-linux-musleabihf/12.2.0/cc1 -quiet -I /usr/arm-linux-musleabihf/usr/include -D '_FORTIFY_SOURCE=2' -D _GNU_SOURCE ansi.c -quiet -dumpbase ansi.c -dumpbase-ext .c '-mfpu=vfp' '-mfloat-abi=hard' '-mtls-dialect=gnu' -marm '-mlibarch=armv6+fp' '-march=armv6+fp' -O2 '-std=c99' -fstack-clash-protection '-ffile-prefix-map=/builddir/ne-3.3.2=.' -o -
/usr/lib/gcc/arm-linux-musleabihf/12.2.0/../../../../arm-linux-musleabihf/bin/as -I /usr/arm-linux-musleabihf/usr/include '-march=armv6+fp' '-mfloat-abi=hard' '-mfpu=vfp' '-meabi=5' -o ansi.o
perl info2src.pl
/bin/sh -c 'rm -f ne.info*'
rm -f ne.info
perl info2src.pl
perl info2src.pl
```
And the relevant part of makefile for comparison:
```makefile
enums.h names.c names.h hash.c hash.h help.c help.h ext.c: ne.texinfo version.texinfo info2src.pl
makeinfo -D autohelp ne.texinfo
perl info2src.pl
rm -f ne.info*
```
This recipe was supposed to be executed once to generate all of the listed target files, not by the amount of dedicated cpu cores.
Basically I see two ways to resolve this race: either generate headers and docs separately before `do_build`:
```diff
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf..85d06659a0 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
# Template file for 'ne'
pkgname=ne
-version=3.3.1
+version=3.3.2
revision=1
build_style=gnu-makefile
hostmakedepends="perl texinfo"
@@ -11,8 +11,12 @@ license="GPL-3.0-only"
homepage="http://ne.di.unimi.it/"
changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
-do_build() {
- make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
+CFLAGS="-std=c99 -D_GNU_SOURCE"
+
+pre_build() {
+ # docs and headers should be generated sequently before building
+ make -C doc
+ make -C src enums.h
}
```
or disable parallel builds entirely by using `disable_parallel_build=yes`:
```diff
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index a2a33a66cf..f52de77d8b 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -1,6 +1,6 @@
# Template file for 'ne'
pkgname=ne
-version=3.3.1
+version=3.3.2
revision=1
build_style=gnu-makefile
hostmakedepends="perl texinfo"
@@ -11,8 +11,7 @@ license="GPL-3.0-only"
homepage="http://ne.di.unimi.it/"
changelog="https://raw.githubusercontent.com/vigna/ne/master/NEWS"
distfiles="https://github.com/vigna/ne/archive/refs/tags/${version}.tar.gz"
-checksum=931f01380b48e539b06d65d80ddf313cce67aab6d7b62462a548253ab9b3e10a
+checksum=9b8b757db22bd8cb783cf063f514143a8c325e5c321af31901e0f76e77455417
+disable_parallel_build=yes
-do_build() {
- make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs}
-}
+CFLAGS="-std=c99 -D_GNU_SOURCE"
```
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-01-28 11:09 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-04 11:01 [PR PATCH] ne: update to 3.2 tpar2911
2022-10-04 12:02 ` Duncaen
2022-10-04 12:02 ` Duncaen
2022-10-04 17:42 ` [PR PATCH] [Updated] " tpar2911
2022-10-04 17:43 ` tpar2911
2022-10-04 17:46 ` [PR PATCH] [Closed]: " tpar2911
2022-10-04 17:50 ` tpar2911
2022-10-04 17:53 ` Duncaen
2022-10-04 17:53 ` Duncaen
2022-10-04 18:06 ` tpar2911
2022-10-04 18:28 ` ne: update to 3.3.2 tpar2911
2022-10-04 18:28 ` tpar2911
2022-10-04 18:33 ` Duncaen
2022-10-04 18:35 ` tpar2911
2022-10-04 20:38 ` tpar2911
2022-10-04 20:45 ` Duncaen
2022-10-04 21:10 ` tpar2911
2022-10-04 21:14 ` Duncaen
2022-10-04 21:16 ` tpar2911
2022-11-06 7:25 [PR PATCH] " mobinmob
2023-01-24 5:50 ` kruceter
2023-01-28 11:09 ` mobinmob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).