[PR PATCH] Fix deps which cause errors running `xbps-cycles.py`

[PR PATCH] Fix deps which cause errors running `xbps-cycles.py`

[tornaria]

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

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages fix-deps
https://github.com/void-linux/void-packages/pull/54286

Fix deps which cause errors running `xbps-cycles.py`
Running `common/scripts/xbps-cycles.py -Q` on current HEAD gives:
```
=> ERROR: python3-enchant-3.2.0_6: dependency 'hunspell-en_US' does not exist!
xbps-src failed to find dependencies for package python3-enchant
=> ERROR: gspell-1.14.0_1: dependency 'hunspell-en_US' does not exist!
xbps-src failed to find dependencies for package gspell
=> ERROR: xlunch-4.7.5_1: dependency 'awk' does not exist!
xbps-src failed to find dependencies for package xlunch
=> ERROR: electron33-33.2.0_1: dependency 'libgnome-keyring-devel' does not exist!
xbps-src failed to find dependencies for package electron33
```

This PR fixes those.


NB: the build dependency graph also has two cycles:
```
libvisual -> sdl12-compat -> SDL2 -> pipewire -> gst-plugins-base1 -> libvisual
libvisual -> sdl12-compat -> SDL2 -> pipewire -> libcamera -> gst-plugins-base1 -> libvisual
```
which are addressed by #54218.


The *check* dependency graph has a strongly connected component of size 752, so it is a big mess...


#### Commits
 
- **electron33: do not depend on libgnome-keyring-devel (removed)**
- **xlunch: mark awk dependency virtual**
- **gspell: hunspell-en_US is now provided by hunspell-en**
- **python3-enchant: hunspell-en_US is now provided by hunspell-en**

#### Testing the changes
- I tested the changes in this PR: **NO**


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-deps-54286.patch --]
[-- Type: text/x-diff, Size: 4003 bytes --]

From 93b3e64eb76c1b22ba60e50e624299c7c034d044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:54:42 -0300
Subject: [PATCH 1/4] electron33: do not depend on libgnome-keyring-devel
 (removed)

---
 srcpkgs/electron33/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/electron33/template b/srcpkgs/electron33/template
index cffabd57a7c621..b83f3450027423 100644
--- a/srcpkgs/electron33/template
+++ b/srcpkgs/electron33/template
@@ -11,7 +11,7 @@ hostmakedepends="$(vopt_if clang "clang18 lld18 llvm18 compiler-rt")
  pkg-config perl gperf bison ninja nodejs hwids which git yarn jq
  python3 libepoxy-devel libevent-devel libglib-devel rust rust-bindgen"
 makedepends="libpng-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
+ libXi-devel libgcrypt-devel cups-devel elfutils-devel
  libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
  libXScrnSaver-devel alsa-lib-devel libdrm-devel
  libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel

From e334b897e91f9f4dd56b8a32520c5b6081004cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:55:20 -0300
Subject: [PATCH 2/4] xlunch: mark awk dependency virtual

---
 srcpkgs/xlunch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index 084d0a2eeacffd..1c61bd91f781d7 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_build_target=xlunch
 makedepends="imlib2-devel"
-depends="bash findutils grep awk sed desktop-file-utils hicolor-icon-theme"
+depends="bash findutils grep virtual?awk sed desktop-file-utils hicolor-icon-theme"
 short_desc="Graphical app launcher for X with little dependencies"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later"

From f5589f5f49fed117f5678b6ef9b5d78d1b63dfe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:56:53 -0300
Subject: [PATCH 3/4] gspell: hunspell-en_US is now provided by hunspell-en

---
 srcpkgs/gspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a1260e9ed60f1c..1ca966874c52fa 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,7 +9,7 @@ configure_args="$(vopt_bool gir gobject_introspection)
 hostmakedepends="pkg-config glib-devel gettext
  $(vopt_if vala vala) $(vopt_if gtk_doc gtk-doc)"
 makedepends="glib-devel enchant2-devel gtk+3-devel icu-devel"
