* [PR PATCH] meson: update to 1.5.2.
@ 2024-12-03 5:04 abenson
2024-12-03 17:00 ` abenson
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: abenson @ 2024-12-03 5:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]
There is a new pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages meson_1.5.2
https://github.com/void-linux/void-packages/pull/53322
meson: update to 1.5.2.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
```
pkg host target cross result
meson x86_64 x86_64 n OK
meson x86_64-musl x86_64-musl n OK
meson i686 i686 n OK
meson x86_64-musl aarch64-musl y OK
meson x86_64 aarch64 y OK
meson x86_64-musl armv7l-musl y OK
meson x86_64 armv7l y OK
meson x86_64-musl armv6l-musl y OK
meson x86_64 armv6l y OK
```
Did a run through with:
```
$ grep -r 'build_style=.*meson.*' srcpkgs/ | cut -f2 -d/ | xargs -n1 ./xbps-src pkg
```
No failed builds. Running through again with a cross-build.
A patch file from https://github.com/void-linux/void-packages/pull/53322.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson_1.5.2-53322.patch --]
[-- Type: text/x-diff, Size: 1213 bytes --]
From da1a486c6bb04908072c70fa63a78e6fd8507086 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 2 Dec 2024 22:59:31 -0600
Subject: [PATCH] meson: update to 1.5.2.
---
srcpkgs/meson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 82faf4a8371117..70bbc2fe754ac2 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
# Template file for 'meson'
pkgname=meson
-version=1.4.0
-revision=2
+version=1.5.2
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d
+checksum=f955e09ab0d71ef180ae85df65991d58ed8430323de7d77a37e11c9ea630910b
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
@ 2024-12-03 17:00 ` abenson
2024-12-19 14:04 ` [PR PATCH] [Updated] " abenson
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2024-12-03 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/53322#issuecomment-2515109708
Comment:
Passed for cross-build, as well. (`-a aarch64`).
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
2024-12-03 17:00 ` abenson
@ 2024-12-19 14:04 ` abenson
2024-12-20 3:27 ` abenson
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2024-12-19 14:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages meson_1.5.2
https://github.com/void-linux/void-packages/pull/53322
meson: update to 1.5.2.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
```
pkg host target cross result
meson x86_64 x86_64 n OK
meson x86_64-musl x86_64-musl n OK
meson i686 i686 n OK
meson x86_64-musl aarch64-musl y OK
meson x86_64 aarch64 y OK
meson x86_64-musl armv7l-musl y OK
meson x86_64 armv7l y OK
meson x86_64-musl armv6l-musl y OK
meson x86_64 armv6l y OK
```
Did a run through with:
```
$ grep -r 'build_style=.*meson.*' srcpkgs/ | cut -f2 -d/ | xargs -n1 ./xbps-src pkg
```
No failed builds. Running through again with a cross-build.
A patch file from https://github.com/void-linux/void-packages/pull/53322.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson_1.5.2-53322.patch --]
[-- Type: text/x-diff, Size: 1213 bytes --]
From f39bb2a878e550b702a1bf2ef50a38954eef26a5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 2 Dec 2024 22:59:31 -0600
Subject: [PATCH] meson: update to 1.5.2.
---
srcpkgs/meson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 32dc1b30feb221..70bbc2fe754ac2 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
# Template file for 'meson'
pkgname=meson
-version=1.4.0
-revision=3
+version=1.5.2
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d
+checksum=f955e09ab0d71ef180ae85df65991d58ed8430323de7d77a37e11c9ea630910b
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
2024-12-03 17:00 ` abenson
2024-12-19 14:04 ` [PR PATCH] [Updated] " abenson
@ 2024-12-20 3:27 ` abenson
2024-12-20 3:45 ` abenson
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2024-12-20 3:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages meson_1.5.2
https://github.com/void-linux/void-packages/pull/53322
meson: update to 1.5.2.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
```
pkg host target cross result
meson x86_64 x86_64 n OK
meson x86_64-musl x86_64-musl n OK
meson i686 i686 n OK
meson x86_64-musl aarch64-musl y OK
meson x86_64 aarch64 y OK
meson x86_64-musl armv7l-musl y OK
meson x86_64 armv7l y OK
meson x86_64-musl armv6l-musl y OK
meson x86_64 armv6l y OK
```
Did a run through with:
```
$ grep -r 'build_style=.*meson.*' srcpkgs/ | cut -f2 -d/ | xargs -n1 ./xbps-src pkg
```
No failed builds. Running through again with a cross-build.
A patch file from https://github.com/void-linux/void-packages/pull/53322.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson_1.5.2-53322.patch --]
[-- Type: text/x-diff, Size: 1213 bytes --]
From ffe4623713623116a2f41a8aeaf8bf8ff98c42f4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 2 Dec 2024 22:59:31 -0600
Subject: [PATCH] meson: update to 1.6.1.
---
srcpkgs/meson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 32dc1b30feb221..b9f6e37a9704eb 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
# Template file for 'meson'
pkgname=meson
-version=1.4.0
-revision=3
+version=1.6.1
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d
+checksum=1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (2 preceding siblings ...)
2024-12-20 3:27 ` abenson
@ 2024-12-20 3:45 ` abenson
2024-12-20 16:10 ` [PR PATCH] [Updated] " abenson
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2024-12-20 3:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/53322#issuecomment-2556228232
Comment:
The following fail to build, but I don't think its related to `meson` at all.
- [ ] libgnt
- [ ] fractal
- [ ] gnome-robots
- [ ] paps
- [ ] taisei
- [ ] newsflash
- [ ] patchmatrix
- [ ] libportal
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (4 preceding siblings ...)
2024-12-20 16:10 ` [PR PATCH] [Updated] " abenson
@ 2024-12-20 16:10 ` abenson
2024-12-20 18:38 ` abenson
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2024-12-20 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/53322#issuecomment-2556228232
Comment:
The following fail to build, but I don't think its related to `meson` at all.
- [x] libgnt - applied upstream patch
- [x] fractal - gitlab checksum change
- [x] gnome-robots - missing library
- [x] paps - patch needed for glib 2.82
- [x] taisei - update, cglm update
- [ ] newsflash
- [x] patchmatrix - update distfiles/homepage links
- [ ] libportal
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (3 preceding siblings ...)
2024-12-20 3:45 ` abenson
@ 2024-12-20 16:10 ` abenson
2024-12-20 16:10 ` abenson
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2024-12-20 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages meson_1.5.2
https://github.com/void-linux/void-packages/pull/53322
meson: update to 1.5.2.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
```
pkg host target cross result
meson x86_64 x86_64 n OK
meson x86_64-musl x86_64-musl n OK
meson i686 i686 n OK
meson x86_64-musl aarch64-musl y OK
meson x86_64 aarch64 y OK
meson x86_64-musl armv7l-musl y OK
meson x86_64 armv7l y OK
meson x86_64-musl armv6l-musl y OK
meson x86_64 armv6l y OK
```
Did a run through with:
```
$ grep -r 'build_style=.*meson.*' srcpkgs/ | cut -f2 -d/ | xargs -n1 ./xbps-src pkg
```
No failed builds. Running through again with a cross-build.
A patch file from https://github.com/void-linux/void-packages/pull/53322.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson_1.5.2-53322.patch --]
[-- Type: text/x-diff, Size: 19830 bytes --]
From ca66b6be00eb6b3cde064586edd6ba346a911641 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 2 Dec 2024 22:59:31 -0600
Subject: [PATCH 1/8] meson: update to 1.6.1.
---
srcpkgs/meson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 32dc1b30feb221..b9f6e37a9704eb 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
# Template file for 'meson'
pkgname=meson
-version=1.4.0
-revision=3
+version=1.6.1
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d
+checksum=1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From 66e69d56347fc10f18c0918cd09df377ff833f3c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:32:04 -0600
Subject: [PATCH 2/8] libgnt: fix ftbfs
---
srcpkgs/libgnt/patches/fix-ftbfs.patch | 77 ++++++++++++++++++++++++++
srcpkgs/libgnt/template | 2 +-
2 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libgnt/patches/fix-ftbfs.patch
diff --git a/srcpkgs/libgnt/patches/fix-ftbfs.patch b/srcpkgs/libgnt/patches/fix-ftbfs.patch
new file mode 100644
index 00000000000000..0ede7e67d5b308
--- /dev/null
+++ b/srcpkgs/libgnt/patches/fix-ftbfs.patch
@@ -0,0 +1,77 @@
+https://keep.imfreedom.org/libgnt/libgnt/raw-rev/2da723f790d6
+
+# HG changeset patch
+# User Gary Kramlich <grim@reaperworld.com>
+# Date 1702790961 21600
+# Node ID 2da723f790d6c3eef2857a651eb05935bd6f40a0
+# Parent 73d8724225e71d42d27d52547a5cfd61c892a0b0
+Use panel_window instead of directly accessing the struct member
+
+This is necessary to fix a FTBFS in Debian. For more information see
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057570.
+
+Testing Done:
+Compiled and ran `test/focus` without issue.
+
+Reviewed at https://reviews.imfreedom.org/r/2883/
+
+diff -r 73d8724225e7 -r 2da723f790d6 gntwm.c
+--- a/gntwm.c Thu Jun 15 20:22:30 2023 -0500
++++ b/gntwm.c Sat Dec 16 23:29:21 2023 -0600
+@@ -166,38 +166,40 @@
+ int sx, ex, sy, ey, w, y;
+ cchar_t ch;
+ PANEL *below = panel;
++ WINDOW *window = panel_window(panel);
+
+- sx = getbegx(panel->win);
+- ex = getmaxx(panel->win) + sx;
+- sy = getbegy(panel->win);
+- ey = getmaxy(panel->win) + sy;
++ sx = getbegx(window);
++ ex = getmaxx(window) + sx;
++ sy = getbegy(window);
++ ey = getmaxy(window) + sy;
+
+ while ((below = panel_below(below)) != NULL) {
+- if (sy > getbegy(below->win) + getmaxy(below->win) ||
+- ey < getbegy(below->win))
++ window = panel_window(below);
++ if (sy > getbegy(window) + getmaxy(window) ||
++ ey < getbegy(window))
+ continue;
+- if (sx > getbegx(below->win) + getmaxx(below->win) ||
+- ex < getbegx(below->win))
++ if (sx > getbegx(window) + getmaxx(window) ||
++ ex < getbegx(window))
+ continue;
+- for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) {
+- if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK)
++ for (y = MAX(sy, getbegy(window)); y <= MIN(ey, getbegy(window) + getmaxy(window)); y++) {
++ if (mvwin_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch) != OK)
+ goto right;
+ w = widestringwidth(ch.chars);
+ if (w > 1 && (ch.attr & 1)) {
+ ch.chars[0] = ' ';
+ ch.attr &= ~ A_CHARTEXT;
+- mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch);
+- touchline(below->win, y - getbegy(below->win), 1);
++ mvwadd_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch);
++ touchline(window, y - getbegy(window), 1);
+ }
+ right:
+- if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK)
++ if (mvwin_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch) != OK)
+ continue;
+ w = widestringwidth(ch.chars);
+ if (w > 1 && !(ch.attr & 1)) {
+ ch.chars[0] = ' ';
+ ch.attr &= ~ A_CHARTEXT;
+- mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch);
+- touchline(below->win, y - getbegy(below->win), 1);
++ mvwadd_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch);
++ touchline(window, y - getbegy(window), 1);
+ }
+ }
+ }
+
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
index 1cccf79e346c58..1735fd5f616bbe 100644
--- a/srcpkgs/libgnt/template
+++ b/srcpkgs/libgnt/template
@@ -1,7 +1,7 @@
# Template file for 'libgnt'
pkgname=libgnt
version=2.14.3
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dpython2=false"
From e7fa56648408217d6b935cef413a3a0492ad5842 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:42:19 -0600
Subject: [PATCH 3/8] fractal: fix checksum
---
srcpkgs/fractal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index cf42e8a5c4f9ac..cc96a03485bf68 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Fractal"
distfiles="https://gitlab.gnome.org/GNOME/fractal/-/archive/${version}/fractal-${version}.tar.gz"
-checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
+checksum=7872f050bf1c5904b93ba518b542bcb6fc80c557966645101103060098ddf6d0
post_patch() {
[ -z "$CROSS_BUILD" ] && return 0
From c2363f144ec09c2d79f1b298a4e9cfc400569caa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:54:05 -0600
Subject: [PATCH 4/8] gnome-robots: add missing -lm
---
srcpkgs/gnome-robots/patches/add-libm.patch | 14 ++++++++++++++
srcpkgs/gnome-robots/template | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnome-robots/patches/add-libm.patch
diff --git a/srcpkgs/gnome-robots/patches/add-libm.patch b/srcpkgs/gnome-robots/patches/add-libm.patch
new file mode 100644
index 00000000000000..1dca083d149542
--- /dev/null
+++ b/srcpkgs/gnome-robots/patches/add-libm.patch
@@ -0,0 +1,14 @@
+--- a/meson.build
++++ b/meson.build
+@@ -13,6 +13,11 @@
+ language: 'c'
+ )
+
++add_global_link_arguments(
++ ['-lm'],
++ language: 'c'
++)
++
+ gee_dependency = dependency('gee-0.8')
+ gio_dependency = dependency('gio-2.0', version: '>= 2.32')
+ glib_dependency = dependency('glib-2.0', version: '>= 2.32')
diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 369474709a8d81..f7347cbebb3d53 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-robots'
pkgname=gnome-robots
version=40.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
makedepends="gsound-devel gtk4-devel libcanberra-devel librsvg-devel
From af49289e61d6b284c94c425a992abf21cb5d619c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:20:56 -0600
Subject: [PATCH 5/8] cglm: update to 0.9.4.
---
srcpkgs/cglm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index ca931cf625177b..11832259301993 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,6 +1,6 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.3
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=4eda95e34f116c36203777f4fe770d64a3158b1450ea40364abb111cf4ba4773
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
From 782d0d364dcc6f10b04d322c2d0870f6c9afb5f0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:22:53 -0600
Subject: [PATCH 6/8] taisei: update to 1.4.2.
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 10 +--
3 files changed, 5 insertions(+), 157 deletions(-)
delete mode 100644 srcpkgs/taisei/patches/openssl1.patch
delete mode 100644 srcpkgs/taisei/patches/openssl2.patch
diff --git a/srcpkgs/taisei/patches/openssl1.patch b/srcpkgs/taisei/patches/openssl1.patch
deleted file mode 100644
index 2a804bb7710fb8..00000000000000
--- a/srcpkgs/taisei/patches/openssl1.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/src/util/sha256.c b/src/util/sha256.c
-index 15f4491ee..e01e32279 100644
---- a/src/util/sha256.c
-+++ b/src/util/sha256.c
-@@ -119,7 +119,7 @@ static void sha256_init(SHA256State *ctx)
- ctx->state[7] = 0x5be0cd19;
- }
-
--SHA256State* sha256_new(void) {
-+SHA256State *sha256_new(void) {
- SHA256State *ctx = calloc(1, sizeof(*ctx));
- sha256_init(ctx);
- return ctx;
-@@ -129,8 +129,7 @@ void sha256_free(SHA256State *ctx) {
- free(ctx);
- }
-
--void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
--{
-+void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len) {
- sha256_word_t i;
-
- for (i = 0; i < len; ++i) {
-@@ -144,8 +143,7 @@ void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
- }
- }
-
--void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen)
--{
-+void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-
- sha256_word_t i;
-@@ -201,8 +199,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
- sha256_final(&ctx, hash, hashlen);
- }
-
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
-- assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
-+ assert(hashlen >= SHA256_HEXDIGEST_SIZE);
-
- uint8_t digest[SHA256_BLOCK_SIZE];
- sha256_digest(data, len, digest, sizeof(digest));
-diff --git a/src/util/sha256.h b/src/util/sha256.h
-index 191246c91..f501e2d98 100644
---- a/src/util/sha256.h
-+++ b/src/util/sha256.h
-@@ -11,16 +11,19 @@
-
- #include "taisei.h"
-
--#define SHA256_BLOCK_SIZE 32
-+enum {
-+ SHA256_BLOCK_SIZE = 32,
-+ SHA256_HEXDIGEST_SIZE = SHA256_BLOCK_SIZE * 2 + 1,
-+};
-
- typedef struct SHA256State SHA256State;
-
--SHA256State* sha256_new(void) attr_returns_allocated;
-+SHA256State *sha256_new(void) attr_returns_allocated;
- void sha256_update(SHA256State *state, const uint8_t *data, size_t len) attr_nonnull(1, 2);
- void sha256_final(SHA256State *state, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) attr_nonnull(1, 2);
- void sha256_free(SHA256State *state);
-
- void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen);
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen);
-
- #endif // IGUARD_util_sha256_h
-diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
-index b6f8e9039..0dc06e740 100644
---- a/src/util/sha256_openssl.c
-+++ b/src/util/sha256_openssl.c
-@@ -17,7 +17,7 @@ struct SHA256State {
- SHA256_CTX context;
- };
-
--SHA256State* sha256_new(void) {
-+SHA256State *sha256_new(void) {
- SHA256State *st = calloc(1, sizeof(*st));
- SHA256_Init(&st->context);
- return st;
-@@ -45,8 +45,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
- SHA256_Final(hash, &ctx);
- }
-
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
-- assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
-+ assert(hashlen >= SHA256_HEXDIGEST_SIZE);
-
- uint8_t digest[SHA256_BLOCK_SIZE];
- sha256_digest(data, len, digest, sizeof(digest));
diff --git a/srcpkgs/taisei/patches/openssl2.patch b/srcpkgs/taisei/patches/openssl2.patch
deleted file mode 100644
index c1b9f411badc6a..00000000000000
--- a/srcpkgs/taisei/patches/openssl2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
-index 0dc06e740..c73d8e7fb 100644
---- a/src/util/sha256_openssl.c
-+++ b/src/util/sha256_openssl.c
-@@ -11,38 +11,34 @@
- #include "sha256.h"
- #include "util.h"
-
--#include <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- SHA256State *sha256_new(void) {
-- SHA256State *st = calloc(1, sizeof(*st));
-- SHA256_Init(&st->context);
-- return st;
-+ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-+ EVP_DigestInit(ctx, EVP_sha256());
-+ return (SHA256State*)ctx;
- }
-
--void sha256_free(SHA256State *ctx) {
-- free(ctx);
-+void sha256_free(SHA256State *st) {
-+ EVP_MD_CTX_free((EVP_MD_CTX*)st);
- }
-
--void sha256_update(SHA256State *ctx, const uint8_t *data, size_t len) {
-- SHA256_Update(&ctx->context, data, len);
-+void sha256_update(SHA256State *st, const uint8_t *data, size_t len) {
-+ EVP_DigestUpdate((EVP_MD_CTX*)st, data, len);
- }
-
--void sha256_final(SHA256State *ctx, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
-+void sha256_final(SHA256State *st, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-- SHA256_Final(hash, &ctx->context);
-+ EVP_DigestFinalXOF((EVP_MD_CTX*)st, hash, hashlen);
- }
-
- void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-
-- SHA256_CTX ctx;
-- SHA256_Init(&ctx);
-- SHA256_Update(&ctx, data, len);
-- SHA256_Final(hash, &ctx);
-+ SHA256State *st = sha256_new();
-+ sha256_update(st, data, len);
-+ sha256_final(st, hash, hashlen);
-+ sha256_free(st);
- }
-
- void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..1fc22833e4b544 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,9 +1,9 @@
# Template file for 'taisei'
pkgname=taisei
-version=1.3.2
-revision=2
+version=1.4.2
+revision=1
build_style=meson
-hostmakedepends="pkg-config python3-docutils"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
opusfile-devel"
depends="${pkgname}-data"
@@ -11,8 +11,8 @@ short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://taisei-project.org"
-distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz"
-checksum=dbc05f1b5c31981d8711130ac283355b7bfad403895f4096a6bb7e9a3d73a3bc
+distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz"
+checksum=5d869aae64f8f3390c47b74441fd041c7777e594e4a60536bb7b52564ea84fa7
post_install() {
vlicense COPYING
From 0a79f8d19282edf029e0c84ef271bd8fec9dd991 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:59:00 -0600
Subject: [PATCH 7/8] paps: patch for glib 2.82
---
srcpkgs/paps/patches/fix-glib-2.82.patch | 47 ++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 srcpkgs/paps/patches/fix-glib-2.82.patch
diff --git a/srcpkgs/paps/patches/fix-glib-2.82.patch b/srcpkgs/paps/patches/fix-glib-2.82.patch
new file mode 100644
index 00000000000000..be017abf95e35e
--- /dev/null
+++ b/srcpkgs/paps/patches/fix-glib-2.82.patch
@@ -0,0 +1,47 @@
+https://patch-diff.githubusercontent.com/raw/dov/paps/pull/71.patch
+
+From e6ec698be127822661e31f7fca7d2e0107944b24 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
From 3de76ba8eeeee27fca1822e15c0748e6102a80d7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 10:01:53 -0600
Subject: [PATCH 8/8] patchmatrix: update distfiles link
---
srcpkgs/patchmatrix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/patchmatrix/template b/srcpkgs/patchmatrix/template
index d15cb0fd28b1d0..c5a87abd752c73 100644
--- a/srcpkgs/patchmatrix/template
+++ b/srcpkgs/patchmatrix/template
@@ -8,6 +8,6 @@ makedepends="lv2 glew-devel jack-devel"
short_desc="JACK patchbay in flow matrix style"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="Artistic-2.0"
-homepage="https://git.open-music-kontrollers.ch/lad/patchmatrix/about/"
-distfiles="https://git.open-music-kontrollers.ch/lad/patchmatrix/snapshot/patchmatrix-${version}.tar.xz"
-checksum=72a3c70a7ac084707a6b4c663d460e02c65f2ecaa71a95c4b864755ba8ba5bb2
+homepage="https://git.open-music-kontrollers.ch/~hp/patchmatrix"
+distfiles="https://git.open-music-kontrollers.ch/~hp/patchmatrix/archive/${version}.tar.gz"
+checksum=53ce80de257012cd754f3691fe0e593ccae0dc3b40dd6c67950819f0668220cd
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (5 preceding siblings ...)
2024-12-20 16:10 ` abenson
@ 2024-12-20 18:38 ` abenson
2024-12-20 19:04 ` [PR PATCH] [Updated] " abenson
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2024-12-20 18:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
New comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/53322#issuecomment-2556228232
Comment:
The following fail to build, but I don't think its related to `meson` at all.
- [x] libgnt - applied upstream patch
- [x] fractal - gitlab checksum change
- [x] gnome-robots - missing library
- [x] paps - patch needed for glib 2.82
- [x] taisei - update, cglm update
- [x] newsflash - update, new package: clapper (#50737)
- [x] patchmatrix - update distfiles/homepage links
- [ ] libportal
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (6 preceding siblings ...)
2024-12-20 18:38 ` abenson
@ 2024-12-20 19:04 ` abenson
2024-12-23 17:55 ` classabbyamp
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2024-12-20 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages meson_1.5.2
https://github.com/void-linux/void-packages/pull/53322
meson: update to 1.5.2.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
```
pkg host target cross result
meson x86_64 x86_64 n OK
meson x86_64-musl x86_64-musl n OK
meson i686 i686 n OK
meson x86_64-musl aarch64-musl y OK
meson x86_64 aarch64 y OK
meson x86_64-musl armv7l-musl y OK
meson x86_64 armv7l y OK
meson x86_64-musl armv6l-musl y OK
meson x86_64 armv6l y OK
```
Did a run through with:
```
$ grep -r 'build_style=.*meson.*' srcpkgs/ | cut -f2 -d/ | xargs -n1 ./xbps-src pkg
```
No failed builds. Running through again with a cross-build.
A patch file from https://github.com/void-linux/void-packages/pull/53322.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson_1.5.2-53322.patch --]
[-- Type: text/x-diff, Size: 23612 bytes --]
From ca66b6be00eb6b3cde064586edd6ba346a911641 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 2 Dec 2024 22:59:31 -0600
Subject: [PATCH 01/10] meson: update to 1.6.1.
---
srcpkgs/meson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 32dc1b30feb221..b9f6e37a9704eb 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
# Template file for 'meson'
pkgname=meson
-version=1.4.0
-revision=3
+version=1.6.1
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d
+checksum=1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From 66e69d56347fc10f18c0918cd09df377ff833f3c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:32:04 -0600
Subject: [PATCH 02/10] libgnt: fix ftbfs
---
srcpkgs/libgnt/patches/fix-ftbfs.patch | 77 ++++++++++++++++++++++++++
srcpkgs/libgnt/template | 2 +-
2 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libgnt/patches/fix-ftbfs.patch
diff --git a/srcpkgs/libgnt/patches/fix-ftbfs.patch b/srcpkgs/libgnt/patches/fix-ftbfs.patch
new file mode 100644
index 00000000000000..0ede7e67d5b308
--- /dev/null
+++ b/srcpkgs/libgnt/patches/fix-ftbfs.patch
@@ -0,0 +1,77 @@
+https://keep.imfreedom.org/libgnt/libgnt/raw-rev/2da723f790d6
+
+# HG changeset patch
+# User Gary Kramlich <grim@reaperworld.com>
+# Date 1702790961 21600
+# Node ID 2da723f790d6c3eef2857a651eb05935bd6f40a0
+# Parent 73d8724225e71d42d27d52547a5cfd61c892a0b0
+Use panel_window instead of directly accessing the struct member
+
+This is necessary to fix a FTBFS in Debian. For more information see
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057570.
+
+Testing Done:
+Compiled and ran `test/focus` without issue.
+
+Reviewed at https://reviews.imfreedom.org/r/2883/
+
+diff -r 73d8724225e7 -r 2da723f790d6 gntwm.c
+--- a/gntwm.c Thu Jun 15 20:22:30 2023 -0500
++++ b/gntwm.c Sat Dec 16 23:29:21 2023 -0600
+@@ -166,38 +166,40 @@
+ int sx, ex, sy, ey, w, y;
+ cchar_t ch;
+ PANEL *below = panel;
++ WINDOW *window = panel_window(panel);
+
+- sx = getbegx(panel->win);
+- ex = getmaxx(panel->win) + sx;
+- sy = getbegy(panel->win);
+- ey = getmaxy(panel->win) + sy;
++ sx = getbegx(window);
++ ex = getmaxx(window) + sx;
++ sy = getbegy(window);
++ ey = getmaxy(window) + sy;
+
+ while ((below = panel_below(below)) != NULL) {
+- if (sy > getbegy(below->win) + getmaxy(below->win) ||
+- ey < getbegy(below->win))
++ window = panel_window(below);
++ if (sy > getbegy(window) + getmaxy(window) ||
++ ey < getbegy(window))
+ continue;
+- if (sx > getbegx(below->win) + getmaxx(below->win) ||
+- ex < getbegx(below->win))
++ if (sx > getbegx(window) + getmaxx(window) ||
++ ex < getbegx(window))
+ continue;
+- for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) {
+- if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK)
++ for (y = MAX(sy, getbegy(window)); y <= MIN(ey, getbegy(window) + getmaxy(window)); y++) {
++ if (mvwin_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch) != OK)
+ goto right;
+ w = widestringwidth(ch.chars);
+ if (w > 1 && (ch.attr & 1)) {
+ ch.chars[0] = ' ';
+ ch.attr &= ~ A_CHARTEXT;
+- mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch);
+- touchline(below->win, y - getbegy(below->win), 1);
++ mvwadd_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch);
++ touchline(window, y - getbegy(window), 1);
+ }
+ right:
+- if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK)
++ if (mvwin_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch) != OK)
+ continue;
+ w = widestringwidth(ch.chars);
+ if (w > 1 && !(ch.attr & 1)) {
+ ch.chars[0] = ' ';
+ ch.attr &= ~ A_CHARTEXT;
+- mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch);
+- touchline(below->win, y - getbegy(below->win), 1);
++ mvwadd_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch);
++ touchline(window, y - getbegy(window), 1);
+ }
+ }
+ }
+
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
index 1cccf79e346c58..1735fd5f616bbe 100644
--- a/srcpkgs/libgnt/template
+++ b/srcpkgs/libgnt/template
@@ -1,7 +1,7 @@
# Template file for 'libgnt'
pkgname=libgnt
version=2.14.3
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dpython2=false"
From e7fa56648408217d6b935cef413a3a0492ad5842 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:42:19 -0600
Subject: [PATCH 03/10] fractal: fix checksum
---
srcpkgs/fractal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index cf42e8a5c4f9ac..cc96a03485bf68 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Fractal"
distfiles="https://gitlab.gnome.org/GNOME/fractal/-/archive/${version}/fractal-${version}.tar.gz"
-checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
+checksum=7872f050bf1c5904b93ba518b542bcb6fc80c557966645101103060098ddf6d0
post_patch() {
[ -z "$CROSS_BUILD" ] && return 0
From c2363f144ec09c2d79f1b298a4e9cfc400569caa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:54:05 -0600
Subject: [PATCH 04/10] gnome-robots: add missing -lm
---
srcpkgs/gnome-robots/patches/add-libm.patch | 14 ++++++++++++++
srcpkgs/gnome-robots/template | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnome-robots/patches/add-libm.patch
diff --git a/srcpkgs/gnome-robots/patches/add-libm.patch b/srcpkgs/gnome-robots/patches/add-libm.patch
new file mode 100644
index 00000000000000..1dca083d149542
--- /dev/null
+++ b/srcpkgs/gnome-robots/patches/add-libm.patch
@@ -0,0 +1,14 @@
+--- a/meson.build
++++ b/meson.build
+@@ -13,6 +13,11 @@
+ language: 'c'
+ )
+
++add_global_link_arguments(
++ ['-lm'],
++ language: 'c'
++)
++
+ gee_dependency = dependency('gee-0.8')
+ gio_dependency = dependency('gio-2.0', version: '>= 2.32')
+ glib_dependency = dependency('glib-2.0', version: '>= 2.32')
diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 369474709a8d81..f7347cbebb3d53 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-robots'
pkgname=gnome-robots
version=40.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
makedepends="gsound-devel gtk4-devel libcanberra-devel librsvg-devel
From af49289e61d6b284c94c425a992abf21cb5d619c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:20:56 -0600
Subject: [PATCH 05/10] cglm: update to 0.9.4.
---
srcpkgs/cglm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index ca931cf625177b..11832259301993 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,6 +1,6 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.3
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=4eda95e34f116c36203777f4fe770d64a3158b1450ea40364abb111cf4ba4773
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
From 782d0d364dcc6f10b04d322c2d0870f6c9afb5f0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:22:53 -0600
Subject: [PATCH 06/10] taisei: update to 1.4.2.
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 10 +--
3 files changed, 5 insertions(+), 157 deletions(-)
delete mode 100644 srcpkgs/taisei/patches/openssl1.patch
delete mode 100644 srcpkgs/taisei/patches/openssl2.patch
diff --git a/srcpkgs/taisei/patches/openssl1.patch b/srcpkgs/taisei/patches/openssl1.patch
deleted file mode 100644
index 2a804bb7710fb8..00000000000000
--- a/srcpkgs/taisei/patches/openssl1.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/src/util/sha256.c b/src/util/sha256.c
-index 15f4491ee..e01e32279 100644
---- a/src/util/sha256.c
-+++ b/src/util/sha256.c
-@@ -119,7 +119,7 @@ static void sha256_init(SHA256State *ctx)
- ctx->state[7] = 0x5be0cd19;
- }
-
--SHA256State* sha256_new(void) {
-+SHA256State *sha256_new(void) {
- SHA256State *ctx = calloc(1, sizeof(*ctx));
- sha256_init(ctx);
- return ctx;
-@@ -129,8 +129,7 @@ void sha256_free(SHA256State *ctx) {
- free(ctx);
- }
-
--void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
--{
-+void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len) {
- sha256_word_t i;
-
- for (i = 0; i < len; ++i) {
-@@ -144,8 +143,7 @@ void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
- }
- }
-
--void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen)
--{
-+void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-
- sha256_word_t i;
-@@ -201,8 +199,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
- sha256_final(&ctx, hash, hashlen);
- }
-
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
-- assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
-+ assert(hashlen >= SHA256_HEXDIGEST_SIZE);
-
- uint8_t digest[SHA256_BLOCK_SIZE];
- sha256_digest(data, len, digest, sizeof(digest));
-diff --git a/src/util/sha256.h b/src/util/sha256.h
-index 191246c91..f501e2d98 100644
---- a/src/util/sha256.h
-+++ b/src/util/sha256.h
-@@ -11,16 +11,19 @@
-
- #include "taisei.h"
-
--#define SHA256_BLOCK_SIZE 32
-+enum {
-+ SHA256_BLOCK_SIZE = 32,
-+ SHA256_HEXDIGEST_SIZE = SHA256_BLOCK_SIZE * 2 + 1,
-+};
-
- typedef struct SHA256State SHA256State;
-
--SHA256State* sha256_new(void) attr_returns_allocated;
-+SHA256State *sha256_new(void) attr_returns_allocated;
- void sha256_update(SHA256State *state, const uint8_t *data, size_t len) attr_nonnull(1, 2);
- void sha256_final(SHA256State *state, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) attr_nonnull(1, 2);
- void sha256_free(SHA256State *state);
-
- void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen);
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen);
-
- #endif // IGUARD_util_sha256_h
-diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
-index b6f8e9039..0dc06e740 100644
---- a/src/util/sha256_openssl.c
-+++ b/src/util/sha256_openssl.c
-@@ -17,7 +17,7 @@ struct SHA256State {
- SHA256_CTX context;
- };
-
--SHA256State* sha256_new(void) {
-+SHA256State *sha256_new(void) {
- SHA256State *st = calloc(1, sizeof(*st));
- SHA256_Init(&st->context);
- return st;
-@@ -45,8 +45,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
- SHA256_Final(hash, &ctx);
- }
-
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
-- assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
-+ assert(hashlen >= SHA256_HEXDIGEST_SIZE);
-
- uint8_t digest[SHA256_BLOCK_SIZE];
- sha256_digest(data, len, digest, sizeof(digest));
diff --git a/srcpkgs/taisei/patches/openssl2.patch b/srcpkgs/taisei/patches/openssl2.patch
deleted file mode 100644
index c1b9f411badc6a..00000000000000
--- a/srcpkgs/taisei/patches/openssl2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
-index 0dc06e740..c73d8e7fb 100644
---- a/src/util/sha256_openssl.c
-+++ b/src/util/sha256_openssl.c
-@@ -11,38 +11,34 @@
- #include "sha256.h"
- #include "util.h"
-
--#include <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- SHA256State *sha256_new(void) {
-- SHA256State *st = calloc(1, sizeof(*st));
-- SHA256_Init(&st->context);
-- return st;
-+ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-+ EVP_DigestInit(ctx, EVP_sha256());
-+ return (SHA256State*)ctx;
- }
-
--void sha256_free(SHA256State *ctx) {
-- free(ctx);
-+void sha256_free(SHA256State *st) {
-+ EVP_MD_CTX_free((EVP_MD_CTX*)st);
- }
-
--void sha256_update(SHA256State *ctx, const uint8_t *data, size_t len) {
-- SHA256_Update(&ctx->context, data, len);
-+void sha256_update(SHA256State *st, const uint8_t *data, size_t len) {
-+ EVP_DigestUpdate((EVP_MD_CTX*)st, data, len);
- }
-
--void sha256_final(SHA256State *ctx, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
-+void sha256_final(SHA256State *st, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-- SHA256_Final(hash, &ctx->context);
-+ EVP_DigestFinalXOF((EVP_MD_CTX*)st, hash, hashlen);
- }
-
- void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-
-- SHA256_CTX ctx;
-- SHA256_Init(&ctx);
-- SHA256_Update(&ctx, data, len);
-- SHA256_Final(hash, &ctx);
-+ SHA256State *st = sha256_new();
-+ sha256_update(st, data, len);
-+ sha256_final(st, hash, hashlen);
-+ sha256_free(st);
- }
-
- void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..1fc22833e4b544 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,9 +1,9 @@
# Template file for 'taisei'
pkgname=taisei
-version=1.3.2
-revision=2
+version=1.4.2
+revision=1
build_style=meson
-hostmakedepends="pkg-config python3-docutils"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
opusfile-devel"
depends="${pkgname}-data"
@@ -11,8 +11,8 @@ short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://taisei-project.org"
-distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz"
-checksum=dbc05f1b5c31981d8711130ac283355b7bfad403895f4096a6bb7e9a3d73a3bc
+distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz"
+checksum=5d869aae64f8f3390c47b74441fd041c7777e594e4a60536bb7b52564ea84fa7
post_install() {
vlicense COPYING
From 0a79f8d19282edf029e0c84ef271bd8fec9dd991 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:59:00 -0600
Subject: [PATCH 07/10] paps: patch for glib 2.82
---
srcpkgs/paps/patches/fix-glib-2.82.patch | 47 ++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 srcpkgs/paps/patches/fix-glib-2.82.patch
diff --git a/srcpkgs/paps/patches/fix-glib-2.82.patch b/srcpkgs/paps/patches/fix-glib-2.82.patch
new file mode 100644
index 00000000000000..be017abf95e35e
--- /dev/null
+++ b/srcpkgs/paps/patches/fix-glib-2.82.patch
@@ -0,0 +1,47 @@
+https://patch-diff.githubusercontent.com/raw/dov/paps/pull/71.patch
+
+From e6ec698be127822661e31f7fca7d2e0107944b24 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
From 3de76ba8eeeee27fca1822e15c0748e6102a80d7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 10:01:53 -0600
Subject: [PATCH 08/10] patchmatrix: update distfiles link
---
srcpkgs/patchmatrix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/patchmatrix/template b/srcpkgs/patchmatrix/template
index d15cb0fd28b1d0..c5a87abd752c73 100644
--- a/srcpkgs/patchmatrix/template
+++ b/srcpkgs/patchmatrix/template
@@ -8,6 +8,6 @@ makedepends="lv2 glew-devel jack-devel"
short_desc="JACK patchbay in flow matrix style"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="Artistic-2.0"
-homepage="https://git.open-music-kontrollers.ch/lad/patchmatrix/about/"
-distfiles="https://git.open-music-kontrollers.ch/lad/patchmatrix/snapshot/patchmatrix-${version}.tar.xz"
-checksum=72a3c70a7ac084707a6b4c663d460e02c65f2ecaa71a95c4b864755ba8ba5bb2
+homepage="https://git.open-music-kontrollers.ch/~hp/patchmatrix"
+distfiles="https://git.open-music-kontrollers.ch/~hp/patchmatrix/archive/${version}.tar.gz"
+checksum=53ce80de257012cd754f3691fe0e593ccae0dc3b40dd6c67950819f0668220cd
From b6dbd021bf37da33e88f30d0539440d7d73098bf Mon Sep 17 00:00:00 2001
From: deimonn <deimonn@outlook.com>
Date: Fri, 7 Jun 2024 16:17:01 -0300
Subject: [PATCH 09/10] New package: clapper-0.6.1
---
common/shlibs | 2 ++
srcpkgs/clapper-devel | 1 +
srcpkgs/clapper/template | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/clapper-devel
create mode 100644 srcpkgs/clapper/template
diff --git a/common/shlibs b/common/shlibs
index c732517b8d50ed..b0ae7bf1a3bccb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -822,6 +822,8 @@ libpeas-gtk-1.0.so.0 libpeas-1.0.0_2
libpeas-2.so.0 libpeas2-2.0.1_1
libtotem.so.0 libtotem-3.6.2_1
libclutter-1.0.so.0 clutter-1.14.0_1
+libclapper-0.0.so.0 clapper-0.6.1_1
+libclapper-gtk-0.0.so.0 clapper-0.6.1_1
libavfs.so.0 libavfs-1.0.5_1
libgjs.so.0 gjs-1.65.2_1
libtelepathy-glib.so.0 telepathy-glib-0.15.5_1
diff --git a/srcpkgs/clapper-devel b/srcpkgs/clapper-devel
new file mode 120000
index 00000000000000..f739d81f9a4f83
--- /dev/null
+++ b/srcpkgs/clapper-devel
@@ -0,0 +1 @@
+clapper
\ No newline at end of file
diff --git a/srcpkgs/clapper/template b/srcpkgs/clapper/template
new file mode 100644
index 00000000000000..8f785fb6c812a5
--- /dev/null
+++ b/srcpkgs/clapper/template
@@ -0,0 +1,26 @@
+# Template file for 'clapper'
+pkgname=clapper
+version=0.6.1
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk4-update-icon-cache vala gettext desktop-file-utils"
+makedepends="gtk4-devel gstreamer1-devel libadwaita-devel libsoup3-devel libmicrodns-devel"
+short_desc="Modern and user-friendly media player"
+maintainer="deimonn <deimonn@outlook.com>"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
+homepage="https://github.com/Rafostar/clapper"
+distfiles="https://github.com/Rafostar/clapper/archive/refs/tags/${version}.tar.gz"
+checksum=d244ec6108ebff5ccc817a5888f3f73f52cac129fe480d480cb3f6b9db19cfbe
+
+clapper-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libmicrodns-devel"
+ short_desc+="Modern and user-friendly media player - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 615f4db90f712fec8e3a1a8e5f7d21dfb2514d41 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 13:03:55 -0600
Subject: [PATCH 10/10] newsflash: update to 3.3.5.
---
srcpkgs/newsflash/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/newsflash/template b/srcpkgs/newsflash/template
index 61639800ae3420..2e13bda36b025a 100644
--- a/srcpkgs/newsflash/template
+++ b/srcpkgs/newsflash/template
@@ -1,19 +1,20 @@
# Template file for 'newsflash'
pkgname=newsflash
-version=3.1.3
+version=3.3.5
revision=1
build_style=meson
build_helper=rust
hostmakedepends="cargo pkg-config glib-devel sqlite-devel gettext-devel
desktop-file-utils gtk4-update-icon-cache blueprint-compiler
gtk4-devel libadwaita-devel"
-makedepends="rust-std libwebkitgtk60-devel libadwaita-devel openssl-devel"
+makedepends="rust-std libwebkitgtk60-devel libadwaita-devel openssl-devel
+ clapper-devel"
short_desc="RSS feed reader that supports various web based services"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/news-flash/news_flash_gtk"
distfiles="https://gitlab.com/news-flash/news_flash_gtk/-/archive/v.${version}/news_flash_gtk-v.${version}.tar.gz"
-checksum=5c9e6d01de0b3503186a125e5edbba425c1193e7e0f3c45a737d53b82bb54106
+checksum=7333e88187f022c0a6ba72e0d6943c1602acde19b646c38e202606cac3a965f7
post_patch() {
if [ -n "$CROSS_BUILD" ]; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (7 preceding siblings ...)
2024-12-20 19:04 ` [PR PATCH] [Updated] " abenson
@ 2024-12-23 17:55 ` classabbyamp
2025-01-18 1:07 ` [PR PATCH] [Updated] " abenson
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2024-12-23 17:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/53322#issuecomment-2560100872
Comment:
meson itself merged in https://github.com/void-linux/void-packages/commit/35ce774185410f3410e87acabc64b35371cfa7c7
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 1.5.2.
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (8 preceding siblings ...)
2024-12-23 17:55 ` classabbyamp
@ 2025-01-18 1:07 ` abenson
2025-04-18 2:05 ` various updates and build failure fixes github-actions
2025-05-02 2:09 ` [PR PATCH] [Closed]: " github-actions
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2025-01-18 1:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages meson_1.5.2
https://github.com/void-linux/void-packages/pull/53322
meson: update to 1.5.2.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
```
pkg host target cross result
meson x86_64 x86_64 n OK
meson x86_64-musl x86_64-musl n OK
meson i686 i686 n OK
meson x86_64-musl aarch64-musl y OK
meson x86_64 aarch64 y OK
meson x86_64-musl armv7l-musl y OK
meson x86_64 armv7l y OK
meson x86_64-musl armv6l-musl y OK
meson x86_64 armv6l y OK
```
Did a run through with:
```
$ grep -r 'build_style=.*meson.*' srcpkgs/ | cut -f2 -d/ | xargs -n1 ./xbps-src pkg
```
No failed builds. Running through again with a cross-build.
A patch file from https://github.com/void-linux/void-packages/pull/53322.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson_1.5.2-53322.patch --]
[-- Type: text/x-diff, Size: 22374 bytes --]
From b5d4f36dc8352810ed60e558e05700d669012aa9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:32:04 -0600
Subject: [PATCH 1/9] libgnt: fix ftbfs
---
srcpkgs/libgnt/patches/fix-ftbfs.patch | 77 ++++++++++++++++++++++++++
srcpkgs/libgnt/template | 2 +-
2 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libgnt/patches/fix-ftbfs.patch
diff --git a/srcpkgs/libgnt/patches/fix-ftbfs.patch b/srcpkgs/libgnt/patches/fix-ftbfs.patch
new file mode 100644
index 00000000000000..0ede7e67d5b308
--- /dev/null
+++ b/srcpkgs/libgnt/patches/fix-ftbfs.patch
@@ -0,0 +1,77 @@
+https://keep.imfreedom.org/libgnt/libgnt/raw-rev/2da723f790d6
+
+# HG changeset patch
+# User Gary Kramlich <grim@reaperworld.com>
+# Date 1702790961 21600
+# Node ID 2da723f790d6c3eef2857a651eb05935bd6f40a0
+# Parent 73d8724225e71d42d27d52547a5cfd61c892a0b0
+Use panel_window instead of directly accessing the struct member
+
+This is necessary to fix a FTBFS in Debian. For more information see
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057570.
+
+Testing Done:
+Compiled and ran `test/focus` without issue.
+
+Reviewed at https://reviews.imfreedom.org/r/2883/
+
+diff -r 73d8724225e7 -r 2da723f790d6 gntwm.c
+--- a/gntwm.c Thu Jun 15 20:22:30 2023 -0500
++++ b/gntwm.c Sat Dec 16 23:29:21 2023 -0600
+@@ -166,38 +166,40 @@
+ int sx, ex, sy, ey, w, y;
+ cchar_t ch;
+ PANEL *below = panel;
++ WINDOW *window = panel_window(panel);
+
+- sx = getbegx(panel->win);
+- ex = getmaxx(panel->win) + sx;
+- sy = getbegy(panel->win);
+- ey = getmaxy(panel->win) + sy;
++ sx = getbegx(window);
++ ex = getmaxx(window) + sx;
++ sy = getbegy(window);
++ ey = getmaxy(window) + sy;
+
+ while ((below = panel_below(below)) != NULL) {
+- if (sy > getbegy(below->win) + getmaxy(below->win) ||
+- ey < getbegy(below->win))
++ window = panel_window(below);
++ if (sy > getbegy(window) + getmaxy(window) ||
++ ey < getbegy(window))
+ continue;
+- if (sx > getbegx(below->win) + getmaxx(below->win) ||
+- ex < getbegx(below->win))
++ if (sx > getbegx(window) + getmaxx(window) ||
++ ex < getbegx(window))
+ continue;
+- for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) {
+- if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK)
++ for (y = MAX(sy, getbegy(window)); y <= MIN(ey, getbegy(window) + getmaxy(window)); y++) {
++ if (mvwin_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch) != OK)
+ goto right;
+ w = widestringwidth(ch.chars);
+ if (w > 1 && (ch.attr & 1)) {
+ ch.chars[0] = ' ';
+ ch.attr &= ~ A_CHARTEXT;
+- mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch);
+- touchline(below->win, y - getbegy(below->win), 1);
++ mvwadd_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch);
++ touchline(window, y - getbegy(window), 1);
+ }
+ right:
+- if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK)
++ if (mvwin_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch) != OK)
+ continue;
+ w = widestringwidth(ch.chars);
+ if (w > 1 && !(ch.attr & 1)) {
+ ch.chars[0] = ' ';
+ ch.attr &= ~ A_CHARTEXT;
+- mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch);
+- touchline(below->win, y - getbegy(below->win), 1);
++ mvwadd_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch);
++ touchline(window, y - getbegy(window), 1);
+ }
+ }
+ }
+
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
index 1cccf79e346c58..1735fd5f616bbe 100644
--- a/srcpkgs/libgnt/template
+++ b/srcpkgs/libgnt/template
@@ -1,7 +1,7 @@
# Template file for 'libgnt'
pkgname=libgnt
version=2.14.3
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dpython2=false"
From 0f05aa2452ce95c1d0786d8084f77d45fe570341 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:42:19 -0600
Subject: [PATCH 2/9] fractal: fix checksum
---
srcpkgs/fractal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index cf42e8a5c4f9ac..cc96a03485bf68 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Fractal"
distfiles="https://gitlab.gnome.org/GNOME/fractal/-/archive/${version}/fractal-${version}.tar.gz"
-checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
+checksum=7872f050bf1c5904b93ba518b542bcb6fc80c557966645101103060098ddf6d0
post_patch() {
[ -z "$CROSS_BUILD" ] && return 0
From 12ec6b0bbbdfbc2819e3fd15a00e04afbaf6fc7c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 07:54:05 -0600
Subject: [PATCH 3/9] gnome-robots: add missing -lm
---
srcpkgs/gnome-robots/patches/add-libm.patch | 14 ++++++++++++++
srcpkgs/gnome-robots/template | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnome-robots/patches/add-libm.patch
diff --git a/srcpkgs/gnome-robots/patches/add-libm.patch b/srcpkgs/gnome-robots/patches/add-libm.patch
new file mode 100644
index 00000000000000..1dca083d149542
--- /dev/null
+++ b/srcpkgs/gnome-robots/patches/add-libm.patch
@@ -0,0 +1,14 @@
+--- a/meson.build
++++ b/meson.build
+@@ -13,6 +13,11 @@
+ language: 'c'
+ )
+
++add_global_link_arguments(
++ ['-lm'],
++ language: 'c'
++)
++
+ gee_dependency = dependency('gee-0.8')
+ gio_dependency = dependency('gio-2.0', version: '>= 2.32')
+ glib_dependency = dependency('glib-2.0', version: '>= 2.32')
diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 369474709a8d81..f7347cbebb3d53 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-robots'
pkgname=gnome-robots
version=40.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config vala"
makedepends="gsound-devel gtk4-devel libcanberra-devel librsvg-devel
From ce3f56cd885722f102696061c1cefe48c9c1a59d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:20:56 -0600
Subject: [PATCH 4/9] cglm: update to 0.9.4.
---
srcpkgs/cglm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index ca931cf625177b..11832259301993 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,6 +1,6 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.3
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=4eda95e34f116c36203777f4fe770d64a3158b1450ea40364abb111cf4ba4773
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
From 516e706c71f2ed9b4c8394be7ac317e50962e211 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:22:53 -0600
Subject: [PATCH 5/9] taisei: update to 1.4.2.
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 10 +--
3 files changed, 5 insertions(+), 157 deletions(-)
delete mode 100644 srcpkgs/taisei/patches/openssl1.patch
delete mode 100644 srcpkgs/taisei/patches/openssl2.patch
diff --git a/srcpkgs/taisei/patches/openssl1.patch b/srcpkgs/taisei/patches/openssl1.patch
deleted file mode 100644
index 2a804bb7710fb8..00000000000000
--- a/srcpkgs/taisei/patches/openssl1.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/src/util/sha256.c b/src/util/sha256.c
-index 15f4491ee..e01e32279 100644
---- a/src/util/sha256.c
-+++ b/src/util/sha256.c
-@@ -119,7 +119,7 @@ static void sha256_init(SHA256State *ctx)
- ctx->state[7] = 0x5be0cd19;
- }
-
--SHA256State* sha256_new(void) {
-+SHA256State *sha256_new(void) {
- SHA256State *ctx = calloc(1, sizeof(*ctx));
- sha256_init(ctx);
- return ctx;
-@@ -129,8 +129,7 @@ void sha256_free(SHA256State *ctx) {
- free(ctx);
- }
-
--void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
--{
-+void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len) {
- sha256_word_t i;
-
- for (i = 0; i < len; ++i) {
-@@ -144,8 +143,7 @@ void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
- }
- }
-
--void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen)
--{
-+void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-
- sha256_word_t i;
-@@ -201,8 +199,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
- sha256_final(&ctx, hash, hashlen);
- }
-
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
-- assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
-+ assert(hashlen >= SHA256_HEXDIGEST_SIZE);
-
- uint8_t digest[SHA256_BLOCK_SIZE];
- sha256_digest(data, len, digest, sizeof(digest));
-diff --git a/src/util/sha256.h b/src/util/sha256.h
-index 191246c91..f501e2d98 100644
---- a/src/util/sha256.h
-+++ b/src/util/sha256.h
-@@ -11,16 +11,19 @@
-
- #include "taisei.h"
-
--#define SHA256_BLOCK_SIZE 32
-+enum {
-+ SHA256_BLOCK_SIZE = 32,
-+ SHA256_HEXDIGEST_SIZE = SHA256_BLOCK_SIZE * 2 + 1,
-+};
-
- typedef struct SHA256State SHA256State;
-
--SHA256State* sha256_new(void) attr_returns_allocated;
-+SHA256State *sha256_new(void) attr_returns_allocated;
- void sha256_update(SHA256State *state, const uint8_t *data, size_t len) attr_nonnull(1, 2);
- void sha256_final(SHA256State *state, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) attr_nonnull(1, 2);
- void sha256_free(SHA256State *state);
-
- void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen);
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen);
-
- #endif // IGUARD_util_sha256_h
-diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
-index b6f8e9039..0dc06e740 100644
---- a/src/util/sha256_openssl.c
-+++ b/src/util/sha256_openssl.c
-@@ -17,7 +17,7 @@ struct SHA256State {
- SHA256_CTX context;
- };
-
--SHA256State* sha256_new(void) {
-+SHA256State *sha256_new(void) {
- SHA256State *st = calloc(1, sizeof(*st));
- SHA256_Init(&st->context);
- return st;
-@@ -45,8 +45,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
- SHA256_Final(hash, &ctx);
- }
-
--void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
-- assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
-+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
-+ assert(hashlen >= SHA256_HEXDIGEST_SIZE);
-
- uint8_t digest[SHA256_BLOCK_SIZE];
- sha256_digest(data, len, digest, sizeof(digest));
diff --git a/srcpkgs/taisei/patches/openssl2.patch b/srcpkgs/taisei/patches/openssl2.patch
deleted file mode 100644
index c1b9f411badc6a..00000000000000
--- a/srcpkgs/taisei/patches/openssl2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
-index 0dc06e740..c73d8e7fb 100644
---- a/src/util/sha256_openssl.c
-+++ b/src/util/sha256_openssl.c
-@@ -11,38 +11,34 @@
- #include "sha256.h"
- #include "util.h"
-
--#include <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- SHA256State *sha256_new(void) {
-- SHA256State *st = calloc(1, sizeof(*st));
-- SHA256_Init(&st->context);
-- return st;
-+ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-+ EVP_DigestInit(ctx, EVP_sha256());
-+ return (SHA256State*)ctx;
- }
-
--void sha256_free(SHA256State *ctx) {
-- free(ctx);
-+void sha256_free(SHA256State *st) {
-+ EVP_MD_CTX_free((EVP_MD_CTX*)st);
- }
-
--void sha256_update(SHA256State *ctx, const uint8_t *data, size_t len) {
-- SHA256_Update(&ctx->context, data, len);
-+void sha256_update(SHA256State *st, const uint8_t *data, size_t len) {
-+ EVP_DigestUpdate((EVP_MD_CTX*)st, data, len);
- }
-
--void sha256_final(SHA256State *ctx, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
-+void sha256_final(SHA256State *st, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-- SHA256_Final(hash, &ctx->context);
-+ EVP_DigestFinalXOF((EVP_MD_CTX*)st, hash, hashlen);
- }
-
- void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
- assert(hashlen >= SHA256_BLOCK_SIZE);
-
-- SHA256_CTX ctx;
-- SHA256_Init(&ctx);
-- SHA256_Update(&ctx, data, len);
-- SHA256_Final(hash, &ctx);
-+ SHA256State *st = sha256_new();
-+ sha256_update(st, data, len);
-+ sha256_final(st, hash, hashlen);
-+ sha256_free(st);
- }
-
- void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..1fc22833e4b544 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,9 +1,9 @@
# Template file for 'taisei'
pkgname=taisei
-version=1.3.2
-revision=2
+version=1.4.2
+revision=1
build_style=meson
-hostmakedepends="pkg-config python3-docutils"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
opusfile-devel"
depends="${pkgname}-data"
@@ -11,8 +11,8 @@ short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://taisei-project.org"
-distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz"
-checksum=dbc05f1b5c31981d8711130ac283355b7bfad403895f4096a6bb7e9a3d73a3bc
+distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz"
+checksum=5d869aae64f8f3390c47b74441fd041c7777e594e4a60536bb7b52564ea84fa7
post_install() {
vlicense COPYING
From e2c5e641cdd60142c5fda1f0ec4075d43181a9bd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 09:59:00 -0600
Subject: [PATCH 6/9] paps: patch for glib 2.82
---
srcpkgs/paps/patches/fix-glib-2.82.patch | 47 ++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 srcpkgs/paps/patches/fix-glib-2.82.patch
diff --git a/srcpkgs/paps/patches/fix-glib-2.82.patch b/srcpkgs/paps/patches/fix-glib-2.82.patch
new file mode 100644
index 00000000000000..be017abf95e35e
--- /dev/null
+++ b/srcpkgs/paps/patches/fix-glib-2.82.patch
@@ -0,0 +1,47 @@
+https://patch-diff.githubusercontent.com/raw/dov/paps/pull/71.patch
+
+From e6ec698be127822661e31f7fca7d2e0107944b24 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 17 Sep 2024 13:58:46 -0400
+Subject: [PATCH] Fix build with glib 2.82
+
+g_utf8_next_char no longer includes a cast to char* as of this change:
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ src/paps.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/paps.cc b/src/paps.cc
+index fde04d1..3ab9a7c 100644
+--- a/src/paps.cc
++++ b/src/paps.cc
+@@ -1107,7 +1107,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ while (p != nullptr && *p)
+ {
+ wc = g_utf8_get_char (p);
+- next = g_utf8_next_char (p);
++ next = (char *) g_utf8_next_char (p);
+ if (wc == (gunichar)-1)
+ {
+ fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
+@@ -1122,7 +1122,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ para->length = p - last_para;
+ /* handle dos line breaks */
+ if (wc == '\r' && *next == '\n')
+- next = g_utf8_next_char(next);
++ next = (char *) g_utf8_next_char(next);
+ para->layout = pango_layout_new (pango_context);
+
+ if (page_layout->cpi > 0.0L)
+@@ -1193,7 +1193,7 @@ split_text_into_paragraphs (PangoContext *pango_context,
+ g_free (newtext);
+
+ para->length = i;
+- next = g_utf8_offset_to_pointer (para->text, para->length);
++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
+ wc = g_utf8_get_char (g_utf8_prev_char (next));
+ }
+ else
From e9d6e2573ea3fe195b1c828bb38775bee3c93509 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 10:01:53 -0600
Subject: [PATCH 7/9] patchmatrix: update distfiles link
---
srcpkgs/patchmatrix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/patchmatrix/template b/srcpkgs/patchmatrix/template
index d15cb0fd28b1d0..c5a87abd752c73 100644
--- a/srcpkgs/patchmatrix/template
+++ b/srcpkgs/patchmatrix/template
@@ -8,6 +8,6 @@ makedepends="lv2 glew-devel jack-devel"
short_desc="JACK patchbay in flow matrix style"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="Artistic-2.0"
-homepage="https://git.open-music-kontrollers.ch/lad/patchmatrix/about/"
-distfiles="https://git.open-music-kontrollers.ch/lad/patchmatrix/snapshot/patchmatrix-${version}.tar.xz"
-checksum=72a3c70a7ac084707a6b4c663d460e02c65f2ecaa71a95c4b864755ba8ba5bb2
+homepage="https://git.open-music-kontrollers.ch/~hp/patchmatrix"
+distfiles="https://git.open-music-kontrollers.ch/~hp/patchmatrix/archive/${version}.tar.gz"
+checksum=53ce80de257012cd754f3691fe0e593ccae0dc3b40dd6c67950819f0668220cd
From 902f8e3a9811a1e541db170e0dd01a2e7aa9e170 Mon Sep 17 00:00:00 2001
From: deimonn <deimonn@outlook.com>
Date: Fri, 7 Jun 2024 16:17:01 -0300
Subject: [PATCH 8/9] New package: clapper-0.6.1
---
common/shlibs | 2 ++
srcpkgs/clapper-devel | 1 +
srcpkgs/clapper/template | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/clapper-devel
create mode 100644 srcpkgs/clapper/template
diff --git a/common/shlibs b/common/shlibs
index e0bba1a4f23171..da736de50b0542 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -820,6 +820,8 @@ libpeas-gtk-1.0.so.0 libpeas-1.0.0_2
libpeas-2.so.0 libpeas2-2.0.1_1
libtotem.so.0 libtotem-3.6.2_1
libclutter-1.0.so.0 clutter-1.14.0_1
+libclapper-0.0.so.0 clapper-0.6.1_1
+libclapper-gtk-0.0.so.0 clapper-0.6.1_1
libavfs.so.0 libavfs-1.0.5_1
libgjs.so.0 gjs-1.65.2_1
libtelepathy-glib.so.0 telepathy-glib-0.15.5_1
diff --git a/srcpkgs/clapper-devel b/srcpkgs/clapper-devel
new file mode 120000
index 00000000000000..f739d81f9a4f83
--- /dev/null
+++ b/srcpkgs/clapper-devel
@@ -0,0 +1 @@
+clapper
\ No newline at end of file
diff --git a/srcpkgs/clapper/template b/srcpkgs/clapper/template
new file mode 100644
index 00000000000000..8f785fb6c812a5
--- /dev/null
+++ b/srcpkgs/clapper/template
@@ -0,0 +1,26 @@
+# Template file for 'clapper'
+pkgname=clapper
+version=0.6.1
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk4-update-icon-cache vala gettext desktop-file-utils"
+makedepends="gtk4-devel gstreamer1-devel libadwaita-devel libsoup3-devel libmicrodns-devel"
+short_desc="Modern and user-friendly media player"
+maintainer="deimonn <deimonn@outlook.com>"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
+homepage="https://github.com/Rafostar/clapper"
+distfiles="https://github.com/Rafostar/clapper/archive/refs/tags/${version}.tar.gz"
+checksum=d244ec6108ebff5ccc817a5888f3f73f52cac129fe480d480cb3f6b9db19cfbe
+
+clapper-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libmicrodns-devel"
+ short_desc+="Modern and user-friendly media player - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/vala
+ }
+}
From 31b17277ba06b96d8d5aafa8962373e8a3d038a3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 20 Dec 2024 13:03:55 -0600
Subject: [PATCH 9/9] newsflash: update to 3.3.5.
---
srcpkgs/newsflash/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/newsflash/template b/srcpkgs/newsflash/template
index 61639800ae3420..2e13bda36b025a 100644
--- a/srcpkgs/newsflash/template
+++ b/srcpkgs/newsflash/template
@@ -1,19 +1,20 @@
# Template file for 'newsflash'
pkgname=newsflash
-version=3.1.3
+version=3.3.5
revision=1
build_style=meson
build_helper=rust
hostmakedepends="cargo pkg-config glib-devel sqlite-devel gettext-devel
desktop-file-utils gtk4-update-icon-cache blueprint-compiler
gtk4-devel libadwaita-devel"
-makedepends="rust-std libwebkitgtk60-devel libadwaita-devel openssl-devel"
+makedepends="rust-std libwebkitgtk60-devel libadwaita-devel openssl-devel
+ clapper-devel"
short_desc="RSS feed reader that supports various web based services"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/news-flash/news_flash_gtk"
distfiles="https://gitlab.com/news-flash/news_flash_gtk/-/archive/v.${version}/news_flash_gtk-v.${version}.tar.gz"
-checksum=5c9e6d01de0b3503186a125e5edbba425c1193e7e0f3c45a737d53b82bb54106
+checksum=7333e88187f022c0a6ba72e0d6943c1602acde19b646c38e202606cac3a965f7
post_patch() {
if [ -n "$CROSS_BUILD" ]; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: various updates and build failure fixes
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (9 preceding siblings ...)
2025-01-18 1:07 ` [PR PATCH] [Updated] " abenson
@ 2025-04-18 2:05 ` github-actions
2025-05-02 2:09 ` [PR PATCH] [Closed]: " github-actions
11 siblings, 0 replies; 13+ messages in thread
From: github-actions @ 2025-04-18 2:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/53322#issuecomment-2814349288
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Closed]: various updates and build failure fixes
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
` (10 preceding siblings ...)
2025-04-18 2:05 ` various updates and build failure fixes github-actions
@ 2025-05-02 2:09 ` github-actions
11 siblings, 0 replies; 13+ messages in thread
From: github-actions @ 2025-05-02 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 944 bytes --]
There's a closed pull request on the void-packages repository
various updates and build failure fixes
https://github.com/void-linux/void-packages/pull/53322
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
```
pkg host target cross result
meson x86_64 x86_64 n OK
meson x86_64-musl x86_64-musl n OK
meson i686 i686 n OK
meson x86_64-musl aarch64-musl y OK
meson x86_64 aarch64 y OK
meson x86_64-musl armv7l-musl y OK
meson x86_64 armv7l y OK
meson x86_64-musl armv6l-musl y OK
meson x86_64 armv6l y OK
```
Did a run through with:
```
$ grep -r 'build_style=.*meson.*' srcpkgs/ | cut -f2 -d/ | xargs -n1 ./xbps-src pkg
```
No failed builds. Running through again with a cross-build.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2025-05-02 2:09 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-03 5:04 [PR PATCH] meson: update to 1.5.2 abenson
2024-12-03 17:00 ` abenson
2024-12-19 14:04 ` [PR PATCH] [Updated] " abenson
2024-12-20 3:27 ` abenson
2024-12-20 3:45 ` abenson
2024-12-20 16:10 ` [PR PATCH] [Updated] " abenson
2024-12-20 16:10 ` abenson
2024-12-20 18:38 ` abenson
2024-12-20 19:04 ` [PR PATCH] [Updated] " abenson
2024-12-23 17:55 ` classabbyamp
2025-01-18 1:07 ` [PR PATCH] [Updated] " abenson
2025-04-18 2:05 ` various updates and build failure fixes github-actions
2025-05-02 2:09 ` [PR PATCH] [Closed]: " github-actions
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).