diff options
| author | Raghav Gururajan <rg@raghavgururajan.name> | 2021-03-25 01:56:45 -0400 |
|---|---|---|
| committer | Raghav Gururajan <rg@raghavgururajan.name> | 2021-03-25 20:51:43 -0400 |
| commit | 4a69d20a537d2f76482eedd1abc0781ff1fc9de0 (patch) | |
| tree | 3a5a95ba0c5739bc48f4c0a1432da0d197bbd8be /gnu/packages/glib.scm | |
| parent | de69390d5e2bf385b122e23a2b86ecaa45379ae6 (diff) | |
| download | guix-4a69d20a537d2f76482eedd1abc0781ff1fc9de0.tar guix-4a69d20a537d2f76482eedd1abc0781ff1fc9de0.tar.gz | |
gnu: glibmm: Update to 2.68.0.
* gnu/packages/glib.scm (glibmm)[version]: Update to 2.68.0.
[arguments]<#:phases>['pre-build]: Remove phase.
['disable-failing-tests]: New phase.
[native-inputs]: Add m4, mm-common, perl and libxslt.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1f6098becf..ac46b5ce45 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -634,36 +634,36 @@ by GDBus included in Glib.") (define glibmm (package (name "glibmm") - (version "2.62.0") + (version "2.68.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/glibmm/" - (version-major+minor version) - "/glibmm-" version ".tar.xz")) - (sha256 - (base32 - "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n")))) - (build-system gnu-build-system) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/glibmm/" + (version-major+minor version) + "/glibmm-" version ".tar.xz")) + (sha256 + (base32 + "0xgkyhb2876mcyyib5rk3ya9aingyj68h02nl22yvkhx35rqbwy1")))) + (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'build 'pre-build + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; This test uses /etc/fstab as an example file to read - ;; from; choose a better example. - (substitute* "tests/giomm_simple/main.cc" - (("/etc/fstab") - (string-append (getcwd) - "/tests/giomm_simple/main.cc"))) - - ;; This test does a DNS lookup, and then expects to be able - ;; to open a TLS session; just skip it. - (substitute* "tests/giomm_tls_client/main.cc" - (("Gio::init.*$") - "return 77 ;\n")) - #t))))) - (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin"))) + (substitute* "tests/meson.build" + ;; This test uses /etc/fstab as an example file to read + ;; from; disable it. + (("[ \t]*.*giomm_simple.*$") "") + ;; This test does a DNS lookup, and then expects to be able + ;; to open a TLS session; just skip it. + (("[ \t]*.*giomm_tls_client.*$") "")) + #t))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("libsigc++" ,libsigc++) ("glib" ,glib))) |