diff --git a/gtk4/0001-HACK-Don-t-use-objcopy-for-resource-embedding.patch b/gtk4/0001-HACK-Don-t-use-objcopy-for-resource-embedding.patch index 5482fe15f4..3ff6303ccf 100644 --- a/gtk4/0001-HACK-Don-t-use-objcopy-for-resource-embedding.patch +++ b/gtk4/0001-HACK-Don-t-use-objcopy-for-resource-embedding.patch @@ -15,10 +15,10 @@ See: https://gitlab.gnome.org/GNOME/gtk/-/issues/6153 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 38062bf05d0f..8c05fc50a14e 100644 +index d7c859b8ca71..8b7b22da0504 100644 --- a/meson.build +++ b/meson.build -@@ -772,7 +772,7 @@ if ld.found() +@@ -783,7 +783,7 @@ if ld.found() endif if not meson.is_cross_build() and build_machine.cpu_family() == 'x86_64' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and objcopy_supports_section_alignment and ld.found() and ld_is_bfd diff --git a/gtk4/PKGBUILD b/gtk4/PKGBUILD index 4032b22243..40790469ec 100644 --- a/gtk4/PKGBUILD +++ b/gtk4/PKGBUILD @@ -9,8 +9,8 @@ pkgname=( gtk4-docs gtk-update-icon-cache ) -pkgver=4.14.4 -pkgrel=2 +pkgver=4.16.1 +pkgrel=1 epoch=1 pkgdesc="GObject-based multi-platform GUI toolkit" url="https://www.gtk.org/" @@ -54,7 +54,7 @@ depends=( libxrender pango shared-mime-info - tracker3 + tinysparql wayland ) makedepends=( @@ -89,12 +89,12 @@ source=( gtk4-querymodules.{hook,script} 0001-HACK-Don-t-use-objcopy-for-resource-embedding.patch ) -b2sums=('c90ab13a1708bfa3f32d130ba84e327e26432ef3a188c8e8a8d2ad7951b0ecb7d24e04f80e9d333317490f543a64d3dee7b0c5cc6d702a4e59fa88767a465602' +b2sums=('a39b06dde6dfe3c7cccf21f9f2e75299ecf42196ff870f36521b40f27b4c9c35162cbc92d59c6c5aa6478deebdc6f5984fa7f309cd2d20ab3fdc10a0306a0bf3' '136bdb410c46daf769175e8e8837286576391797a4762b8cf388217e893dd6c5087c5c91c347cbdf7d3e9dcd2c978c2fb275b5af1f3425c9f7979fbc65a81324' '6bcd839ef82296d864587e0cc7acc0145bdea8e5235af304747cf3c0e564c2757cc67c0373dc044bec83dccfc57dc899546c2fccea96cff2bba22f09978a3814' 'dd589bd1ad2b13f0e06f6899776a083f20a1aac24d4308d666ffd0d1cff38457b8257b8366f92e767b4233b3d86b6b54fa50339faf84c4801a824986366dce30' '4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243' - '46b2e6ae4a6103670444f659730fd6371b7d507c8c98534e85a4e4813e44b79de5d8065cee547f86c94221677a509e3a457bca1608ee37b199f62db5fff7ce36') + 'e240e0a064d6f2e5b2780c41c49b3b55e3e89b99dd4efb515a5a953bf06ed66a04342d81c987b34989650ead5a7797eada867328bb0f97be7e3040dc957543d9') prepare() { cd gtk @@ -125,10 +125,11 @@ build() { } check() ( - export XDG_RUNTIME_DIR="$PWD/runtime-dir" WAYLAND_DISPLAY=wayland-5 - + export XDG_RUNTIME_DIR="$PWD/runtime-dir" mkdir -p -m 700 "$XDG_RUNTIME_DIR" - weston --backend=headless-backend.so --socket=$WAYLAND_DISPLAY --idle-time=0 & + + export WAYLAND_DISPLAY=wl-$pkgbase-$RANDOM + weston --backend=headless --socket=$WAYLAND_DISPLAY --idle-time=0 & _w=$! trap "kill $_w; wait" EXIT @@ -228,11 +229,13 @@ package_gtk-update-icon-cache() { ) mv guic/* "$pkgdir" - ln -s gtk4-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" - ln -s gtk4-update-icon-cache.1 "$pkgdir/usr/share/man/man1/gtk-update-icon-cache.1" + + ln -sr "$pkgdir"/usr/bin/gtk{4,}-update-icon-cache + ln -sr "$pkgdir"/usr/share/man/man1/gtk{4,}-update-icon-cache.1 install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook - install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache" + install -D gtk-update-icon-cache.script \ + "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache" } # vim:set sw=2 sts=-1 et: