Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions srcpkgs/citations/template
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Template file for 'citations'
pkgname=citations
version=0.7.0
version=0.9.0
revision=1
build_style=meson
build_helper=rust
hostmakedepends="glib-devel gettext rust cargo pkg-config
gtk-update-icon-cache gtk4-update-icon-cache desktop-file-utils"
makedepends="libadwaita-devel gtk4-devel openssl-devel
rust-std poppler-glib-devel gtksourceview5-devel"
makedepends="cmake libadwaita-devel gtk4-devel openssl-devel
rust-std poppler-glib-devel gtksourceview5-devel libadwaita-devel"
short_desc="Manage your bibliography using BibTeX format"
maintainer="Alex Childs <[email protected]>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/citations"
distfiles="https://gitlab.gnome.org/World/citations/-/archive/${version}/citations-${version}.tar.gz"
checksum=5959b6cfe39e69f987a53c694950d5fa794ca6d5725ad9838f8ed04a2bab1b89
checksum=499bf8929ff48a409cc6532f7e91042647d0a08de5850788abd6f45ce7d1ffca

post_patch() {
if [ "$CROSS_BUILD" ]; then
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/gi-docgen/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'gi-docgen'
pkgname=gi-docgen
version=2025.4
version=2025.5
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools"
Expand All @@ -12,5 +12,5 @@ license="Apache-2.0, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gi-docgen/"
changelog="https://gitlab.gnome.org/GNOME/gi-docgen/-/releases"
distfiles="${GNOME_SITE}/gi-docgen/${version%.*}/gi-docgen-$version.tar.xz"
checksum=66c865d459febdfb5e4078a88df06183620c3e91f726d1dc608d88ee3605526e
checksum=2579a33ff87b622d10d102c91b7d0ece506340b70e34dbb6522163e16c90aca3
make_check=no # no tests, but check fails
44 changes: 43 additions & 1 deletion srcpkgs/gtk4/patches/remove-failing-tests.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
remove two failing tests because some symbols and return values for them are
remove four failing tests because some symbols and return values for them are
not documented.

diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
Expand Down Expand Up @@ -45,3 +45,45 @@ index 7b5e18b0..3aa886a7 100644
endif

rst2man = find_program('rst2man', 'rst2man.py', required: get_option('man-pages'))
diff --git a/docs/reference/gsk/meson.build b/docs/reference/gsk/meson.build
--- a/docs/reference/gsk/meson.build
+++ b/docs/reference/gsk/meson.build
@@ -31,15 +31,4 @@
install_dir: docs_dir,
)

- test('doc-check-gsk',
- gidocgen,
- args: [
- 'check',
- '--config', gsk4_toml,
- '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
- gsk_gir[0],
- ],
- depends: gsk_gir[0],
- suite: ['docs'],
- )
endif
diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
--- a/docs/reference/gdk/meson.build
+++ a/docs/reference/gdk/meson.build
@@ -29,18 +29,6 @@
install_dir: docs_dir,
)

