diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-14 23:38:29 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-15 00:02:46 +0100 |
| commit | 2f437b22e2f78acd783db7f6b5f736a38ecf3e8e (patch) | |
| tree | 936e9cdf6f553f0e723a945f6bceb450ccdaa2d0 /gnu | |
| parent | f74181d40fe10605eb1a08801139d42536db5252 (diff) | |
| download | gnu-guix-2f437b22e2f78acd783db7f6b5f736a38ecf3e8e.tar gnu-guix-2f437b22e2f78acd783db7f6b5f736a38ecf3e8e.tar.gz | |
gnu: glib: Update to 2.56.0.
* gnu/packages/glib.scm (glib): Update to 2.56.0.
[source](patches): Remove obsolete patch.
[arguments]: Disable new MIME test.
* gnu/packages/patches/glib-respect-datadir.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/glib.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/patches/glib-respect-datadir.patch | 21 |
3 files changed, 4 insertions, 26 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d7eda9f811..fe20dddbbe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -705,7 +705,6 @@ dist_patch_DATA = \ %D%/packages/patches/gimp-CVE-2017-17787.patch \ %D%/packages/patches/gimp-CVE-2017-17789.patch \ %D%/packages/patches/glib-networking-ssl-cert-file.patch \ - %D%/packages/patches/glib-respect-datadir.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 34968f9d91..15885324c7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -148,7 +148,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.54.3") + (version "2.56.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -156,9 +156,8 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1a60p9m493mvm42rskg8ifr0jmsbr8arzyqx73jshgfwhmkdqgwn")) - (patches (search-patches "glib-respect-datadir.patch" - "glib-tests-timer.patch")))) + "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc")) + (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything "bin" ; glib-mkenums, gtester, etc.; depends on Python @@ -235,6 +234,7 @@ shared NFS home directories.") ("gio/tests/contenttype.c" (;; XXX: requires shared-mime-info. "/contenttype/guess" + "/contenttype/guess_svg_from_data" "/contenttype/subtype" "/contenttype/list" "/contenttype/icon" diff --git a/gnu/packages/patches/glib-respect-datadir.patch b/gnu/packages/patches/glib-respect-datadir.patch deleted file mode 100644 index 309ce9fc0b..0000000000 --- a/gnu/packages/patches/glib-respect-datadir.patch +++ /dev/null @@ -1,21 +0,0 @@ -On Guix, Python modules are in a different output from the executables, -so searching "../share/glib-2.0" will not work. - -This patch restores behaviour prior to this commit: -<https://git.gnome.org/browse/glib/commit/?id=fe2a9887a8ccb14f2386e01b14834e97a33bc2d7> - ---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in -+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in -@@ -25,9 +25,12 @@ - - srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None) - filedir = os.path.dirname(__file__) -+datadir = os.path.join('@datadir@', 'glib-2.0') - - if srcdir is not None: - path = os.path.join(srcdir, 'gio', 'gdbus-2.0') -+elif os.path.exists(os.path.join(datadir, 'codegen')): -+ path = datadir - elif os.path.basename(filedir) == 'bin': - # Make the prefix containing gdbus-codegen 'relocatable' at runtime by - # adding /some/prefix/bin/../share/glib-2.0 to the python path |