Date: Friday, December 23, 2022 @ 01:52:58 Author: heftig Revision: 464781
3.24.36-1 Modified: gtk3/trunk/PKGBUILD ----------+ PKGBUILD | 61 +++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-22 23:05:49 UTC (rev 464780) +++ PKGBUILD 2022-12-23 01:52:58 UTC (rev 464781) @@ -2,9 +2,13 @@ # Contributor: Ionut Biru <[email protected]> pkgbase=gtk3 -pkgname=(gtk3 gtk3-docs gtk3-demos) -pkgver=3.24.35 -pkgrel=2 +pkgname=( + gtk3 + gtk3-demos + gtk3-docs +) +pkgver=3.24.36 +pkgrel=1 epoch=1 pkgdesc="GObject-based multi-platform GUI toolkit" url="https://www.gtk.org/"; @@ -12,29 +16,35 @@ license=(LGPL) depends=( adwaita-icon-theme - at-spi2-atk atk cairo cantarell-fonts dconf desktop-file-utils + fontconfig fribidi gdk-pixbuf2 - gtk-update-icon-cache + glib2 + harfbuzz iso-codes libcloudproviders libcolord libcups + libegl libepoxy + libgl librsvg libxcomposite + libx11 libxcursor libxdamage + libxext + libxfixes libxi libxinerama libxkbcommon libxrandr - mesa + libxrender pango shared-mime-info tracker3 @@ -50,7 +60,7 @@ wayland-protocols ) options=(debug) -_commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119 # tags/3.24.35^0 +_commit=35516a5e866cd77390eb71d72d5b67f45dc4302c # tags/3.24.36^0 source=( "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"; gtk-query-immodules-3.0.hook @@ -65,14 +75,6 @@ prepare() { cd gtk - - # Crash in gnome-screenshot - # https://gitlab.gnome.org/GNOME/gtk/-/issues/4456 - git cherry-pick -n e413f5c43259a22269aa1e75767dd545e10119b5 - - # https://bugs.archlinux.org/task/76651 - # https://gitlab.gnome.org/GNOME/gtk/-/issues/5365 - git cherry-pick -n 3f1536632f682c355d0c3abe1afc80cf975c2cce } build() { @@ -102,8 +104,14 @@ } package_gtk3() { + depends+=(gtk-update-icon-cache) optdepends=('evince: Default print preview command') - provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so) + provides=( + gtk3-print-backends + libgailutil-3.so + libgdk-3.so + libgtk-3.so + ) conflicts=(gtk3-print-backends) replaces=("gtk3-print-backends<=3.22.26-1") install=gtk3.install @@ -121,22 +129,17 @@ cd "$pkgdir" - rm usr/bin/gtk-update-icon-cache - rm usr/share/man/man1/gtk-update-icon-cache.1 - - _pick docs usr/share/gtk-doc - _pick demo usr/bin/gtk3-{demo,demo-application,icon-browser,widget-factory} _pick demo usr/share/applications/gtk3-{demo,icon-browser,widget-factory}.desktop _pick demo usr/share/glib-2.0/schemas/org.gtk.{Demo,exampleapp}.gschema.xml _pick demo usr/share/icons/hicolor/*/apps/gtk3-{demo,widget-factory}[-.]* _pick demo usr/share/man/man1/gtk3-{demo,demo-application,icon-browser,widget-factory}.1 -} -package_gtk3-docs() { - pkgdesc+=" (documentation)" - depends=() - mv docs/* "$pkgdir" + _pick docs usr/share/gtk-doc + + # Built by GTK 4, shared with GTK 3 + rm usr/bin/gtk-update-icon-cache + rm usr/share/man/man1/gtk-update-icon-cache.1 } package_gtk3-demos() { @@ -145,4 +148,10 @@ mv demo/* "$pkgdir" } +package_gtk3-docs() { + pkgdesc+=" (documentation)" + depends=() + mv docs/* "$pkgdir" +} + # vim:set sw=2 sts=-1 et:
