mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 14:07:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: at-spi2-core-minimal: Update to 2.45.90, rename to at-spi2-core.

Browse source 
at-spi2-core now includes at-spi2-atk (see:
https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78).

* gnu/packages/gtk.scm (at-spi2-core-minimal): Rename to...
(at-spi2-core): ... this.  Update to 2.45.90.
[phases]{check}: Adjust per upstream changes.
[inputs]: Add libxml2.
[native-inputs]: Delete labels.  Add gsettings-desktop-schemas,
python-dbusmock and python-pytest.
(at-spi2-core-with-documentation): Variable renamed from at-spi2-core.  Adjust
accordingly to changes to parent (inherited) package, and use gexps.
(at-spi2-atk): Deprecate by at-spi2-core.
(gtk+)[propagated-inputs]: Use at-spi2-core.
* gnu/packages/gnome.scm (orca)[inputs]: Likewise.
* gnu/packages/gnome.scm (gnome): Likewise.
This commit is contained in:
Maxim Cournoyer 2022-08-22 23:19:17 -04:00
parent 5f73aaa6c3
commit 28d27ddd3d
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 69 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/chromium.scm
View file

@ -878,7 +878,7 @@ (define-public ungoogled-chromium
(inputs (inputs
(list alsa-lib (list alsa-lib
atk atk
at-spi2-atk at-spi2-core
cups cups
curl curl
dbus dbus

4
gnu/packages/gnome.scm
View file

@ -9444,7 +9444,7 @@ (define-public gnome
;; XXX: Find out exactly which ones are needed and why. ;; XXX: Find out exactly which ones are needed and why.
("font-abattis-cantarell" ,font-abattis-cantarell) ("font-abattis-cantarell" ,font-abattis-cantarell)
("font-dejavu" ,font-dejavu) ("font-dejavu" ,font-dejavu)
("at-spi2-core" ,at-spi2-core-minimal) ("at-spi2-core" ,at-spi2-core)
("dbus" ,dbus) ("dbus" ,dbus)
("dconf" ,dconf) ("dconf" ,dconf)
("desktop-file-utils" ,desktop-file-utils) ("desktop-file-utils" ,desktop-file-utils)
@ -10391,7 +10391,7 @@ (define-public orca
pkg-config pkg-config
libxml2)) libxml2))
(inputs (inputs
(list at-spi2-atk (list at-spi2-core
gsettings-desktop-schemas gsettings-desktop-schemas
gstreamer gstreamer
gst-plugins-base gst-plugins-base

162
gnu/packages/gtk.scm
View file

@ -724,11 +724,11 @@ (define-public gdk-pixbuf-xlib
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
;;; A minimal variant used to prevent a cycle with Inkscape. ;;; A minimal variant used to prevent a cycle with Inkscape.
(define-public at-spi2-core-minimal (define-public at-spi2-core
(hidden-package (hidden-package
(package (package
(name "at-spi2-core") (name "at-spi2-core")
(version "2.40.0") (version "2.45.90")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -736,33 +736,44 @@ (define-public at-spi2-core-minimal
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0a9l6cfxynjn6jcp29d72i75xbkrzs1l5kmqcwmfal801b9sg5j1")))) "03dba3c6m3sfapkkbbgzvbi1qcmrrlppydxjjs1m8ds9qb9hl1g9"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas (list
#:phases #:glib-or-gtk? #t ;to wrap binaries and/or compile schemas
(modify-phases %standard-phases #:phases
(add-after 'install 'check #~(modify-phases %standard-phases
(lambda _ (delete 'check)
(setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME (add-after 'install 'check
;; Run test-suite under a dbus session. (lambda _
(setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service (setenv "HOME" (getenv "TMPDIR")) ;xfconfd requires a writable HOME
(string-append %output "/share")) ;; Run test-suite under a dbus session.
;; Don't fail on missing '/etc/machine-id'. (setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service
(setenv "DBUS_FATAL_WARNINGS" "0") ; (string-append #$output "/share:" (getenv "XDG_DATA_DIRS")))
(invoke "dbus-launch" "ninja" "test"))) ;; Don't fail on missing '/etc/machine-id'.
(delete 'check)))) (setenv "DBUS_FATAL_WARNINGS" "0")
(with-directory-excursion (string-append "../at-spi2-core-"
#$version "")
(invoke "dbus-run-session" "--" "ci/run-registryd-tests.sh")
(substitute* "ci/run-tests.sh"
(("ps auxwww") "") ;avoid a dependency on procps
(("meson test -C _build")
"meson test -C ../build")) ;adjust build directory
(invoke "dbus-run-session" "--" "ci/run-tests.sh")))))))
(inputs (inputs
(list bash-minimal)) (list bash-minimal libxml2))
(propagated-inputs (propagated-inputs
;; atspi-2.pc refers to all these. ;; atspi-2.pc refers to all these.
(list dbus glib libx11 libxi libxtst)) (list dbus glib libx11 libxi libxtst))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal
("glib" ,glib "bin") `(,glib "bin")
("gobject-introspection" ,gobject-introspection) gobject-introspection
("pkg-config" ,pkg-config) gsettings-desktop-schemas
("python" ,python-wrapper))) pkg-config
python-dbusmock
python-pytest
python-wrapper))
(synopsis "Assistive Technology Service Provider Interface, core components") (synopsis "Assistive Technology Service Provider Interface, core components")
(description (description
"The Assistive Technology Service Provider Interface, core components, "The Assistive Technology Service Provider Interface, core components,
@ -770,86 +781,45 @@ (define-public at-spi2-core-minimal
(license license:lgpl2.1+) (license license:lgpl2.1+)
(home-page "https://wiki.gnome.org/Accessibility/")))) (home-page "https://wiki.gnome.org/Accessibility/"))))
(define-public at-spi2-core (define-public at-spi2-core-with-documentation
(package/inherit at-spi2-core-minimal (package/inherit at-spi2-core
(outputs (cons "doc" (package-outputs at-spi2-core-minimal))) (outputs (cons "doc" (package-outputs at-spi2-core)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments at-spi2-core-minimal) (substitute-keyword-arguments (package-arguments at-spi2-core)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
`(cons ,(if (%current-target-system) #~(cons #$(if (%current-target-system)
"-Ddocs=false" "-Ddocs=false"
"-Ddocs=true") "-Ddocs=true")
,flags)) #$flags))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'set-documentation-path (add-after 'unpack 'set-documentation-path
(lambda* (#:key outputs #:allow-other-keys) (lambda _
;; Ensure that the cross-references point to the "doc" output. ;; Ensure that the cross-references point to the "doc" output.
(substitute* "doc/libatspi/meson.build" (substitute* "doc/libatspi/meson.build"
(("docpath =.*") (("docpath =.*")
(string-append "docpath = '" (assoc-ref outputs "doc") (string-append "docpath = '" #$output:doc
"/share/gtk-doc/html'\n"))))) "/share/gtk-doc/html'\n")))))
(add-before 'install 'prepare-doc-directory (add-before 'install 'prepare-doc-directory
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(mkdir-p (string-append (assoc-ref outputs "doc") "/share")))) (mkdir-p (string-append #$output:doc "/share"))))
,@(if (%current-target-system) #$@(if (%current-target-system)
'() #~()
'((add-after 'install 'move-documentation #~((add-after 'install 'move-documentation
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out")) (copy-recursively
(doc (assoc-ref outputs "doc"))) (string-append #$output "/share/gtk-doc")
(copy-recursively (string-append #$output:doc "/share/gtk-doc"))
(string-append out "/share/gtk-doc") (delete-file-recursively
(string-append doc "/share/gtk-doc")) (string-append #$output "/share/gtk-doc"))))))))))
(delete-file-recursively
(string-append out "/share/gtk-doc")))))))))))
(native-inputs (native-inputs
(append `(("docbook-xml" ,docbook-xml-4.3) (modify-inputs (package-native-inputs at-spi2-core)
("gtk-doc" ,gtk-doc/stable) (append docbook-xml-4.3 gtk-doc/stable)))
("libxml2" ,libxml2)) ;for XML_CATALOG_FILES
(package-native-inputs at-spi2-core-minimal)))
(properties (alist-delete 'hidden? (properties (alist-delete 'hidden?
(package-properties at-spi2-core-minimal))))) (package-properties at-spi2-core)))))
(define-public at-spi2-atk (define-public at-spi2-atk
(package (deprecated-package "at-spi2-atk" at-spi2-core))
(name "at-spi2-atk")
(version "2.38.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0ks6r9sx27l80n3a7yjmkilxv48cqj183wc7cap3caw2myjhi86g"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
;; Compiling tests requires "libxml2" to be in 'inputs'.
,@(if (%current-target-system)
`(#:configure-flags '("-Dtests=false"))
'())
#:phases
(modify-phases %standard-phases
(replace 'check
;; Run test-suite under a dbus session.
(lambda _
(setenv "DBUS_FATAL_WARNINGS" "0")
(invoke "dbus-launch" "meson" "test"))))))
(propagated-inputs
(list at-spi2-core-minimal)) ; required by atk-bridge-2.0.pc
(inputs
(list atk glib))
(native-inputs
(list dbus ; For tests
gobject-introspection libxml2 pkg-config))
(synopsis "Assistive Technology Service Provider Interface, ATK bindings")
(description
"The Assistive Technology Service Provider Interface
is part of the GNOME accessibility project.")
(license license:lgpl2.1+)
(home-page "https://wiki.gnome.org/Accessibility/")))
(define-public gtk+-2 (define-public gtk+-2
(package (package
@ -971,7 +941,7 @@ (define-public gtk+
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
(propagated-inputs (propagated-inputs
(list atk (list atk
at-spi2-atk at-spi2-core
cairo cairo
fribidi fribidi
fontconfig fontconfig