- test('doc-check-gdk',
- gidocgen,
- args: [
- 'check',
- '--config', gdk4_toml,
- '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
- gdk_gir[0],
- ],
- depends: gdk_gir[0],
- suite: ['docs'],
- )
-
if x11_enabled
gdk4x11_toml = configure_file(
input: 'gdk4-x11.toml.in',

8 changes: 4 additions & 4 deletions srcpkgs/gtk4/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'gtk4'
pkgname=gtk4
version=4.18.6
version=4.19.4
revision=1
build_style=meson
build_helper="gir"
Expand All @@ -17,8 +17,8 @@ configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false
hostmakedepends="gettext-devel glib-devel gi-docgen perl
pkg-config sassc gettext libxslt docbook-xsl python3-docutils
$(vopt_if wayland 'wayland-devel wayland-protocols') shaderc"
makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
iso-codes graphene-devel gst-plugins-bad1-devel cairo-devel
makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel cmake
iso-codes graphene-devel gst-plugins-bad1-devel cairo-devel librsvg-devel
$(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
$(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
Expand All @@ -33,7 +33,7 @@ homepage="https://www.gtk.org/"
#changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS"
changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-18/NEWS"
distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
checksum=e1817c650ddc3261f9a8345b3b22a26a5d80af154630dedc03cc7becefffd0fa
checksum=9397f0f5135808a52052082318531c5e90a9b5377a280c2d4c439c1328f93070

# Package build options
build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/libadwaita/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'libadwaita'
pkgname=libadwaita
version=1.7.5
version=1.8.1
revision=1
build_style=meson
build_helper="gir"
Expand All @@ -16,7 +16,7 @@ license="LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-7/NEWS"
distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
checksum=c2c1813c967d45c0f49e907f8c26e66f68fe49dec6436e2d3349350ac9efbd2e
checksum=8b1d4d5f89373a5b6eea8d93ecdaee34cd26ad27a4dd396c06f5d9929fb313bc
make_check_pre="dbus-run-session xvfb-run"

build_options="gir gtk_doc"
Expand Down
79 changes: 79 additions & 0 deletions srcpkgs/meson/patches/musl-tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# see https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/meson/skip-broken-tests.patch
# more specifically https://github.com/mesonbuild/meson/issues/8283
# previously there was a vsed in the post_patch() of the template
--- a/mesonbuild/utils/universal.py
+++ b/mesonbuild/utils/universal.py
@@ -19,6 +19,7 @@
from functools import lru_cache, wraps
from itertools import tee
from tempfile import TemporaryDirectory, NamedTemporaryFile
+from packaging.tags import sys_tags
import typing as T
import textwrap
import pickle
@@ -115,6 +116,7 @@
'is_aix',
'is_android',
'is_ascii_string',
+ 'is_musl',
'is_cygwin',
'is_debianlike',
'is_dragonflybsd',
@@ -650,6 +652,10 @@
def is_wsl() -> bool:
return is_linux() and 'microsoft' in platform.release().lower()

+def is_musl() -> bool:
+ tags = list(sys_tags() )
+ return "musl" in tags[0].platform
+
def is_cygwin() -> bool:
return sys.platform == 'cygwin'

--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -23,7 +23,7 @@
import mesonbuild.coredata
import mesonbuild.modules.gnome
from mesonbuild.mesonlib import (
- MachineChoice, is_windows, is_osx, is_cygwin, is_openbsd, is_haiku,
+ MachineChoice, is_windows, is_osx, is_musl, is_cygwin, is_openbsd, is_haiku,
is_sunos, windows_proof_rmtree, version_compare, is_linux,
EnvironmentException
)
@@ -309,6 +309,8 @@

@skip_if_not_base_option('b_sanitize')
def test_generate_gir_with_address_sanitizer(self):
+ if is_musl():
+ raise SkipTest('asan not available on musl')
if is_cygwin():
raise SkipTest('asan not available on Cygwin')
if is_openbsd():
@@ -453,6 +455,8 @@
included on the linker command line when c_link_args is
set but c_args is not.
'''
+ if is_musl():
+ raise SkipTest('asan not available on musl')
if is_cygwin():
raise SkipTest('asan not available on Cygwin')
if is_openbsd():
@@ -1005,6 +1009,8 @@

@skip_if_not_base_option('b_sanitize')
def test_env_cflags_ldflags(self):
+ if is_musl():
+ raise SkipTest('asan not available on musl')
if is_cygwin():
raise SkipTest('asan not available on Cygwin')
if is_openbsd():
@@ -1021,6 +1027,8 @@

@skip_if_not_base_option('b_sanitize')
def test_pch_with_address_sanitizer(self):
+ if is_musl():
+ raise SkipTest('asan not available on musl')
if is_cygwin():
raise SkipTest('asan not available on Cygwin')
if is_openbsd():
11 changes: 2 additions & 9 deletions srcpkgs/meson/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'meson'
pkgname=meson
version=1.6.1
version=1.9.1
revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
Expand All @@ -14,20 +14,13 @@ 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=1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de
checksum=4e076606f2afff7881d195574bddcd8d89286f35a17b4977a216f535dc0c74ac

# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
checkdepends+=" libsanitizer-devel"
fi

post_patch() {
if [ "$XBPS_TARGET_LIBC" = musl ]; then
vsed -e 's/test_pch_with_address_sanitizer/_&/' \
-i unittests/linuxliketests.py
fi
}

do_check() {
# meson depends on trillion of things to perform actual tests
# see checkdepends=() on arch
Expand Down