diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-27 10:06:51 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-27 10:06:51 +0000 |
| commit | 1b5f36062887f3af038ef894e7684b2c7c820d3a (patch) | |
| tree | 3efefe8d994891cf85490084806b8f8448ab2c55 /user/py3-pycairo/meson-idiocy.patch | |
| parent | 72532a92425e0a589051e8b4d15d37100854b3c7 (diff) | |
| parent | 2b9ac7f02392d3f255042f9f76cec3259b63a71d (diff) | |
| download | packages-1b5f36062887f3af038ef894e7684b2c7c820d3a.tar.gz packages-1b5f36062887f3af038ef894e7684b2c7c820d3a.tar.bz2 packages-1b5f36062887f3af038ef894e7684b2c7c820d3a.tar.xz packages-1b5f36062887f3af038ef894e7684b2c7c820d3a.zip | |
Merge branch 'bump.aerdan.20190426' into 'master'
Bump.aerdan.20190426
See merge request !224
Diffstat (limited to 'user/py3-pycairo/meson-idiocy.patch')
| -rw-r--r-- | user/py3-pycairo/meson-idiocy.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/user/py3-pycairo/meson-idiocy.patch b/user/py3-pycairo/meson-idiocy.patch deleted file mode 100644 index 99ed7d71c..000000000 --- a/user/py3-pycairo/meson-idiocy.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 878932bf9c1545d659822961459a2601287b1675 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter <reiter.christoph@gmail.com> -Date: Sat, 23 Mar 2019 22:26:01 +0100 -Subject: [PATCH] meson: fix configure error with meson 0.50 re absolute paths. - Fixes #144 - -The newest meson version has started to fail: -meson.build:62:0: ERROR: Subdir keyword must not be an absolute path. - -Fix by using install_dir instead of subdir. ---- - cairo/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cairo/meson.build b/cairo/meson.build -index 6a1bde3..3e3b2cc 100644 ---- a/cairo/meson.build -+++ b/cairo/meson.build -@@ -61,7 +61,7 @@ header_file = configure_file( - - install_headers( - [header_file], -- subdir: join_paths(python.get_install_dir(), 'cairo', 'include'), -+ install_dir: join_paths(python.get_install_dir(), 'cairo', 'include'), - ) - install_headers([header_file], subdir: 'pycairo') - |