diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-04-06 23:52:42 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-04-06 23:52:42 +0000 |
| commit | a04f1bdf2bc5420b245130a24b07a5efe4aa2d04 (patch) | |
| tree | d81c7a9ee7cd0da3130ec82a53b4ab3214481231 /user | |
| parent | 7b77e0c080a78c2525e286e41b3721393f79fa8f (diff) | |
| download | packages-a04f1bdf2bc5420b245130a24b07a5efe4aa2d04.tar.gz packages-a04f1bdf2bc5420b245130a24b07a5efe4aa2d04.tar.bz2 packages-a04f1bdf2bc5420b245130a24b07a5efe4aa2d04.tar.xz packages-a04f1bdf2bc5420b245130a24b07a5efe4aa2d04.zip | |
user/py3-pycairo: fix stupid build error with newer Meson
Diffstat (limited to 'user')
| -rw-r--r-- | user/py3-pycairo/APKBUILD | 8 | ||||
| -rw-r--r-- | user/py3-pycairo/meson-idiocy.patch | 27 |
2 files changed, 33 insertions, 2 deletions
diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD index 87de6f166..9dce8a2ed 100644 --- a/user/py3-pycairo/APKBUILD +++ b/user/py3-pycairo/APKBUILD @@ -7,9 +7,12 @@ pkgdesc="Python bindings for Cairo" url="https://pycairo.readthedocs.io/" arch="all" license="MIT AND (LGPL-2.1-only OR MPL-1.1)" +depends="" makedepends="python3-dev cairo-dev meson" subpackages="$pkgname-dev" -source="https://files.pythonhosted.org/packages/source/p/pycairo/pycairo-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/p/pycairo/pycairo-$pkgver.tar.gz + meson-idiocy.patch + " builddir="$srcdir/pycairo-$pkgver" build() { @@ -33,4 +36,5 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="29af1eff8fc3ca942c6d7fcda8e5e004f01d1bfdab911f4ebb34213520922cf35c12d07bd18fe74a2c6d3c7f5a1aefd7fb5fe9b7cd310e6707b7451d5d5e18b0 pycairo-1.18.0.tar.gz" +sha512sums="29af1eff8fc3ca942c6d7fcda8e5e004f01d1bfdab911f4ebb34213520922cf35c12d07bd18fe74a2c6d3c7f5a1aefd7fb5fe9b7cd310e6707b7451d5d5e18b0 pycairo-1.18.0.tar.gz +33d400b1c27c549f0962d08e50ca4a6614e714896f5cca76128f8b4d3aac4c07b50bab03ee611de2e17d4c0001bbe3f4f02137e8988b040e9deea911607ad917 meson-idiocy.patch" diff --git a/user/py3-pycairo/meson-idiocy.patch b/user/py3-pycairo/meson-idiocy.patch new file mode 100644 index 000000000..99ed7d71c --- /dev/null +++ b/user/py3-pycairo/meson-idiocy.patch @@ -0,0 +1,27 @@ +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') + |