-checkdepends="xvfb-run cantarell-fonts hunspell-en_US"
+checkdepends="xvfb-run cantarell-fonts hunspell-en"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d8445fb06e6bb29d52d5a5ff58685e49afc5eb2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:57:05 -0300
Subject: [PATCH 4/4] python3-enchant: hunspell-en_US is now provided by
 hunspell-en

---
 srcpkgs/python3-enchant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index a3c4f9a709cd0c..e72dea5c5c9b28 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools enchant2-devel"
 depends="python3 enchant2"
 # needs an en_US dict to run
-checkdepends="$depends python3-pytest hunspell-en_US"
+checkdepends="$depends python3-pytest hunspell-en"
 short_desc="Spellchecking library for Python 3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"

Re: Fix deps which cause errors running `xbps-cycles.py`

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/54286#issuecomment-2650633401

Comment:
Nice catches.

Re: [PR PATCH] [Updated] Fix deps which cause errors running `xbps-cycles.py`

[tornaria]

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

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

https://github.com/tornaria/void-packages fix-deps
https://github.com/void-linux/void-packages/pull/54286

Fix deps which cause errors running `xbps-cycles.py`
Running `common/scripts/xbps-cycles.py -Q` on current HEAD gives:
```
=> ERROR: python3-enchant-3.2.0_6: dependency 'hunspell-en_US' does not exist!
xbps-src failed to find dependencies for package python3-enchant
=> ERROR: gspell-1.14.0_1: dependency 'hunspell-en_US' does not exist!
xbps-src failed to find dependencies for package gspell
=> ERROR: xlunch-4.7.5_1: dependency 'awk' does not exist!
xbps-src failed to find dependencies for package xlunch
=> ERROR: electron33-33.2.0_1: dependency 'libgnome-keyring-devel' does not exist!
xbps-src failed to find dependencies for package electron33
```

This PR fixes those.


NB: the build dependency graph also has two cycles:
```
libvisual -> sdl12-compat -> SDL2 -> pipewire -> gst-plugins-base1 -> libvisual
libvisual -> sdl12-compat -> SDL2 -> pipewire -> libcamera -> gst-plugins-base1 -> libvisual
```
which are addressed by #54218.


The *check* dependency graph has a strongly connected component of size 752, so it is a big mess...


#### Commits
 
- **electron33: do not depend on libgnome-keyring-devel (removed)**
- **xlunch: mark awk dependency virtual**
- **gspell: hunspell-en_US is now provided by hunspell-en**
- **python3-enchant: hunspell-en_US is now provided by hunspell-en**

#### Testing the changes
- I tested the changes in this PR: **NO**


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-deps-54286.patch --]
[-- Type: text/x-diff, Size: 5352 bytes --]

From 93b3e64eb76c1b22ba60e50e624299c7c034d044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:54:42 -0300
Subject: [PATCH 1/5] electron33: do not depend on libgnome-keyring-devel
 (removed)

---
 srcpkgs/electron33/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/electron33/template b/srcpkgs/electron33/template
index cffabd57a7c621..b83f3450027423 100644
--- a/srcpkgs/electron33/template
+++ b/srcpkgs/electron33/template
@@ -11,7 +11,7 @@ hostmakedepends="$(vopt_if clang "clang18 lld18 llvm18 compiler-rt")
  pkg-config perl gperf bison ninja nodejs hwids which git yarn jq
  python3 libepoxy-devel libevent-devel libglib-devel rust rust-bindgen"
 makedepends="libpng-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
+ libXi-devel libgcrypt-devel cups-devel elfutils-devel
  libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
  libXScrnSaver-devel alsa-lib-devel libdrm-devel
  libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel

From e334b897e91f9f4dd56b8a32520c5b6081004cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:55:20 -0300
Subject: [PATCH 2/5] xlunch: mark awk dependency virtual

---
 srcpkgs/xlunch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index 084d0a2eeacffd..1c61bd91f781d7 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_build_target=xlunch
 makedepends="imlib2-devel"
