From 4cf39eb50f943c2b8d8b287f3c4f6e93d6cbe160 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 1 Jun 2021 23:48:13 +0200 Subject: [PATCH] gtk4: update to 4.2.1, split docs, enable sysprof --- srcpkgs/gtk4-doc | 1 + srcpkgs/gtk4/patches/fix-sysprof.patch | 23 ++++++++++++++++ srcpkgs/gtk4/template | 36 +++++++++++++++++++------- 3 files changed, 50 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/gtk4-doc create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc new file mode 120000 index 00000000000..870d493d73b --- /dev/null +++ b/srcpkgs/gtk4-doc @@ -0,0 +1 @@ +gtk4 \ No newline at end of file diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch new file mode 100644 index 00000000000..76a86d16cc8 --- /dev/null +++ b/srcpkgs/gtk4/patches/fix-sysprof.patch @@ -0,0 +1,23 @@ +--- a/gtk/meson.build ++++ b/gtk/meson.build +@@ -1001,6 +1001,7 @@ gtk_deps = [ + epoxy_dep, + libm, + graphene_dep, ++ libsysprof_dep, + ] + + if harfbuzz_dep.found() and pangoft_dep.found() +diff --git a/tools/meson.build b/tools/meson.build +index 1811b69..804e37f 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -30,7 +30,7 @@ gtk_tools = [ + 'gtk-builder-tool-enumerate.c', + 'gtk-builder-tool-preview.c'], [libgtk_dep] ], + ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ], +- ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ], ++ ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ], + ] + + if os_unix diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index 450d393b09c..6441fdf8e85 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,42 +1,58 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.2.0 +version=4.2.1 revision=1 wrksrc="gtk-${version}" build_style=meson build_helper="gir" -configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all +configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true -Dbroadway-backend=$(vopt_if broadway true false) -Dx11-backend=$(vopt_if x11 true false) -Dwayland-backend=$(vopt_if wayland true false) -Dintrospection=$(vopt_if gir enabled disabled) - -Dprint-backends=$(vopt_if cups 'cups,file' file) -Dcolord=$(vopt_if colord enabled disabled) -Dcloudproviders=$(vopt_if cloudproviders enabled disabled) - -Dvulkan=$(vopt_if vulkan enabled disabled)" -hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl - pkg-config sassc gettext + -Dvulkan=$(vopt_if vulkan enabled disabled) + -Dsysprof=$(vopt_if sysprof enabled disabled)" +hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl + pkg-config sassc gettext libxslt docbook-xsl $(vopt_if wayland 'wayland-devel wayland-protocols')" makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-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') - $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')" + $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') + $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')" depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')" short_desc="GIMP ToolKit (v4)" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" -checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072 +checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6 # Package build options -build_options="broadway cloudproviders colord cups gir vulkan wayland x11" +build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof" desc_option_broadway="Enable support for the HTML5 Broadway backend" desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud" +desc_option_sysprof="Enable support for sysprof profiling" -build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir" +build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof" + +pre_build() { + # help gi-docgen find gi files on cross + if [ -n "$CROSS_BUILD" ]; then + export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/ + fi +} + +gtk4-doc_package() { + short_desc+=" - documentation" + pkg_install() { + vmove usr/share/doc + } +} gtk4-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}"