mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-17 12:30:38 +02:00
Code Releases Activity

gnu: gtk: Update to 4.6.1.

Browse source 
* 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-next.
* gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Disable GTK4 build.
<configure-flags>: Add "-DENABLE_GTK_IM_MODULE=OFF".
<phases>: In phase "patch-install-prefix", Remove GTK4 code.
[inputs]: Remove package gtk.
[outputs]: Remove output "gtk4".

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Zhu Zihao 2022-03-05 22:40:46 +08:00 • committed by Ludovic Courtès
parent 4df7fe14ff
commit ef3cae59a2
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 18 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/fcitx5.scm
View file

@ -205,7 +205,8 @@ editors.")
#~(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR="
#$output "/share/gir-1.0")
(string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR="
#$output "/lib/girepository-1.0"))
#$output "/lib/girepository-1.0")
"-DENABLE_GTK4_IM_MODULE=OFF")
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'patch-install-prefix
@ -218,11 +219,10 @@ editors.")
(string-append output "/lib"))))
(let ((gtk2 #$output:gtk2)
(gtk3 #$output:gtk3)
(gtk4 #$output:gtk4))
(gtk3 #$output:gtk3))
(for-each split-immodule
'("gtk2" "gtk3" "gtk4")
(list gtk2 gtk3 gtk4))))))))
'("gtk2" "gtk3")
(list gtk2 gtk3))))))))
(inputs
(list fcitx5
fmt
@ -232,12 +232,11 @@ editors.")
gobject-introspection
gtk+-2
gtk+
gtk
glib))
(native-inputs
(list extra-cmake-modules pkg-config
`(,glib "bin"))) ;for glib-genmarshal
(outputs '("out" "gtk2" "gtk3" "gtk4"))
(outputs '("out" "gtk2" "gtk3"))
(home-page "https://github.com/fcitx/fcitx5-gtk")
(synopsis "GLib-based D-Bus client and GTK IM module for Fcitx 5")
(description "Fcitx5-gtk provides the following functionality in the
@ -250,8 +249,6 @@ GLib-based D-Bus client of Fcitx5.
IM module for GTK+2 applications.
@item gtk3
IM module for GTK+3 applications.
@item gtk4
IM module for GTK4 applications.
@end table")
(license license:lgpl2.1+)))