-depends="bash findutils grep awk sed desktop-file-utils hicolor-icon-theme"
+depends="bash findutils grep virtual?awk sed desktop-file-utils hicolor-icon-theme"
 short_desc="Graphical app launcher for X with little dependencies"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later"

From f5589f5f49fed117f5678b6ef9b5d78d1b63dfe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:56:53 -0300
Subject: [PATCH 3/5] gspell: hunspell-en_US is now provided by hunspell-en

---
 srcpkgs/gspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a1260e9ed60f1c..1ca966874c52fa 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,7 +9,7 @@ configure_args="$(vopt_bool gir gobject_introspection)
 hostmakedepends="pkg-config glib-devel gettext
  $(vopt_if vala vala) $(vopt_if gtk_doc gtk-doc)"
 makedepends="glib-devel enchant2-devel gtk+3-devel icu-devel"
-checkdepends="xvfb-run cantarell-fonts hunspell-en_US"
+checkdepends="xvfb-run cantarell-fonts hunspell-en"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d8445fb06e6bb29d52d5a5ff58685e49afc5eb2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:57:05 -0300
Subject: [PATCH 4/5] python3-enchant: hunspell-en_US is now provided by
 hunspell-en

---
 srcpkgs/python3-enchant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index a3c4f9a709cd0c..e72dea5c5c9b28 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools enchant2-devel"
 depends="python3 enchant2"
 # needs an en_US dict to run
-checkdepends="$depends python3-pytest hunspell-en_US"
+checkdepends="$depends python3-pytest hunspell-en"
 short_desc="Spellchecking library for Python 3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"

From 0e8277fb27b92d0434f36004e191d5fae9927eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Feb 2025 09:33:53 -0300
Subject: [PATCH 5/5] python3-enchant: update to 3.2.2.

---
 srcpkgs/python3-enchant/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index e72dea5c5c9b28..a47b2af3b34884 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -1,8 +1,13 @@
 # Template file for 'python3-enchant'
 pkgname=python3-enchant
-version=3.2.0
-revision=6
+version=3.2.2
+revision=1
 build_style=python3-module
+# https://github.com/pyenchant/pyenchant/issues/313
+make_check_args="
+ --deselect tests/test_pwl.py::test_suggestions
+ --deselect tests/test_pwl.py::test_dwpwl
+ "
 hostmakedepends="python3-setuptools enchant2-devel"
 depends="python3 enchant2"
 # needs an en_US dict to run
@@ -12,4 +17,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/pyenchant/pyenchant"
 distfiles="https://github.com/pyenchant/pyenchant/archive/v${version}.tar.gz"
-checksum=3195bfc5cfbdeb8a60f9484390c2c982e59dd220d6f9a5f8418ba67551ead01a
+checksum=dd107d7a51b77277d7605dd6df113e818efe9c7ac10ea03aadf65055edef1c04

Re: Fix deps which cause errors running `xbps-cycles.py`

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/54286#issuecomment-2650709580

Comment:
I'd suggest leaving package updates as a separate PR.

I'm testing building electron33 atm for whether or not libsecret is required at build time. Afaict libsecret is dlopen'd by the `cargo-credential-libsecret` package, so simply removing the `libgnome-keyring-devel` dep should be fine.

Re: Fix deps which cause errors running `xbps-cycles.py`

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/54286#issuecomment-2650709580

Comment:
I'd suggest leaving package updates as a separate PR, imo.

I'm testing building electron33 atm for whether or not libsecret is required at build time. Afaict libsecret is dlopen'd by the `cargo-credential-libsecret` package, so simply removing the `libgnome-keyring-devel` dep should be fine.

Re: Fix deps which cause errors running `xbps-cycles.py`

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/54286#issuecomment-2650709580

Comment:
I'd suggest leaving package updates as a separate PR, imo (since the other commits are just fixing bad depends).

I'm testing building electron33 atm for whether or not libsecret is required at build time. Afaict libsecret is dlopen'd by the `cargo-credential-libsecret` package, so simply removing the `libgnome-keyring-devel` dep should be fine.

Re: Fix deps which cause errors running `xbps-cycles.py`

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/54286#issuecomment-2650709580

