gtk4: update to 4.18.2

This commit is contained in:
chrysos349 2025-03-22 18:41:28 +03:00 committed by oreo639
parent 7d26ac84b1
commit c7d07ccb0a
2 changed files with 26 additions and 34 deletions

View file

@ -1,31 +1,30 @@
remove two failing doc-check tests: doc-check-gdk and doc-check-gtk, remove two failing tests because some symbols and return values for them are
because some symbols and return values for them are not documented. not documented.
diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
index 89c8371a..1b5e9a50 100644 index c9626141..0598ecb0 100644
--- a/docs/reference/gdk/meson.build --- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build +++ b/docs/reference/gdk/meson.build
@@ -29,18 +29,6 @@ if get_option('documentation') @@ -70,17 +70,6 @@ if get_option('documentation')
install_dir: docs_dir, install_dir: docs_dir,
) )
- test('doc-check-gdk', - test('doc-check-gdk-x11',
- gidocgen, - gidocgen,
- args: [ - args: [
- 'check', - 'check',
- '--config', gdk4_toml, - '--config', gdk4x11_toml,
- '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'), - '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'),
- gdk_gir[0], - gdk_x11_gir[0],
- ], - ],
- depends: gdk_gir[0], - depends: gdk_x11_gir[0],
- suite: ['docs', 'failing'], - suite: ['docs', 'failing'],
- ) - )
- endif
if x11_enabled
gdk4x11_toml = configure_file( if wayland_enabled
input: 'gdk4-x11.toml.in',
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 70741afe..051dcca9 100644 index 7b5e18b0..3aa886a7 100644
--- a/docs/reference/gtk/meson.build --- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build +++ b/docs/reference/gtk/meson.build
@@ -65,17 +65,6 @@ if get_option('documentation') @@ -65,17 +65,6 @@ if get_option('documentation')

View file

@ -1,6 +1,6 @@
# Template file for 'gtk4' # Template file for 'gtk4'
pkgname=gtk4 pkgname=gtk4
version=4.16.12 version=4.18.2
revision=1 revision=1
build_style=meson build_style=meson
build_helper="gir" build_helper="gir"
@ -18,7 +18,7 @@ hostmakedepends="gettext-devel glib-devel gi-docgen perl
pkg-config sassc gettext libxslt docbook-xsl python3-docutils pkg-config sassc gettext libxslt docbook-xsl python3-docutils
$(vopt_if wayland 'wayland-devel wayland-protocols') shaderc" $(vopt_if wayland 'wayland-devel wayland-protocols') shaderc"
makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
iso-codes graphene-devel gst-plugins-bad1-devel iso-codes graphene-devel gst-plugins-bad1-devel cairo-devel
$(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
$(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-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') $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
@ -30,10 +30,10 @@ short_desc="GIMP ToolKit (v4)"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later" license="LGPL-2.1-or-later"
homepage="https://www.gtk.org/" homepage="https://www.gtk.org/"
#changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS" changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS"
changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-16/NEWS" #changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-18/NEWS"
distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
checksum=ef31bdbd6f082c4401634a20c850b0050c9bf252ef1e079764ee95a2a0c4c95a checksum=cca5677be4c3e501b49f1c50bcafacba8dcf4bd3a2d016388f834eff274dc159
# Package build options # Package build options
build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker" build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"
@ -113,13 +113,6 @@ gtk4-demo_package() {
vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg
vmove usr/share/man/man1/gtk4-node-editor.1 vmove usr/share/man/man1/gtk4-node-editor.1
vmove usr/share/metainfo/org.gtk.gtk4.NodeEditor.appdata.xml vmove usr/share/metainfo/org.gtk.gtk4.NodeEditor.appdata.xml
vmove usr/bin/gtk4-icon-browser
vmove usr/share/applications/org.gtk.IconBrowser4.desktop
vmove usr/share/icons/hicolor/scalable/apps/org.gtk.IconBrowser4.svg
vmove usr/share/icons/hicolor/symbolic/apps/org.gtk.IconBrowser4-symbolic.svg
vmove usr/share/man/man1/gtk4-icon-browser.1
vmove usr/share/metainfo/org.gtk.IconBrowser4.appdata.xml
} }
} }