diff options
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 160 |
1 files changed, 98 insertions, 62 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a02945f11..e2af4d567b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015-2020, 2023, 2024 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org> -;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015-2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Rene Saavedra <pacoon@protonmail.com> ;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net> ;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net> @@ -321,7 +321,9 @@ "brasero-" version ".tar.xz")) (sha256 (base32 - "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47")))) + "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47")) + (patches + (search-patches "brasero-fix-gcc-14-build-failure.patch")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags (list @@ -5049,6 +5051,23 @@ indicators etc).") (base32 "17zhkf2pjwrghdgk5nhfvzqakb2xwk2jj19316xjr0s9n3djv3z4")))) (build-system meson-build-system) + (arguments + (list + ;; Exclude flaky tests (see https://codeberg.org/guix/guix/issues/1377). + ;; Meson cannot exclude individual tests so the test suite is added in the + ;; phase below. + #:test-options #~(list "--no-suite" "connection") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'mark-tests-for-exclusion + (lambda _ + ;; The test names are programmatically generated in the meson + ;; build file. The two failing tests are "connection-gnutls" and + ;; "connection-gnutls-tls1.2" and share program[0] == "common", + ;; so use that as the suite name. + (substitute* "tls/tests/meson.build" + (("test\\(([^)]*)\\)" _ args) + (string-append "test(" args ", suite: program[0])")))))))) (native-inputs (list `(,glib "bin") ; for gio-querymodules pkg-config gettext-minimal)) @@ -5097,7 +5116,7 @@ from the GSettings schemas in gsettings-desktop-schemas.") (native-inputs (list gettext-minimal pkg-config - cmake + cmake-minimal `(,glib "bin") desktop-file-utils itstool @@ -8408,6 +8427,7 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (build-system cmake-build-system) (arguments (list + #:parallel-tests? #f #:configure-flags #~(let* ((lib (string-append #$output "/lib")) (runpaths (map (lambda (s) @@ -8912,64 +8932,78 @@ Cisco's AnyConnect SSL VPN.") (user-accounts . ("nm-openconnect")))))) (define-public network-manager-fortisslvpn - (package - (name "network-manager-fortisslvpn") - (version "1.4.0") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://gnome/sources/NetworkManager-fortisslvpn/" - (version-major+minor version) - "/NetworkManager-fortisslvpn-" version ".tar.xz")) - (sha256 - (base32 - "1ynsqmv8xz1cffnai4hfh0ab0dmlazpv72krhlsv45mm95iy4mdh")) - (modules '((guix build utils))) - (snippet '(substitute* "Makefile.in" - ;; do not try to make state directory - (("\\$\\(DESTDIR\\)\\$\\(fortisslvpn_statedir\\)") - "") - ;; use state directory of the NetworkManager service - (("\\$\\(fortisslvpn_statedir\\)") - "/var/lib/NetworkManager"))))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var" - "--with-gtk4=yes") - #:phases (modify-phases %standard-phases - (add-after 'configure 'patch-path - (lambda* (#:key inputs #:allow-other-keys) - (let* ((ovpn (search-input-file inputs - "/bin/openfortivpn")) - (pretty-ovpn (string-append "\"" ovpn "\""))) - (for-each (lambda (file) - (substitute* file - (("\"/usr/local/bin/openfortivpn\"") - pretty-ovpn) - (("\"/usr/bin/openfortivpn\"") - pretty-ovpn))) - '("src/nm-fortisslvpn-service.c" - "properties/nm-fortisslvpn-editor.c")))))))) - (native-inputs (list intltool - `(,glib "bin") pkg-config)) - (inputs (list gtk+ - gtk - kmod - libnma - libsecret - network-manager - openfortivpn - - ;; ppp < 2.5.0 is currently required: - ;; https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/084ef529c5fb816927ca54866f66b340265aa9f6 - ppp-2.4.9)) - (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") - (synopsis "Fortinet SSLVPN plug-in for NetworkManager") - (description - "This extension of NetworkManager allows it to take care of connections + ;; Use the latest commit from the master branch to gain ppp >= 2.5.0 + ;; support. + (let ((commit "0296450f9bb8b3f34e0032103a9c5ba359553320") + (revision "0")) + (package + (name "network-manager-fortisslvpn") + (version (git-version "1.4.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qgzm60y7kjvsda12m0sckd2v3x4nxf4g9k829sy2sqrmhhai7ws")) + (modules '((guix build utils))) + (snippet '(substitute* "Makefile.am" + ;; Use state directory of the NetworkManager service. + (("^(fortisslvpn_statedir = ).*" _ head) + (string-append head "/var/lib/NetworkManager")) + ;; Do not try to make state directory. + (("\\$\\(mkinstalldirs).*fortisslvpn_statedir)") + "true"))))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list "--enable-absolute-paths" + "--localstatedir=/var" + "--with-gtk4=yes") + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((ovpn (search-input-file inputs "/bin/openfortivpn")) + (pretty-ovpn (string-append "\"" ovpn "\""))) + (for-each (lambda (file) + (substitute* file + (("\"/usr/local/bin/openfortivpn\"") + pretty-ovpn) + (("\"/usr/bin/openfortivpn\"") + pretty-ovpn))) + '("src/nm-fortisslvpn-service.c" + "properties/nm-fortisslvpn-editor.c")))))))) + (native-inputs + (list autoconf + automake + intltool + `(,glib "bin") + `(,gtk "bin") + libtool + libxml2 + pkg-config)) + (inputs + (list gtk+ + gtk + kmod + libnma + libsecret + network-manager + openfortivpn + ppp)) + (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") + (synopsis "Fortinet SSLVPN plug-in for NetworkManager") + (description + "This extension of NetworkManager allows it to take care of connections to virtual private networks (VPNs) via Fortinet SSLVPN.") - (license license:gpl2+) - (properties `((upstream-name . "NetworkManager-fortisslvpn"))))) + (license license:gpl2+) + (properties `((upstream-name . "NetworkManager-fortisslvpn")))))) (define-public mobile-broadband-provider-info (package @@ -9835,7 +9869,8 @@ easy, safe, and automatic.") (arguments (list #:glib-or-gtk? #t - #:test-options `(list ,@(if (target-riscv64?) + #:test-options `(list ,@(if (or (target-riscv64?) + (target-aarch64?)) `("--timeout-multiplier" "10") '("--timeout-multiplier" "2"))) #:configure-flags @@ -12340,6 +12375,7 @@ generic enough to work for everyone.") (build-system cmake-build-system) (arguments (list + #:tests? #f #:imported-modules `(,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build cmake-build-system) @@ -14275,7 +14311,7 @@ historical battery usage and related statistics.") ;; This is done so we can override. (("`set.PREFIX_BIN") "set(QPREFIX_BIN"))))))) (native-inputs - (list cmake pkg-config intltool gettext-minimal)) + (list cmake-minimal pkg-config intltool gettext-minimal)) (inputs (list glib gtk+ libx11 libsm libxv libxaw libxcb libxkbfile shared-mime-info)) |