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/packages/patches | |
| parent | f74181d40fe10605eb1a08801139d42536db5252 (diff) | |
| download | guix-2f437b22e2f78acd783db7f6b5f736a38ecf3e8e.tar 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/packages/patches')
| -rw-r--r-- | gnu/packages/patches/glib-respect-datadir.patch | 21 |
1 files changed, 0 insertions, 21 deletions
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 |