diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-15 16:03:59 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-15 16:03:59 +0100 |
| commit | 81382e3f6d4eb0261bf513a16be58d8d0b7373f2 (patch) | |
| tree | 6e6412c8ecb8d29c31e874787f42ca09c3a7c2cf /gnu/packages/patches | |
| parent | 1e33331cce9914e6ef4a3629bfaf0116feb7b9bf (diff) | |
| download | guix-81382e3f6d4eb0261bf513a16be58d8d0b7373f2.tar guix-81382e3f6d4eb0261bf513a16be58d8d0b7373f2.tar.gz | |
gnu: meson: Update to 0.50.0.
* gnu/packages/build-tools.scm (meson): Update to 0.50.0.
* gnu/packages/patches/at-spi2-core-meson-compat.patch,
gnu/packages/patches/totem-meson-compat.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/gnome.scm (totem)[source](patches): Add totem-meson.compat.patch.
* gnu/packages/gtk.scm (at-spi2-core)[source](patches): New field.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/at-spi2-core-meson-compat.patch | 18 | ||||
| -rw-r--r-- | gnu/packages/patches/totem-meson-compat.patch | 14 |
2 files changed, 32 insertions, 0 deletions
diff --git a/gnu/packages/patches/at-spi2-core-meson-compat.patch b/gnu/packages/patches/at-spi2-core-meson-compat.patch new file mode 100644 index 0000000000..168a31b4ed --- /dev/null +++ b/gnu/packages/patches/at-spi2-core-meson-compat.patch @@ -0,0 +1,18 @@ +Fix build with Meson 0.50.0 and above. + +Taken from upstream repository: +https://gitlab.gnome.org/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a + +diff --git a/atspi/meson.build b/atspi/meson.build +index b7a9357df1c4857dffa2ec123cd3073e67a07fea..2a6915d76202dabf923b50e6a8b85cbb83cb43d0 100644 +--- a/atspi/meson.build ++++ b/atspi/meson.build +@@ -57,7 +57,7 @@ atspi_headers = [ + + atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') + +-install_headers(atspi_headers, subdir: atspi_includedir) ++install_headers(atspi_headers, install_dir: atspi_includedir) + + atspi_enums = gnome.mkenums('atspi-enum-types', + sources: [ 'atspi-constants.h', 'atspi-types.h' ], diff --git a/gnu/packages/patches/totem-meson-compat.patch b/gnu/packages/patches/totem-meson-compat.patch new file mode 100644 index 0000000000..8557908dd0 --- /dev/null +++ b/gnu/packages/patches/totem-meson-compat.patch @@ -0,0 +1,14 @@ +Fix an error that occurs with Meson 0.50.0 and later: +"ERROR: Subdir keyword must not be an absolute path". + +--- a/src/meson.build 2019-03-15 00:10:26.882293850 +0100 ++++ b/src/meson.build 2019-03-15 00:10:54.312197229 +0100 +@@ -82,7 +82,7 @@ + + install_headers( + headers, +- subdir: join_paths(totem_includedir, totem_api_path) ++ install_dir: join_paths(totem_includedir, totem_api_path) + ) + + libtotem_player_sources = files( |