Comment:
I'd suggest leaving package updates as a separate PR, imo (since the other commits are just fixing bad depends).

I'm testing building electron33 atm for whether or not libsecret is required at build time.

Re: [PR PATCH] [Updated] Fix deps which cause errors running `xbps-cycles.py`

[tornaria]

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

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

https://github.com/tornaria/void-packages fix-deps
https://github.com/void-linux/void-packages/pull/54286

Fix deps which cause errors running `xbps-cycles.py`
Running `common/scripts/xbps-cycles.py -Q` on current HEAD gives:
```
=> ERROR: python3-enchant-3.2.0_6: dependency 'hunspell-en_US' does not exist!
xbps-src failed to find dependencies for package python3-enchant
=> ERROR: gspell-1.14.0_1: dependency 'hunspell-en_US' does not exist!
xbps-src failed to find dependencies for package gspell
=> ERROR: xlunch-4.7.5_1: dependency 'awk' does not exist!
xbps-src failed to find dependencies for package xlunch
=> ERROR: electron33-33.2.0_1: dependency 'libgnome-keyring-devel' does not exist!
xbps-src failed to find dependencies for package electron33
```

This PR fixes those.


NB: the build dependency graph also has two cycles:
```
libvisual -> sdl12-compat -> SDL2 -> pipewire -> gst-plugins-base1 -> libvisual
libvisual -> sdl12-compat -> SDL2 -> pipewire -> libcamera -> gst-plugins-base1 -> libvisual
```
which are addressed by #54218.


The *check* dependency graph has a strongly connected component of size 752, so it is a big mess...


#### Commits
 
- **electron33: do not depend on libgnome-keyring-devel (removed)**
- **xlunch: mark awk dependency virtual**
- **gspell: hunspell-en_US is now provided by hunspell-en**
- **python3-enchant: hunspell-en_US is now provided by hunspell-en**

#### Testing the changes
- I tested the changes in this PR: **NO**


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-deps-54286.patch --]
[-- Type: text/x-diff, Size: 4003 bytes --]

From 93b3e64eb76c1b22ba60e50e624299c7c034d044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:54:42 -0300
Subject: [PATCH 1/4] electron33: do not depend on libgnome-keyring-devel
 (removed)

---
 srcpkgs/electron33/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/electron33/template b/srcpkgs/electron33/template
index cffabd57a7c621..b83f3450027423 100644
--- a/srcpkgs/electron33/template
+++ b/srcpkgs/electron33/template
@@ -11,7 +11,7 @@ hostmakedepends="$(vopt_if clang "clang18 lld18 llvm18 compiler-rt")
  pkg-config perl gperf bison ninja nodejs hwids which git yarn jq
  python3 libepoxy-devel libevent-devel libglib-devel rust rust-bindgen"
 makedepends="libpng-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
+ libXi-devel libgcrypt-devel cups-devel elfutils-devel
  libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
  libXScrnSaver-devel alsa-lib-devel libdrm-devel
  libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel

From e334b897e91f9f4dd56b8a32520c5b6081004cf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:55:20 -0300
Subject: [PATCH 2/4] xlunch: mark awk dependency virtual

---
 srcpkgs/xlunch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index 084d0a2eeacffd..1c61bd91f781d7 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_build_target=xlunch
 makedepends="imlib2-devel"
-depends="bash findutils grep awk sed desktop-file-utils hicolor-icon-theme"
+depends="bash findutils grep virtual?awk sed desktop-file-utils hicolor-icon-theme"
 short_desc="Graphical app launcher for X with little dependencies"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later"

From f5589f5f49fed117f5678b6ef9b5d78d1b63dfe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:56:53 -0300
Subject: [PATCH 3/4] gspell: hunspell-en_US is now provided by hunspell-en

---
 srcpkgs/gspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a1260e9ed60f1c..1ca966874c52fa 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -9,7 +9,7 @@ configure_args="$(vopt_bool gir gobject_introspection)
 hostmakedepends="pkg-config glib-devel gettext
  $(vopt_if vala vala) $(vopt_if gtk_doc gtk-doc)"
 makedepends="glib-devel enchant2-devel gtk+3-devel icu-devel"
