Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: Aegisub-wangqr-git (fix #31637)
@ 2021-07-24  1:33 pudiva
  2021-07-24  1:44 ` abenson
                   ` (77 more replies)
  0 siblings, 78 replies; 79+ messages in thread
From: pudiva @ 2021-07-24  1:33 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

New package: Aegisub-wangqr-git (fix #31637)
This is a -git package because releases seem to be broken upstream and
don't build...

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 2403 bytes --]

From 1cc73955d68612b39fcaf194d3a940b765f70c0e Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] New package: Aegisub-wangqr-git (fix #31637)

This is a -git package because releases seem to be broken upstream and
don't build...

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub-wangqr-git/template | 62 +++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 srcpkgs/Aegisub-wangqr-git/template

diff --git a/srcpkgs/Aegisub-wangqr-git/template b/srcpkgs/Aegisub-wangqr-git/template
new file mode 100644
index 000000000000..5c24bd03c3d7
--- /dev/null
+++ b/srcpkgs/Aegisub-wangqr-git/template
@@ -0,0 +1,62 @@
+# Template file for 'Aegisub-wangqr-git'
+pkgname=Aegisub-wangqr-git
+version=20210713
+revision=1
+_githash=418a276cc8dbdece4c005318c28e962e2920eb19
+wrksrc="${pkgname}-${_githash}"
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="
+	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+	-DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+	-DWITH_OPENAL=$(vopt_if openal ON OFF)
+	-DWITH_FFTW3=$(vopt_if fftw ON OFF)
+"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
+makedepends="
+	alsa-lib-devel
+	boost-devel
+	libcurl-devel
+	fontconfig-devel
+	freetype-devel
+	hunspell-devel
+	icu-devel
+	libass-devel
+	libffms2-devel
+	lua52-devel
+	MesaLib-devel
+	wxWidgets-gtk3-devel
+	$(vopt_if fftw fftw-devel)
+	$(vopt_if openal libopenal-devel)
+	$(vopt_if portaudio portaudio-devel)
+"
+short_desc="Tool for creating and modifying subtitles (wangqr fork)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
+license="BSD-3-Clause, MIT"
+homepage="https://github.com/wangqr/Aegisub"
+conflicts=Aegisub
+
+build_options="fftw openal portaudio"
+build_options_default="fftw"
+
+desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
+desc_option_openal="Enable support for openal"
+
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
+}
+
+pre_configure() {
+	# Aegisub fails to start on Wayland, so we have to force GDK to start it
+	# with the x11 backend
+	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
+		packages/desktop/aegisub.desktop.template.in
+
+	#./autogen.sh
+}
+
+post_install() {
+	vlicense LICENCE
+}

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
@ 2021-07-24  1:44 ` abenson
  2021-07-24  1:48 ` abenson
                   ` (76 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: abenson @ 2021-07-24  1:44 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-885983439

Comment:
`-git` packages won't be expected.  

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
  2021-07-24  1:44 ` abenson
