From b542dce1f2a7b7eea7a254d1f1a05df26367b5ac Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 5 Mar 2022 22:40:46 +0800
Subject: [PATCH 2/2] gnu: gtk: Update to 4.6.1.
* gnu/local.mk (dist_patch_DATA): Remove gtk-introspection-test.patch.
* gnu/packages/patches/gtk-introspection-test.patch: Remove.
* gnu/packages/gtk.scm (gtk): Update to 4.6.1.
[source]: Remove stale patch.
[arguments]<phases>: Add 'patch-rst2man' phase, correct the binary name of
rst2man to 'rst2man.py'
[inputs]: Add libjpeg-turbo, libpng, libtiff.
[native-inputs]: Add python-docutils.
[propagated-inputs]: Use pango-1.50.
---
gnu/local.mk | 1 -
gnu/packages/gtk.scm | 17 +++++++++-----
.../patches/gtk-introspection-test.patch | 22 -------------------
3 files changed, 12 insertions(+), 28 deletions(-)
delete mode 100644 gnu/packages/patches/gtk-introspection-test.patch
@@ -1244,7 +1244,6 @@ dist_patch_DATA = \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk-doc-respect-xml-catalog.patch \
- %D%/packages/patches/gtk-introspection-test.patch \
%D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \
@@ -1076,7 +1076,7 @@ (define-public gtk+
(define-public gtk
(package
(name "gtk")
- (version "4.4.1")
+ (version "4.6.1")
(source
(origin
(method url-fetch)
@@ -1084,10 +1084,9 @@ (define-public gtk
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "1x6xlc063nqp7cg6py4kq1kpw9pkq49ifk5kki0brc667ncdmahg"))
+ (base32 "0pzcs24j67f90kjcp6apgn6rffynxksjm1m7d3an7kdv3k90hmfq"))
(patches
- (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"
- "gtk-introspection-test.patch"))))
+ (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))))
(build-system meson-build-system)
(outputs '("out" "bin" "doc"))
(arguments
@@ -1117,6 +1116,10 @@ (define-public gtk
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file))
+ (add-after 'unpack 'patch-rst2man
+ (lambda _
+ (substitute* "docs/reference/gtk/meson.build"
+ (("find_program\\('rst2man'") "find_program('rst2man.py'"))))
(add-after 'unpack 'patch
(lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
;; Correct DTD resources of docbook.
@@ -1194,6 +1197,7 @@ (define-public gtk
("pkg-config" ,pkg-config)
("python-pygobject" ,python-pygobject)
;; These python modules are required for building documentation.
+ ("python-docutils" ,python-docutils)
("python-jinja2" ,python-jinja2)
("python-markdown" ,python-markdown)
("python-markupsafe" ,python-markupsafe)
@@ -1216,7 +1220,10 @@ (define-public gtk
iso-codes
json-glib
libcloudproviders ;for cloud-providers support
+ libjpeg-turbo
+ libpng
librsvg
+ libtiff
python
rest
tracker)) ;for filechooser search support
@@ -1239,7 +1246,7 @@ (define-public gtk
("libxkbcommon" ,libxkbcommon)
("libxrandr" ,libxrandr)
("libxrender" ,libxrender)
- ("pango" ,pango)
+ ("pango" ,pango-1.50)
("vulkan-headers" ,vulkan-headers)
("vulkan-loader" ,vulkan-loader) ;for vulkan graphics API support
("wayland" ,wayland) ;for wayland display-backend
deleted file mode 100644
@@ -1,22 +0,0 @@
-# Extend rather than stomp environment variables.
-# Upstream status: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4268
-diff --git a/testsuite/introspection/meson.build b/testsuite/introspection/meson.build
-index 6202fb7446..b59191eb0f 100644
---- a/testsuite/introspection/meson.build
-+++ b/testsuite/introspection/meson.build
-@@ -1,9 +1,10 @@
-+env = environment()
-+env.prepend('GI_TYPELIB_PATH',
-+ join_paths(project_build_root, 'gtk'),
-+ gi_dep.get_pkgconfig_variable('typelibdir'))
-+env.prepend('LD_PRELOAD', join_paths(project_build_root, 'gtk', 'libgtk-4.so'))
-
- test('api',
- find_program('api.py', dirs: meson.current_source_dir()),
- suite: ['introspection'],
-- env: [
-- 'GI_TYPELIB_PATH=@0@/gtk:@1@'.format(project_build_root,
-- gi_dep.get_pkgconfig_variable('typelibdir')),
-- 'LD_PRELOAD=@0@/gtk/libgtk-4.so'.format(project_build_root),
-- ])
-+ env: env)
--
2.34.0