-checkdepends="xvfb-run cantarell-fonts hunspell-en_US"
+checkdepends="xvfb-run cantarell-fonts hunspell-en"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d8445fb06e6bb29d52d5a5ff58685e49afc5eb2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Feb 2025 22:57:05 -0300
Subject: [PATCH 4/4] python3-enchant: hunspell-en_US is now provided by
 hunspell-en

---
 srcpkgs/python3-enchant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index a3c4f9a709cd0c..e72dea5c5c9b28 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -6,7 +6,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools enchant2-devel"
 depends="python3 enchant2"
 # needs an en_US dict to run
-checkdepends="$depends python3-pytest hunspell-en_US"
+checkdepends="$depends python3-pytest hunspell-en"
 short_desc="Spellchecking library for Python 3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"

Re: Fix deps which cause errors running `xbps-cycles.py`

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/54286#issuecomment-2650794368

Comment:
> I'd suggest leaving package updates as a separate PR, imo (since the other commits are just fixing bad depends).

Makes sense.

> I'm testing building electron33 atm for whether or not libsecret is required at build time.

Thanks, this is what worried me (and sure enough, CI is unable to build electron)

Re: Fix deps which cause errors running `xbps-cycles.py`

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/54286#issuecomment-2650809992

Comment:
> Thanks, this is what worried me (and sure enough, CI is unable to build electron)

Sorry, yeah after double checking it seems like it gets dlopen'd: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/sync/libsecret_util_linux.cc;l=187-199?q=libsecret&ss=chromium%2Fchromium%2Fsrc&start=21
(And chromium uses its own vendored headers during the build)

Re: Fix deps which cause errors running `xbps-cycles.py`

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/54286#issuecomment-2650809992

Comment:
> Thanks, this is what worried me (and sure enough, CI is unable to build electron)

Sorry, yeah after double checking it seems like it gets dlopen'd: https://source.chromium.org/chromium/chromium/src/+/main:components/os_crypt/sync/libsecret_util_linux.cc;l=187-199?q=libsecret&ss=chromium%2Fchromium%2Fsrc&start=21
(And chromium uses its own vendored headers during the build)

Lgtm.

Re: [PR PATCH] [Merged]: Fix deps which cause errors running `xbps-cycles.py`

[oreo639]

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

There's a merged pull request on the void-packages repository

Fix deps which cause errors running `xbps-cycles.py`
https://github.com/void-linux/void-packages/pull/54286

Description:
Running `common/scripts/xbps-cycles.py -Q` on current HEAD gives:
```
=> ERROR: python3-enchant-3.2.0_6: dependency 'hunspell-en_US' does not exist!
xbps-src failed to find dependencies for package python3-enchant
=> ERROR: gspell-1.14.0_1: dependency 'hunspell-en_US' does not exist!
xbps-src failed to find dependencies for package gspell
=> ERROR: xlunch-4.7.5_1: dependency 'awk' does not exist!
xbps-src failed to find dependencies for package xlunch
=> ERROR: electron33-33.2.0_1: dependency 'libgnome-keyring-devel' does not exist!
xbps-src failed to find dependencies for package electron33
```

This PR fixes those.


NB: the build dependency graph also has two cycles:
```
libvisual -> sdl12-compat -> SDL2 -> pipewire -> gst-plugins-base1 -> libvisual
libvisual -> sdl12-compat -> SDL2 -> pipewire -> libcamera -> gst-plugins-base1 -> libvisual
```
which are addressed by #54218.


The *check* dependency graph has a strongly connected component of size 752, so it is a big mess...


#### Commits
 
- **electron33: do not depend on libgnome-keyring-devel (removed)**
- **xlunch: mark awk dependency virtual**
- **gspell: hunspell-en_US is now provided by hunspell-en**
- **python3-enchant: hunspell-en_US is now provided by hunspell-en**

#### Testing the changes
- I tested the changes in this PR: **NO**