@ 2021-07-24  1:48 ` abenson
  2021-07-24  1:49 ` abenson
                   ` (75 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: abenson @ 2021-07-24  1:48 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-885983439

Comment:
`-git` packages won't be accepted.  

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
  2021-07-24  1:44 ` abenson
  2021-07-24  1:48 ` abenson
@ 2021-07-24  1:49 ` abenson
  2021-07-24  1:56 ` pudiva
                   ` (74 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: abenson @ 2021-07-24  1:49 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-885984060

Comment:
Can the last release be built with specific patches?

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (2 preceding siblings ...)
  2021-07-24  1:49 ` abenson
@ 2021-07-24  1:56 ` pudiva
  2021-07-24  1:59 ` pudiva
                   ` (73 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-24  1:56 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-885984807

Comment:
@Gottox might be interested since they're the maintainer of the main Aegisub pkg

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (3 preceding siblings ...)
  2021-07-24  1:56 ` pudiva
@ 2021-07-24  1:59 ` pudiva
  2021-07-24  1:59 ` pudiva
                   ` (72 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-24  1:59 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-885985111

Comment:
> `-git` packages won't be accepted.

Not even if it's super nice? Pretty please? :smiley: 

> Can the last release be built with specific patches?

I've failed so far. I could try tomorrow.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (4 preceding siblings ...)
  2021-07-24  1:59 ` pudiva
@ 2021-07-24  1:59 ` pudiva
  2021-07-24  8:35 ` paper42
                   ` (71 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-24  1:59 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-885985153

Comment:
Also @ericonr 

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (5 preceding siblings ...)
  2021-07-24  1:59 ` pudiva
@ 2021-07-24  8:35 ` paper42
  2021-07-24 12:56 ` pudiva
                   ` (70 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: paper42 @ 2021-07-24  8:35 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-886021023

Comment:
Is there a reason why you chose to create a new package instead of updating the old one?

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (6 preceding siblings ...)
  2021-07-24  8:35 ` paper42
@ 2021-07-24 12:56 ` pudiva
  2021-07-24 13:18 ` [PR PATCH] [Updated] " pudiva
                   ` (69 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-24 12:56 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-886049979

Comment:
> Is there a reason why you chose to create a new package instead of updating the old one?

Yes, because it's based on a fork. Should I update the original pkg instead?

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (7 preceding siblings ...)
  2021-07-24 12:56 ` pudiva
@ 2021-07-24 13:18 ` pudiva
  2021-07-24 13:21 ` pudiva
                   ` (68 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-24 13:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

New package: Aegisub-wangqr-git (fix #31637)
This is a -git package because releases seem to be broken upstream and
don't build...

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 4125 bytes --]

From 1cc73955d68612b39fcaf194d3a940b765f70c0e Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH 1/2] New package: Aegisub-wangqr-git (fix #31637)

This is a -git package because releases seem to be broken upstream and
don't build...

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub-wangqr-git/template | 62 +++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 srcpkgs/Aegisub-wangqr-git/template

diff --git a/srcpkgs/Aegisub-wangqr-git/template b/srcpkgs/Aegisub-wangqr-git/template
new file mode 100644
index 000000000000..5c24bd03c3d7
--- /dev/null
+++ b/srcpkgs/Aegisub-wangqr-git/template
@@ -0,0 +1,62 @@
+# Template file for 'Aegisub-wangqr-git'
+pkgname=Aegisub-wangqr-git
+version=20210713
+revision=1
+_githash=418a276cc8dbdece4c005318c28e962e2920eb19
+wrksrc="${pkgname}-${_githash}"
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="
+	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+	-DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+	-DWITH_OPENAL=$(vopt_if openal ON OFF)
+	-DWITH_FFTW3=$(vopt_if fftw ON OFF)
+"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
+makedepends="
+	alsa-lib-devel
+	boost-devel
+	libcurl-devel
+	fontconfig-devel
+	freetype-devel
+	hunspell-devel
+	icu-devel
+	libass-devel
+	libffms2-devel
+	lua52-devel
+	MesaLib-devel
+	wxWidgets-gtk3-devel
+	$(vopt_if fftw fftw-devel)
+	$(vopt_if openal libopenal-devel)
+	$(vopt_if portaudio portaudio-devel)
+"
+short_desc="Tool for creating and modifying subtitles (wangqr fork)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
+license="BSD-3-Clause, MIT"
+homepage="https://github.com/wangqr/Aegisub"
+conflicts=Aegisub
+
+build_options="fftw openal portaudio"
+build_options_default="fftw"
+
+desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
+desc_option_openal="Enable support for openal"
+
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
+}
+
+pre_configure() {
+	# Aegisub fails to start on Wayland, so we have to force GDK to start it
+	# with the x11 backend
+	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
+		packages/desktop/aegisub.desktop.template.in
+
+	#./autogen.sh
+}
+
+post_install() {
+	vlicense LICENCE
+}

From 8ce963aa5f0adf89f8e262202fe9117635422303 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 14:14:41 +0100
Subject: [PATCH 2/2] New package: Aegisub-wangqr (fix #31637)

This package relies on git because release tarballs seem to be broken
upstream and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 .../{Aegisub-wangqr-git => Aegisub-wangqr}/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 rename srcpkgs/{Aegisub-wangqr-git => Aegisub-wangqr}/template (87%)

diff --git a/srcpkgs/Aegisub-wangqr-git/template b/srcpkgs/Aegisub-wangqr/template
similarity index 87%
rename from srcpkgs/Aegisub-wangqr-git/template
rename to srcpkgs/Aegisub-wangqr/template
index 5c24bd03c3d7..d388791c0ab7 100644
--- a/srcpkgs/Aegisub-wangqr-git/template
+++ b/srcpkgs/Aegisub-wangqr/template
@@ -1,9 +1,8 @@
-# Template file for 'Aegisub-wangqr-git'
-pkgname=Aegisub-wangqr-git
-version=20210713
+# Template file for 'Aegisub-wangqr'
+pkgname=Aegisub-wangqr
+version=3.3.2
 revision=1
-_githash=418a276cc8dbdece4c005318c28e962e2920eb19
-wrksrc="${pkgname}-${_githash}"
+wrksrc="${pkgname}-${version}"
 build_style=cmake
 cmake_builddir="BUILD"
 configure_args="
@@ -23,7 +22,7 @@ makedepends="
 	icu-devel
 	libass-devel
 	libffms2-devel
-	lua52-devel
+	LuaJIT-devel
 	MesaLib-devel
 	wxWidgets-gtk3-devel
 	$(vopt_if fftw fftw-devel)
@@ -45,7 +44,7 @@ desc_option_openal="Enable support for openal"
 do_fetch() {
 	git clone git://github.com/wangqr/Aegisub.git $wrksrc
 	cd $wrksrc
-	git checkout $_githash
+	git checkout v$version
 }
 
 pre_configure() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (8 preceding siblings ...)
  2021-07-24 13:18 ` [PR PATCH] [Updated] " pudiva
@ 2021-07-24 13:21 ` pudiva
  2021-07-24 14:22 ` paper42
                   ` (67 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-24 13:21 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-886053051

Comment:
Okay I've managed to checkout and build tag v3.3.2 with CMake (which had failed previously with autotools). I've added a new commit to this PR, please tell me which one you prefer and I'll squash/drop properly.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (9 preceding siblings ...)
  2021-07-24 13:21 ` pudiva
@ 2021-07-24 14:22 ` paper42
  2021-07-24 14:24 ` [PR REVIEW] " paper42
                   ` (66 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: paper42 @ 2021-07-24 14:22 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-886060594

Comment:
> > Is there a reason why you chose to create a new package instead of updating the old one?
> 
> Yes, because it's based on a fork. Should I update the original pkg instead?

If the original upstream is dead, I believe this PR should just replace the original template.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (10 preceding siblings ...)
  2021-07-24 14:22 ` paper42
@ 2021-07-24 14:24 ` paper42
  2021-07-24 21:15 ` ericonr
                   ` (65 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: paper42 @ 2021-07-24 14:24 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r676005378

Comment:
It would be much better to download the release tarball and patch the version detection script. I don't think it will be accepted this way.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (11 preceding siblings ...)
  2021-07-24 14:24 ` [PR REVIEW] " paper42
@ 2021-07-24 21:15 ` ericonr
  2021-07-24 21:19 ` [PR REVIEW] " ericonr
                   ` (64 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-07-24 21:15 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-886112266

Comment:
> If the original upstream is dead, I believe this PR should just replace the original template.

Agreed, that was the intention of my original suggestion.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (12 preceding siblings ...)
  2021-07-24 21:15 ` ericonr
@ 2021-07-24 21:19 ` ericonr
  2021-07-27  3:11 ` pudiva
                   ` (63 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-07-24 21:19 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r676045816

Comment:
We have packages that do this, for a myriad reasons, but yes, I'd rather not *move* to such a setup.

At worst, `echo $version > somefile` and patch cmake to read from that instead.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (13 preceding siblings ...)
  2021-07-24 21:19 ` [PR REVIEW] " ericonr
@ 2021-07-27  3:11 ` pudiva
  2021-07-27  3:40 ` ericonr
                   ` (62 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-27  3:11 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r677085127

Comment:
> At worst, echo $version > somefile and patch cmake to read from that instead.

Unfortunately this is how **build/version.sh** generates a new **git_version.h** file:

```sh
new_version_h="\
#define BUILD_GIT_VERSION_NUMBER ${git_revision}
#define BUILD_GIT_VERSION_STRING \"${git_version_str}\"
#define TAGGED_RELEASE ${tagged_release}
#define INSTALLER_VERSION \"${installer_version}\"
#define RESOURCE_BASE_VERSION ${resource_version}"
```

I'm concerned with the `BUILD_GIT_VERSION_NUMBER` macro, that is set to `$git_revision`, that is defined as:

```sh
last_svn_revision=6962
last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"

git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
```

which basically counts the number of commits since  `$last_svn_hash` and adds `$last_svn_revision`.

Now there are three options:

1. fetch with git
2. generate **git_version.h** on `pre_configure()`
   2.1. using hardcoded values manually extracted from git by the pkg maintainer (me???) on every update
   2.2. using the template's `$version` and never updating the other values

I did a little grepping but gave up following where the variable is ultimately used, so I'm not sure how important it is :woman_shrugging: 

To be honest, I'd rather go with what the maintainer supports, which is building from git, instead of creating more pkg maintenance overhead trying to build from the release tarballs that they'd have removed if they could:

> There are no release tarballs. “Source Code (zip)” and “Source Code (tar.gz)” listed on the release page are just automatically generated archives of the source, _without the `.git`-folder_ thus making them useless for regular building.Afaik GitHub doesn't allow to disable those.

https://github.com/wangqr/Aegisub/issues/116#issuecomment-886105613

... and I'm not even sure this is the only problem with the tarballs.

What do you think? :sparkles: :sparkles: :sparkles:

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (14 preceding siblings ...)
  2021-07-27  3:11 ` pudiva
@ 2021-07-27  3:40 ` ericonr
  2021-07-29  0:18 ` pudiva
                   ` (61 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-07-27  3:40 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r677093861

Comment:
Point against building from git is that we lose caching, so every build has to repeat the huge download. The reason we do it for `ardour` is because upstream deletes their pre-generated tarballs, but I still greatly dislike it...

IMO let's move the PR forward by pulling from git, then ponder more from there.

Please do like it's done in `ardour`, where we checkout a specific commit.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (15 preceding siblings ...)
  2021-07-27  3:40 ` ericonr
@ 2021-07-29  0:18 ` pudiva
  2021-07-29  0:45 ` [PR PATCH] [Updated] " pudiva
                   ` (60 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-29  0:18 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r678734940

Comment:
> Please do like it's done in ardour, where we checkout a specific commit.

You mean you want me to reference the commit hash instead of tag v3.3.2?

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (16 preceding siblings ...)
  2021-07-29  0:18 ` pudiva
@ 2021-07-29  0:45 ` pudiva
  2021-07-29  0:48 ` pudiva
                   ` (59 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-29  0:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

New package: Aegisub-wangqr-git (fix #31637)
This is a -git package because releases seem to be broken upstream and
don't build...

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29933 bytes --]

From 00e49ed752c81da063102a5a8909815dd468ae5f Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  79 ++++----
 12 files changed, 39 insertions(+), 679 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..ffe101a787d7 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,40 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
-makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
- $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+version=3.3.2
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="
+	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+	-DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+	-DWITH_OPENAL=$(vopt_if openal ON OFF)
+	-DWITH_FFTW3=$(vopt_if fftw ON OFF)
+"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
+makedepends="
+	alsa-lib-devel
+	boost-devel
+	libcurl-devel
+	fontconfig-devel
+	freetype-devel
+	hunspell-devel
+	icu-devel
+	libass-devel
+	libffms2-devel
+	LuaJIT-devel
+	MesaLib-devel
+	wxWidgets-gtk3-devel
+	$(vopt_if fftw fftw-devel)
+	$(vopt_if openal libopenal-devel)
+	$(vopt_if portaudio portaudio-devel)
+"
+short_desc="Subtitle editor (ssa, ass, srt) (wangqr fork)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+conflicts=Aegisub
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +42,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -55,7 +54,7 @@ pre_configure() {
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
 
-	autoreconf -fi
+	#./autogen.sh
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] New package: Aegisub-wangqr-git (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (17 preceding siblings ...)
  2021-07-29  0:45 ` [PR PATCH] [Updated] " pudiva
@ 2021-07-29  0:48 ` pudiva
  2021-07-29  0:50 ` [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 " pudiva
                   ` (58 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-29  0:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

New package: Aegisub-wangqr-git (fix #31637)
This is a -git package because releases seem to be broken upstream and
don't build...

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29933 bytes --]

From 803c66d734870cf9f18f4681017c02b186e4234d Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  79 ++++----
 12 files changed, 39 insertions(+), 679 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..721ff3e89f91 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,40 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
-makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
- $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+wrksrc="${pkgname}-${version}"
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="
+	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+	-DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+	-DWITH_OPENAL=$(vopt_if openal ON OFF)
+	-DWITH_FFTW3=$(vopt_if fftw ON OFF)
+"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
+makedepends="
+	alsa-lib-devel
+	boost-devel
+	libcurl-devel
+	fontconfig-devel
+	freetype-devel
+	hunspell-devel
+	icu-devel
+	libass-devel
+	libffms2-devel
+	LuaJIT-devel
+	MesaLib-devel
+	wxWidgets-gtk3-devel
+	$(vopt_if fftw fftw-devel)
+	$(vopt_if openal libopenal-devel)
+	$(vopt_if portaudio portaudio-devel)
+"
+short_desc="Subtitle editor (ssa, ass, srt) (wangqr fork)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+conflicts=Aegisub
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +42,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -55,7 +54,7 @@ pre_configure() {
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
 
-	autoreconf -fi
+	#./autogen.sh
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (18 preceding siblings ...)
  2021-07-29  0:48 ` pudiva
@ 2021-07-29  0:50 ` pudiva
  2021-08-03 17:07 ` paper42
                   ` (57 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-07-29  0:50 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r678745066

Comment:
> > Please do like it's done in ardour, where we checkout a specific commit.
> 
> You mean you want me to reference the commit hash instead of tag v3.3.2?

I did that already. Please, take a look and tell me what you think. :sparkles: 

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (20 preceding siblings ...)
  2021-08-03 17:07 ` paper42
@ 2021-08-03 17:07 ` paper42
  2021-08-03 17:07 ` paper42
                   ` (55 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: paper42 @ 2021-08-03 17:07 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r681943456

Comment:
we usually have multiple dependencies on one line and wrap at 80 columns

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (19 preceding siblings ...)
  2021-07-29  0:50 ` [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 " pudiva
@ 2021-08-03 17:07 ` paper42
  2021-08-03 17:07 ` paper42
                   ` (56 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: paper42 @ 2021-08-03 17:07 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r681942841

Comment:
this wrksrc is default, so no need to overwrite it

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (22 preceding siblings ...)
  2021-08-03 17:07 ` paper42
@ 2021-08-03 17:07 ` paper42
  2021-08-03 17:07 ` paper42
                   ` (53 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: paper42 @ 2021-08-03 17:07 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r681945605

Comment:
this is an old artifact from when this was a separate package, now Aegisub shouldn't conflict with Aegisub

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (21 preceding siblings ...)
  2021-08-03 17:07 ` paper42
@ 2021-08-03 17:07 ` paper42
  2021-08-03 17:07 ` paper42
                   ` (54 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: paper42 @ 2021-08-03 17:07 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r681947308

Comment:
the added line is commented out, so it doesn't do anything

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (23 preceding siblings ...)
  2021-08-03 17:07 ` paper42
@ 2021-08-03 17:07 ` paper42
  2021-08-03 20:11 ` pudiva
                   ` (52 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: paper42 @ 2021-08-03 17:07 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r681944431

Comment:
is the wanqr fork very different from the original or is it just a maintained continuation of the original? In that case, I don't think we would need to include (wangqr fork)

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (24 preceding siblings ...)
  2021-08-03 17:07 ` paper42
@ 2021-08-03 20:11 ` pudiva
  2021-08-03 20:12 ` [PR PATCH] [Updated] " pudiva
                   ` (51 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:11 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r682068194

Comment:
I'm not sure. I'd keep it anyway so it's easy to see which fork we're using, as there might be others around.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (25 preceding siblings ...)
  2021-08-03 20:11 ` pudiva
@ 2021-08-03 20:12 ` pudiva
  2021-08-03 20:12 ` [PR REVIEW] " ericonr
                   ` (50 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:12 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29792 bytes --]

From 4bd7cba5c2942845a3ad8eb4e74b42ee65251412 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  63 +++---
 12 files changed, 23 insertions(+), 679 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..287eb1b9e604 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,26 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="
+	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+	-DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+	-DWITH_OPENAL=$(vopt_if openal ON OFF)
+	-DWITH_FFTW3=$(vopt_if fftw ON OFF)
+"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
- $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+	freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+	LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw
+	fftw-devel) $(vopt_if openal libopenal-devel) $(vopt_if portaudio
+	portaudio-devel)"
+short_desc="Subtitle editor (ssa, ass, srt) (wangqr fork)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +28,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +39,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (26 preceding siblings ...)
  2021-08-03 20:12 ` [PR PATCH] [Updated] " pudiva
@ 2021-08-03 20:12 ` ericonr
  2021-08-03 20:13 ` ericonr
                   ` (49 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-08-03 20:12 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r682068971

Comment:
That information can usually be had from other sources, like the homepage :)

I'd prefer to leave the description lean.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (27 preceding siblings ...)
  2021-08-03 20:12 ` [PR REVIEW] " ericonr
@ 2021-08-03 20:13 ` ericonr
  2021-08-03 20:14 ` [PR PATCH] [Updated] " pudiva
                   ` (48 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-08-03 20:13 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r682069812

Comment:
Multiline strings should be indented with spaces, and don't leave the terminating quote in a new line.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (28 preceding siblings ...)
  2021-08-03 20:13 ` ericonr
@ 2021-08-03 20:14 ` pudiva
  2021-08-03 20:14 ` [PR REVIEW] " pudiva
                   ` (47 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29778 bytes --]

From c87b6134262298c41a7fc938a3b17510f4012cd8 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  63 +++---
 12 files changed, 23 insertions(+), 679 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..905788865f95 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,26 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="
+	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+	-DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+	-DWITH_OPENAL=$(vopt_if openal ON OFF)
+	-DWITH_FFTW3=$(vopt_if fftw ON OFF)
+"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
- $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+	freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+	LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw
+	fftw-devel) $(vopt_if openal libopenal-devel) $(vopt_if portaudio
+	portaudio-devel)"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +28,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +39,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (29 preceding siblings ...)
  2021-08-03 20:14 ` [PR PATCH] [Updated] " pudiva
@ 2021-08-03 20:14 ` pudiva
  2021-08-03 20:15 ` [PR PATCH] [Updated] " pudiva
                   ` (46 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:14 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r682070242

Comment:
Okayy, done!

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (30 preceding siblings ...)
  2021-08-03 20:14 ` [PR REVIEW] " pudiva
@ 2021-08-03 20:15 ` pudiva
  2021-08-03 20:15 ` [PR REVIEW] " pudiva
                   ` (45 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29784 bytes --]

From 69e39542fb3a52ad940a55c0ebf39be3390ea125 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  62 ++----
 12 files changed, 22 insertions(+), 679 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..ef707096da28 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,25 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="
+  -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+  -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+  -DWITH_OPENAL=$(vopt_if openal ON OFF)
+  -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
- $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+  freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+  LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw
+  fftw-devel) $(vopt_if openal libopenal-devel) $(vopt_if portaudio
+  portaudio-devel)"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +27,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +38,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (31 preceding siblings ...)
  2021-08-03 20:15 ` [PR PATCH] [Updated] " pudiva
@ 2021-08-03 20:15 ` pudiva
  2021-08-03 20:17 ` [PR PATCH] [Updated] " pudiva
                   ` (44 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:15 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r682071073

Comment:
done!

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (32 preceding siblings ...)
  2021-08-03 20:15 ` [PR REVIEW] " pudiva
@ 2021-08-03 20:17 ` pudiva
  2021-08-03 20:19 ` pudiva
                   ` (43 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:17 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29777 bytes --]

From b0955544ae45947fdfaa6af811f88fe86e2e8f88 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  60 ++----
 12 files changed, 20 insertions(+), 679 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a38734c3dedb 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,23 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+  -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF) -DWITH_OPENAL=$(vopt_if openal
+  ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
- $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+  freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+  LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw
+  fftw-devel) $(vopt_if openal libopenal-devel) $(vopt_if portaudio
+  portaudio-devel)"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +25,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +36,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (33 preceding siblings ...)
  2021-08-03 20:17 ` [PR PATCH] [Updated] " pudiva
@ 2021-08-03 20:19 ` pudiva
  2021-08-03 20:20 ` [PR REVIEW] " pudiva
                   ` (42 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:19 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29695 bytes --]

From 1b71790f6523efa8725226bbbf91f24beb03b999 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  57 ++----
 12 files changed, 18 insertions(+), 678 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..24df9df32fb9 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,22 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF) -DWITH_OPENAL=$(vopt_if openal ON
+ OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+ LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +24,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +35,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (34 preceding siblings ...)
  2021-08-03 20:19 ` pudiva
@ 2021-08-03 20:20 ` pudiva
  2021-08-04 12:01 ` ericonr
                   ` (41 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-03 20:20 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r682073766

Comment:
okay looks like the linter wants me to indent with one space, not two...

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (35 preceding siblings ...)
  2021-08-03 20:20 ` [PR REVIEW] " pudiva
@ 2021-08-04 12:01 ` ericonr
  2021-08-04 20:27 ` [PR PATCH] [Updated] " pudiva
                   ` (40 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-08-04 12:01 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-892600014

Comment:
For fixing cross, you might want to take a look at how kicad does it, maybe. It uses our CMake wx helper.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (36 preceding siblings ...)
  2021-08-04 12:01 ` ericonr
@ 2021-08-04 20:27 ` pudiva
  2021-08-10 21:56 ` pudiva
                   ` (39 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-04 20:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29717 bytes --]

From a5036736443157a24471d63c5d19d7d669a06a78 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  58 ++----
 12 files changed, 19 insertions(+), 678 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..d911e228702e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,23 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+ LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +25,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +36,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (37 preceding siblings ...)
  2021-08-04 20:27 ` [PR PATCH] [Updated] " pudiva
@ 2021-08-10 21:56 ` pudiva
  2021-08-10 22:13 ` pudiva
                   ` (38 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-10 21:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29836 bytes --]

From abe0f8601b3c93a46d9e1fe1ecc7871ff342dfb0 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  57 ++----
 12 files changed, 21 insertions(+), 675 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..abee56d5f35d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,23 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+ LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +25,15 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
 if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
+	configure_args+="-DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
+	hostmakedepends+="wxWidgets-gtk3-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +41,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (38 preceding siblings ...)
  2021-08-10 21:56 ` pudiva
@ 2021-08-10 22:13 ` pudiva
  2021-08-11  2:13 ` [PR REVIEW] " ericonr
                   ` (37 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-10 22:13 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-896347173

Comment:
1 week later... looks like GitHub Actions is offline atm. Will look again tomorrow if CI is passing. :)

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (39 preceding siblings ...)
  2021-08-10 22:13 ` pudiva
@ 2021-08-11  2:13 ` ericonr
  2021-08-11  2:13 ` ericonr
                   ` (36 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-08-11  2:13 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r686440234

Comment:
Do you know if this is still true?

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (40 preceding siblings ...)
  2021-08-11  2:13 ` [PR REVIEW] " ericonr
@ 2021-08-11  2:13 ` ericonr
  2021-08-11 12:06 ` pudiva
                   ` (35 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-08-11  2:13 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r686440580

Comment:
```suggestion
	configure_args+=" -DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
	hostmakedepends+=" wxWidgets-gtk3-devel"
```

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (41 preceding siblings ...)
  2021-08-11  2:13 ` ericonr
@ 2021-08-11 12:06 ` pudiva
  2021-08-11 12:07 ` pudiva
                   ` (34 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-11 12:06 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r686765165

Comment:
I didn't test on Wayland, but it seems it's not! Thanks! :sparkles:

https://github.com/wangqr/Aegisub/blob/723d01d13088d9b1bccc821f1129d045a0b74e2c/packages/desktop/aegisub.desktop.template.in#L7

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (42 preceding siblings ...)
  2021-08-11 12:06 ` pudiva
@ 2021-08-11 12:07 ` pudiva
  2021-08-11 12:12 ` [PR PATCH] [Updated] " pudiva
                   ` (33 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-11 12:07 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r686765662

Comment:
ooops :upside_down_face: 

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (43 preceding siblings ...)
  2021-08-11 12:07 ` pudiva
@ 2021-08-11 12:12 ` pudiva
  2021-08-11 12:13 ` [PR REVIEW] " pudiva
                   ` (32 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-11 12:12 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29877 bytes --]

From be1393facb395ba3f695c477d222b4d1dab97df2 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  64 ++----
 12 files changed, 21 insertions(+), 682 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..54876d93bcc4 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,23 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+ LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +25,15 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
 if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
+	configure_args+=" -DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
+	hostmakedepends+=" wxWidgets-gtk3-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (44 preceding siblings ...)
  2021-08-11 12:12 ` [PR PATCH] [Updated] " pudiva
@ 2021-08-11 12:13 ` pudiva
  2021-08-11 12:13 ` pudiva
                   ` (31 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-11 12:13 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r686769975

Comment:
done :sparkles: 

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (45 preceding siblings ...)
  2021-08-11 12:13 ` [PR REVIEW] " pudiva
@ 2021-08-11 12:13 ` pudiva
  2021-08-11 12:22 ` pudiva
                   ` (30 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-11 12:13 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r686770090

Comment:
fixed :sparkles: 

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (46 preceding siblings ...)
  2021-08-11 12:13 ` pudiva
@ 2021-08-11 12:22 ` pudiva
  2021-08-11 12:23 ` pudiva
                   ` (29 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-11 12:22 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-896780639

Comment:
> For fixing cross, you might want to take a look at how kicad does it, maybe. It uses our CMake wx helper.

@ericonr looks like cross is still broken and I don't know how to fix it :(

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (47 preceding siblings ...)
  2021-08-11 12:22 ` pudiva
@ 2021-08-11 12:23 ` pudiva
  2021-08-11 12:33 ` pudiva
                   ` (28 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-11 12:23 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-896780639

Comment:
> For fixing cross, you might want to take a look at how kicad does it, maybe. It uses our CMake wx helper.

@ericonr looks like cross is still broken and ~~I don't know how to fix it :(~~ actually I do have an idea. :eyes: 

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (48 preceding siblings ...)
  2021-08-11 12:23 ` pudiva
@ 2021-08-11 12:33 ` pudiva
  2021-08-11 15:09 ` ericonr
                   ` (27 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-11 12:33 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-896787573

Comment:
```
[8/328] Linking C executable luajit-minilua
[9/328] Generating vendor/luajit/src/gen/buildvm_arch.h
FAILED: vendor/luajit/src/gen/buildvm_arch.h /builddir/Aegisub-3.3.2/BUILD/vendor/luajit/src/gen/buildvm_arch.h 
cd /builddir/Aegisub-3.3.2/vendor/luajit/src && /usr/bin/cmake -E make_directory /builddir/Aegisub-3.3.2/BUILD/vendor/luajit/src/gen && luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o /builddir/Aegisub-3.3.2/BUILD/vendor/luajit/src/gen/buildvm_arch.h vm_x86.dasc
/bin/sh: line 1: luajit-minilua: command not found
```

so looks like it builds `luajit-minilua` and then tries to use it, which probably fails because host can't run target binaries?

I know there's an option to use system lua, but I had problems with it before. I think it has to do with the version void ships.

Mind explaining why cross compiling is important here, @ericonr ? :slightly_smiling_face: 

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (49 preceding siblings ...)
  2021-08-11 12:33 ` pudiva
@ 2021-08-11 15:09 ` ericonr
  2021-08-12 10:11 ` pudiva
                   ` (26 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-08-11 15:09 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-896909529

Comment:
> so looks like it builds luajit-minilua and then tries to use it, which probably fails because host can't run target binaries?

More specifically, it fails to find the binary's dynamic linker, which makes for quite a terrible error message. But yes :)

> I know there's an option to use system lua, but I had problems with it before. I think it has to do with the version void ships.

Do you remember the problem you had with it? Void ships a bunch of Lua versions...

> Mind explaining why cross compiling is important here, @ericonr ? slightly_smiling_face

Mostly so we can build it for ARM/aarch64 :) technically it's broken for cross already, so adding `nocross` would be ok, but it's always nice to improve a situation :p

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (50 preceding siblings ...)
  2021-08-11 15:09 ` ericonr
@ 2021-08-12 10:11 ` pudiva
  2021-08-12 17:56 ` [PR PATCH] [Updated] " pudiva
                   ` (25 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-12 10:11 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-897514495

Comment:
> > so looks like it builds luajit-minilua and then tries to use it, which probably fails because host can't run target binaries?
> 
> More specifically, it fails to find the binary's dynamic linker, which makes for quite a terrible error message. But yes :)

Sorry, this is indeed a terribly misleading error message that I have gotten used to and sometimes forget how not obvious it can be to others ~ thanks for explaining :sparkles: 

> > I know there's an option to use system lua, but I had problems with it before. I think it has to do with the version void ships.
> 
> Do you remember the problem you had with it? Void ships a bunch of Lua versions...

The old template had the option to use system Lua, but it failed because some Aegisub script uses a syntax that is incompatible with the version void ships... or at least that's what I remember.

Anyway, that was with the problematic `./configure` script, the CMake doesn't seem to have the option of using system Lua at all.

> > Mind explaining why cross compiling is important here, @ericonr ? slightly_smiling_face
> 
> Mostly so we can build it for ARM/aarch64 :) technically it's broken for cross already, so adding `nocross` would be ok, but it's always nice to improve a situation :p

Cool, so I'll try a bit more later today and then add the `nocross` if everything fails. :)


^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (51 preceding siblings ...)
  2021-08-12 10:11 ` pudiva
@ 2021-08-12 17:56 ` pudiva
  2021-08-12 18:17 ` pudiva
                   ` (24 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-12 17:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29816 bytes --]

From 631240a517850f9ce81940dfd17f4f2a3cae078a Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  68 ++-----
 12 files changed, 21 insertions(+), 686 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..524ead40cd2b 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,24 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
- $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+ MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel) $(vopt_if openal
+ libopenal-devel) $(vopt_if portaudio portaudio-devel)"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +26,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (52 preceding siblings ...)
  2021-08-12 17:56 ` [PR PATCH] [Updated] " pudiva
@ 2021-08-12 18:17 ` pudiva
  2021-08-13 14:50 ` pudiva
                   ` (23 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-12 18:17 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29769 bytes --]

From 0fb2f9efa424a19c5c045c5a690fd76348e45005 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  66 ++----
 12 files changed, 20 insertions(+), 685 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..373176f1b2ec 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,24 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+ LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +26,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (53 preceding siblings ...)
  2021-08-12 18:17 ` pudiva
@ 2021-08-13 14:50 ` pudiva
  2021-08-13 15:51 ` pudiva
                   ` (22 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-13 14:50 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29769 bytes --]

From 2ac1cf25f20492669811920597b332da1d6aa8d3 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  66 ++----
 12 files changed, 20 insertions(+), 685 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..373176f1b2ec 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,24 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=13
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+ LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +26,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (54 preceding siblings ...)
  2021-08-13 14:50 ` pudiva
@ 2021-08-13 15:51 ` pudiva
  2021-08-13 17:59 ` pudiva
                   ` (21 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-13 15:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 31052 bytes --]

From 2ac1cf25f20492669811920597b332da1d6aa8d3 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH 1/2] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  66 ++----
 12 files changed, 20 insertions(+), 685 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..373176f1b2ec 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,24 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=13
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+ LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +26,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 post_install() {

From bfa3992731491c56f6efa4c1642d1f71d20d91e9 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Fri, 13 Aug 2021 16:51:23 +0100
Subject: [PATCH 2/2] remove some deps and see what CI says

---
 srcpkgs/Aegisub/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 373176f1b2ec..1815137a999e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -9,10 +9,10 @@ cmake_builddir="BUILD"
 configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
  -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
  -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
+hostmakedepends="gettext-devel intltool pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
  freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
- LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
+ MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
 short_desc="Subtitle editor (ssa, ass, srt)"
 maintainer="pudiva <rogi@skylittlesystem.org>"

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (55 preceding siblings ...)
  2021-08-13 15:51 ` pudiva
@ 2021-08-13 17:59 ` pudiva
  2021-08-13 18:02 ` pudiva
                   ` (20 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-13 17:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29668 bytes --]

From 52660715a4f92017ee97eb62a17b16c181155b2d Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  64 ++----
 12 files changed, 19 insertions(+), 684 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..1815137a999e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,24 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=13
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="gettext-devel intltool pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
  MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +26,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (56 preceding siblings ...)
  2021-08-13 17:59 ` pudiva
@ 2021-08-13 18:02 ` pudiva
  2021-08-23 17:54 ` pudiva
                   ` (19 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-13 18:02 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-898630829

Comment:
Ok so I couldn't fix cross, but I could remove some deps that weren't necessary anymore: LuaJIT, automake and libtool.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (57 preceding siblings ...)
  2021-08-13 18:02 ` pudiva
@ 2021-08-23 17:54 ` pudiva
  2021-08-27 16:05 ` [PR PATCH] [Updated] " pudiva
                   ` (18 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-23 17:54 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-903985675

Comment:
bump? :upside_down_face:

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (58 preceding siblings ...)
  2021-08-23 17:54 ` pudiva
@ 2021-08-27 16:05 ` pudiva
  2021-08-27 16:08 ` pudiva
                   ` (17 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-27 16:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29684 bytes --]

From 3fef110653d22d9532d7efbe389107267ba41769 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to 3.3.2, switch to a maintained fork

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

Fix #31637
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  64 ++----
 12 files changed, 19 insertions(+), 684 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..1815137a999e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,24 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=13
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="gettext-devel intltool pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
  MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +26,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (59 preceding siblings ...)
  2021-08-27 16:05 ` [PR PATCH] [Updated] " pudiva
@ 2021-08-27 16:08 ` pudiva
  2021-09-10 17:16 ` pudiva
                   ` (16 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-08-27 16:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29645 bytes --]

From 3ea3719fdb14033964313b245374a0b20cc092c7 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to 3.3.2, switch to a maintained fork

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

Fix #31637
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  57 ++----
 12 files changed, 19 insertions(+), 677 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2f001336d9c4 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,24 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=13
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="gettext-devel intltool pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
  MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +26,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +37,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (60 preceding siblings ...)
  2021-08-27 16:08 ` pudiva
@ 2021-09-10 17:16 ` pudiva
  2021-09-16  2:28 ` [PR REVIEW] " ericonr
                   ` (15 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-09-10 17:16 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-917072871

Comment:
@ericonr bump :upside_down_face:

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (61 preceding siblings ...)
  2021-09-10 17:16 ` pudiva
@ 2021-09-16  2:28 ` ericonr
  2021-09-16  2:56 ` ericonr
                   ` (14 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-16  2:28 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r709703883

Comment:
I think you forgot to remove this code block?

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (62 preceding siblings ...)
  2021-09-16  2:28 ` [PR REVIEW] " ericonr
@ 2021-09-16  2:56 ` ericonr
  2021-09-16  3:20 ` ericonr
                   ` (13 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-16  2:56 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-920536018

Comment:
And please import https://github.com/wangqr/Aegisub/pull/121 ! It should allow us to build from tarball instead of git clone :)

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (63 preceding siblings ...)
  2021-09-16  2:56 ` ericonr
@ 2021-09-16  3:20 ` ericonr
  2021-09-16 22:38 ` [PR REVIEW] " pudiva
                   ` (12 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-16  3:20 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-920544354

Comment:
Ah, btw, to use that, you do `export FORCE_GIT_VERSION=$version` in `pre_build`

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (64 preceding siblings ...)
  2021-09-16  3:20 ` ericonr
@ 2021-09-16 22:38 ` pudiva
  2021-09-16 22:42 ` pudiva
                   ` (11 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-09-16 22:38 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r710544644

Comment:
I re-added it as @paper42 said it was still broken on wayland https://github.com/void-linux/void-packages/pull/32162#pullrequestreview-737696497

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (65 preceding siblings ...)
  2021-09-16 22:38 ` [PR REVIEW] " pudiva
@ 2021-09-16 22:42 ` pudiva
  2021-09-17 13:18 ` [PR REVIEW] " ericonr
                   ` (10 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-09-16 22:42 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-921307519

Comment:
> And please import [wangqr/Aegisub#121](https://github.com/wangqr/Aegisub/pull/121) ! It should allow us to build from tarball instead of git clone :)

do you mean cherry-pick this patch and apply to the latest tarball?

btw thanks for the patch! :sparkles::sparkles::sparkles:

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (66 preceding siblings ...)
  2021-09-16 22:42 ` pudiva
@ 2021-09-17 13:18 ` ericonr
  2021-09-17 13:18 ` ericonr
                   ` (9 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-17 13:18 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r711047785

Comment:
Sure, but the file in https://github.com/wangqr/Aegisub/blob/dev/packages/desktop/aegisub.desktop.template.in already  applies the variable (if you switch to using `vsed` there it will print a warning that it didn't replace anything).

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (67 preceding siblings ...)
  2021-09-17 13:18 ` [PR REVIEW] " ericonr
@ 2021-09-17 13:18 ` ericonr
  2021-09-17 18:12 ` [PR REVIEW] " pudiva
                   ` (8 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-17 13:18 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-921790833

Comment:
> do you mean cherry-pick this patch and apply to the latest tarball?

Exactly :)

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (68 preceding siblings ...)
  2021-09-17 13:18 ` ericonr
@ 2021-09-17 18:12 ` pudiva
  2021-09-17 18:45 ` ericonr
                   ` (7 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-09-17 18:12 UTC (permalink / raw)
  To: ml

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

New review comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r711258569

Comment:
ohhh sorry my confusion

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (69 preceding siblings ...)
  2021-09-17 18:12 ` [PR REVIEW] " pudiva
@ 2021-09-17 18:45 ` ericonr
  2021-09-17 19:10 ` [PR PATCH] [Updated] " pudiva
                   ` (6 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-17 18:45 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#discussion_r711277389

Comment:
no worries ;)

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (70 preceding siblings ...)
  2021-09-17 18:45 ` ericonr
@ 2021-09-17 19:10 ` pudiva
  2021-09-17 19:11 ` pudiva
                   ` (5 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-09-17 19:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 32294 bytes --]

From aa6522e88ce355c5b1d642474287385729672d87 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to 3.3.2, switch to a maintained fork

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

Fix #31637
---
 .../allow-cmake-builds-from-tarball.patch     |  56 ++++++
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  64 ++----
 13 files changed, 75 insertions(+), 684 deletions(-)
 create mode 100644 srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
new file mode 100644
index 000000000000..705965ca1df9
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
@@ -0,0 +1,56 @@
+From dee94396eee4b67eafae7f00e540cb284769473d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Wed, 15 Sep 2021 23:54:10 -0300
+Subject: [PATCH] Allow CMake builds from tarball.
+
+Add environment variable that can be passed to build/version.sh to force
+a git version if it can't use git to determine one.
+
+Since we are here, also fix:
+
+- use of 'return' in a script, should be 'exit'
+- wrong grep command to match numerical version with 3 digits
+---
+ build/version.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/build/version.sh b/build/version.sh
+index 8cea0a3f3..d505341e4 100755
+--- a/build/version.sh
++++ b/build/version.sh
+@@ -10,13 +10,13 @@ if ! test -d "${srcdir}/.git"; then
+     done < "${version_h_path}"
+     if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
+       export VERSION_SOURCE="from cached git_version.h"
+-      return 0
++      exit 0
+     else
+       echo "invalid git_version.h"
+       exit 2
+     fi
+-  else
+-    echo "git repo not found and no cached git_version.h"
++  elif [ -z "$FORCE_GIT_VERSION" ]; then
++    echo "git repo not found and no cached git_version.h - use FORCE_GIT_VERSION to override"
+     exit 2
+   fi
+ fi
+@@ -25,13 +25,13 @@ last_svn_revision=6962
+ last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
+ 
+ git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
+-git_version_str=$(git describe --exact-match 2> /dev/null)
++git_version_str=${FORCE_GIT_VERSION:-$(git describe --exact-match 2> /dev/null)}
+ installer_version='0.0.0'
+ resource_version='0, 0, 0'
+ if test x$git_version_str != x; then
+   git_version_str="${git_version_str##v}"
+   tagged_release=1
+-  if [ $(echo $git_version_str | grep '\d\.\d\.\d') ]; then
++  if [ $(echo $git_version_str | grep '[0-9].[0-9].[0-9]') ]; then
+     installer_version=$git_version_str
+     resource_version=$(echo $git_version_str | sed 's/\./, /g')
+   fi
+-- 
+2.33.0
+
diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..b5bdec2772e2 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,26 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=13
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="gettext-devel intltool pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
  MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+distfiles="https://github.com/wangqr/Aegisub/archive/v${version}.tar.gz"
+checksum="9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +28,8 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+pre_build() {
+	export FORCE_GIT_VERSION="$version"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (71 preceding siblings ...)
  2021-09-17 19:10 ` [PR PATCH] [Updated] " pudiva
@ 2021-09-17 19:11 ` pudiva
  2021-09-17 19:15 ` pudiva
                   ` (4 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-09-17 19:11 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 32243 bytes --]

From b2aee7e3009d4c46ee6345c06fc822a66e26416d Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to 3.3.2, switch to a maintained fork

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

Fix #31637
---
 .../allow-cmake-builds-from-tarball.patch     |  56 ++++++
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  63 ++----
 13 files changed, 74 insertions(+), 684 deletions(-)
 create mode 100644 srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
new file mode 100644
index 000000000000..705965ca1df9
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
@@ -0,0 +1,56 @@
+From dee94396eee4b67eafae7f00e540cb284769473d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Wed, 15 Sep 2021 23:54:10 -0300
+Subject: [PATCH] Allow CMake builds from tarball.
+
+Add environment variable that can be passed to build/version.sh to force
+a git version if it can't use git to determine one.
+
+Since we are here, also fix:
+
+- use of 'return' in a script, should be 'exit'
+- wrong grep command to match numerical version with 3 digits
+---
+ build/version.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/build/version.sh b/build/version.sh
+index 8cea0a3f3..d505341e4 100755
+--- a/build/version.sh
++++ b/build/version.sh
+@@ -10,13 +10,13 @@ if ! test -d "${srcdir}/.git"; then
+     done < "${version_h_path}"
+     if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
+       export VERSION_SOURCE="from cached git_version.h"
+-      return 0
++      exit 0
+     else
+       echo "invalid git_version.h"
+       exit 2
+     fi
+-  else
+-    echo "git repo not found and no cached git_version.h"
++  elif [ -z "$FORCE_GIT_VERSION" ]; then
++    echo "git repo not found and no cached git_version.h - use FORCE_GIT_VERSION to override"
+     exit 2
+   fi
+ fi
+@@ -25,13 +25,13 @@ last_svn_revision=6962
+ last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
+ 
+ git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
+-git_version_str=$(git describe --exact-match 2> /dev/null)
++git_version_str=${FORCE_GIT_VERSION:-$(git describe --exact-match 2> /dev/null)}
+ installer_version='0.0.0'
+ resource_version='0, 0, 0'
+ if test x$git_version_str != x; then
+   git_version_str="${git_version_str##v}"
+   tagged_release=1
+-  if [ $(echo $git_version_str | grep '\d\.\d\.\d') ]; then
++  if [ $(echo $git_version_str | grep '[0-9].[0-9].[0-9]') ]; then
+     installer_version=$git_version_str
+     resource_version=$(echo $git_version_str | sed 's/\./, /g')
+   fi
+-- 
+2.33.0
+
diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..96c9ffa4561c 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,25 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=13
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="gettext-devel intltool pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
  MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+distfiles="https://github.com/wangqr/Aegisub/archive/v${version}.tar.gz"
+checksum="9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +27,8 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+pre_build() {
+	export FORCE_GIT_VERSION="$version"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (72 preceding siblings ...)
  2021-09-17 19:11 ` pudiva
@ 2021-09-17 19:15 ` pudiva
  2021-09-20 19:37 ` [PR PATCH] [Updated] " ericonr
                   ` (3 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: pudiva @ 2021-09-17 19:15 UTC (permalink / raw)
  To: ml

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

New comment by pudiva on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-922023059

Comment:
@ericonr I think it's good now.

I had to resolve a merge conflict with your patch as it didn't apply to the tarball ~ I think it's fine, but a quick look wouldn't hurt. :eyes:

Cheers! :slightly_smiling_face:

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (73 preceding siblings ...)
  2021-09-17 19:15 ` pudiva
@ 2021-09-20 19:37 ` ericonr
  2021-09-20 19:38 ` ericonr
                   ` (2 subsequent siblings)
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-20 19:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] 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/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 32054 bytes --]

From 784b27d3ea696a3690162598af0e621a958d89f2 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to 3.3.2, switch to a maintained fork

We use https://github.com/wangqr/Aegisub/pull/121 to allow building from
a tarball and avoid cloning from git.

Fix #31637
---
 .../allow-cmake-builds-from-tarball.patch     |  56 ++++++
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  63 ++----
 13 files changed, 74 insertions(+), 684 deletions(-)
 create mode 100644 srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
new file mode 100644
index 000000000000..705965ca1df9
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
@@ -0,0 +1,56 @@
+From dee94396eee4b67eafae7f00e540cb284769473d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Wed, 15 Sep 2021 23:54:10 -0300
+Subject: [PATCH] Allow CMake builds from tarball.
+
+Add environment variable that can be passed to build/version.sh to force
+a git version if it can't use git to determine one.
+
+Since we are here, also fix:
+
+- use of 'return' in a script, should be 'exit'
+- wrong grep command to match numerical version with 3 digits
+---
+ build/version.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/build/version.sh b/build/version.sh
+index 8cea0a3f3..d505341e4 100755
+--- a/build/version.sh
++++ b/build/version.sh
+@@ -10,13 +10,13 @@ if ! test -d "${srcdir}/.git"; then
+     done < "${version_h_path}"
+     if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
+       export VERSION_SOURCE="from cached git_version.h"
+-      return 0
++      exit 0
+     else
+       echo "invalid git_version.h"
+       exit 2
+     fi
+-  else
+-    echo "git repo not found and no cached git_version.h"
++  elif [ -z "$FORCE_GIT_VERSION" ]; then
++    echo "git repo not found and no cached git_version.h - use FORCE_GIT_VERSION to override"
+     exit 2
+   fi
+ fi
+@@ -25,13 +25,13 @@ last_svn_revision=6962
+ last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
+ 
+ git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
+-git_version_str=$(git describe --exact-match 2> /dev/null)
++git_version_str=${FORCE_GIT_VERSION:-$(git describe --exact-match 2> /dev/null)}
+ installer_version='0.0.0'
+ resource_version='0, 0, 0'
+ if test x$git_version_str != x; then
+   git_version_str="${git_version_str##v}"
+   tagged_release=1
+-  if [ $(echo $git_version_str | grep '\d\.\d\.\d') ]; then
++  if [ $(echo $git_version_str | grep '[0-9].[0-9].[0-9]') ]; then
+     installer_version=$git_version_str
+     resource_version=$(echo $git_version_str | sed 's/\./, /g')
+   fi
+-- 
+2.33.0
+
diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..96c9ffa4561c 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,25 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=13
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+cmake_builddir="BUILD"
+configure_args="-DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
+ -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+ -DWITH_OPENAL=$(vopt_if openal ON OFF) -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="gettext-devel intltool pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
+ freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
  MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
  $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
+distfiles="https://github.com/wangqr/Aegisub/archive/v${version}.tar.gz"
+checksum="9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5"
+nocross=yes
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,38 +27,8 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
-}
-
-pre_configure() {
-	# Aegisub fails to start on Wayland, so we have to force GDK to start it
-	# with the x11 backend
-	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
-		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
+pre_build() {
+	export FORCE_GIT_VERSION="$version"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (74 preceding siblings ...)
  2021-09-20 19:37 ` [PR PATCH] [Updated] " ericonr
@ 2021-09-20 19:38 ` ericonr
  2021-09-20 19:38 ` [PR PATCH] [Merged]: " ericonr
  2021-09-21  0:00 ` q66
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-20 19:38 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-923236989

Comment:
Updated commit message, merging.

^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: [PR PATCH] [Merged]: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (75 preceding siblings ...)
  2021-09-20 19:38 ` ericonr
@ 2021-09-20 19:38 ` ericonr
  2021-09-21  0:00 ` q66
  77 siblings, 0 replies; 79+ messages in thread
From: ericonr @ 2021-09-20 19:38 UTC (permalink / raw)
  To: ml

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

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

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
https://github.com/void-linux/void-packages/pull/32162

Description:
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


^ permalink raw reply	[flat|nested] 79+ messages in thread

* Re: Aegisub: update to wangqr fork 3.3.2 (fix #31637)
  2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
                   ` (76 preceding siblings ...)
  2021-09-20 19:38 ` [PR PATCH] [Merged]: " ericonr
@ 2021-09-21  0:00 ` q66
  77 siblings, 0 replies; 79+ messages in thread
From: q66 @ 2021-09-21  0:00 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/32162#issuecomment-923445832

Comment:
i don't approve of the way this PR just silently drops support for building with system luajit

it was doing that for a reason, and now a whole bunch of platforms are just broken (same with the libatomic bits)

^ permalink raw reply	[flat|nested] 79+ messages in thread

end of thread, other threads:[~2021-09-21  0:00 UTC | newest]

Thread overview: 79+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git (fix #31637) pudiva
2021-07-24  1:44 ` abenson
2021-07-24  1:48 ` abenson
2021-07-24  1:49 ` abenson
2021-07-24  1:56 ` pudiva
2021-07-24  1:59 ` pudiva
2021-07-24  1:59 ` pudiva
2021-07-24  8:35 ` paper42
2021-07-24 12:56 ` pudiva
2021-07-24 13:18 ` [PR PATCH] [Updated] " pudiva
2021-07-24 13:21 ` pudiva
2021-07-24 14:22 ` paper42
2021-07-24 14:24 ` [PR REVIEW] " paper42
2021-07-24 21:15 ` ericonr
2021-07-24 21:19 ` [PR REVIEW] " ericonr
2021-07-27  3:11 ` pudiva
2021-07-27  3:40 ` ericonr
2021-07-29  0:18 ` pudiva
2021-07-29  0:45 ` [PR PATCH] [Updated] " pudiva
2021-07-29  0:48 ` pudiva
2021-07-29  0:50 ` [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 " pudiva
2021-08-03 17:07 ` paper42
2021-08-03 17:07 ` paper42
2021-08-03 17:07 ` paper42
2021-08-03 17:07 ` paper42
2021-08-03 17:07 ` paper42
2021-08-03 20:11 ` pudiva
2021-08-03 20:12 ` [PR PATCH] [Updated] " pudiva
2021-08-03 20:12 ` [PR REVIEW] " ericonr
2021-08-03 20:13 ` ericonr
2021-08-03 20:14 ` [PR PATCH] [Updated] " pudiva
2021-08-03 20:14 ` [PR REVIEW] " pudiva
2021-08-03 20:15 ` [PR PATCH] [Updated] " pudiva
2021-08-03 20:15 ` [PR REVIEW] " pudiva
2021-08-03 20:17 ` [PR PATCH] [Updated] " pudiva
2021-08-03 20:19 ` pudiva
2021-08-03 20:20 ` [PR REVIEW] " pudiva
2021-08-04 12:01 ` ericonr
2021-08-04 20:27 ` [PR PATCH] [Updated] " pudiva
2021-08-10 21:56 ` pudiva
2021-08-10 22:13 ` pudiva
2021-08-11  2:13 ` [PR REVIEW] " ericonr
2021-08-11  2:13 ` ericonr
2021-08-11 12:06 ` pudiva
2021-08-11 12:07 ` pudiva
2021-08-11 12:12 ` [PR PATCH] [Updated] " pudiva
2021-08-11 12:13 ` [PR REVIEW] " pudiva
2021-08-11 12:13 ` pudiva
2021-08-11 12:22 ` pudiva
2021-08-11 12:23 ` pudiva
2021-08-11 12:33 ` pudiva
2021-08-11 15:09 ` ericonr
2021-08-12 10:11 ` pudiva
2021-08-12 17:56 ` [PR PATCH] [Updated] " pudiva
2021-08-12 18:17 ` pudiva
2021-08-13 14:50 ` pudiva
2021-08-13 15:51 ` pudiva
2021-08-13 17:59 ` pudiva
2021-08-13 18:02 ` pudiva
2021-08-23 17:54 ` pudiva
2021-08-27 16:05 ` [PR PATCH] [Updated] " pudiva
2021-08-27 16:08 ` pudiva
2021-09-10 17:16 ` pudiva
2021-09-16  2:28 ` [PR REVIEW] " ericonr
2021-09-16  2:56 ` ericonr
2021-09-16  3:20 ` ericonr
2021-09-16 22:38 ` [PR REVIEW] " pudiva
2021-09-16 22:42 ` pudiva
2021-09-17 13:18 ` [PR REVIEW] " ericonr
2021-09-17 13:18 ` ericonr
2021-09-17 18:12 ` [PR REVIEW] " pudiva
2021-09-17 18:45 ` ericonr
2021-09-17 19:10 ` [PR PATCH] [Updated] " pudiva
2021-09-17 19:11 ` pudiva
2021-09-17 19:15 ` pudiva
2021-09-20 19:37 ` [PR PATCH] [Updated] " ericonr
2021-09-20 19:38 ` ericonr
2021-09-20 19:38 ` [PR PATCH] [Merged]: " ericonr
2021-09-21  0:00 ` q66

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).