diff --git a/srcpkgs/gtk4/patches/remove-failing-tests.patch b/srcpkgs/gtk4/patches/remove-failing-tests.patch index 671aea15330..143941702ce 100644 --- a/srcpkgs/gtk4/patches/remove-failing-tests.patch +++ b/srcpkgs/gtk4/patches/remove-failing-tests.patch @@ -1,31 +1,30 @@ -remove two failing doc-check tests: doc-check-gdk and doc-check-gtk, -because some symbols and return values for them are not documented. +remove two 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 -index 89c8371a..1b5e9a50 100644 +index c9626141..0598ecb0 100644 --- a/docs/reference/gdk/meson.build +++ b/docs/reference/gdk/meson.build -@@ -29,18 +29,6 @@ if get_option('documentation') - install_dir: docs_dir, - ) +@@ -70,17 +70,6 @@ if get_option('documentation') + 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', 'failing'], -- ) -- - if x11_enabled - gdk4x11_toml = configure_file( - input: 'gdk4-x11.toml.in', +- test('doc-check-gdk-x11', +- gidocgen, +- args: [ +- 'check', +- '--config', gdk4x11_toml, +- '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gtk'), +- gdk_x11_gir[0], +- ], +- depends: gdk_x11_gir[0], +- suite: ['docs', 'failing'], +- ) + endif + + if wayland_enabled 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 +++ b/docs/reference/gtk/meson.build @@ -65,17 +65,6 @@ if get_option('documentation') diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index 4ace9ebbd15..b9954b954ff 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,6 +1,6 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.16.12 +version=4.18.2 revision=1 build_style=meson build_helper="gir" @@ -18,7 +18,7 @@ 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 + iso-codes graphene-devel gst-plugins-bad1-devel cairo-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') @@ -30,10 +30,10 @@ short_desc="GIMP ToolKit (v4)" maintainer="Orphaned " license="LGPL-2.1-or-later" 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-16/NEWS" +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=ef31bdbd6f082c4401634a20c850b0050c9bf252ef1e079764ee95a2a0c4c95a +checksum=cca5677be4c3e501b49f1c50bcafacba8dcf4bd3a2d016388f834eff274dc159 # Package build options 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/man/man1/gtk4-node-editor.1 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 } }