Bumping sway an wlroots

2020-07-16 18:53:24 +02:00
parent e17391b07f
commit c9ba114764
80 changed files with 2108 additions and 0 deletions
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@ -0,0 +1,8 @@
+AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216eadae9d190efd4743a138afae73d42f082499793b4688e2419cb3ef38fe7c5e7f29b472e8a27e9ce8701c28f83f390f55dddd SHA512 50b7b4c269d186e3c2274297f04dae46484af4f2f090bef3fc42dfbecab94d8a91b31c27369cf40a52c7ce71cf96d9bc22601739b6e886c6c710f0665c2ef311
+AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23
+DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
+DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
+DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
+EBUILD meson-0.50.1.ebuild 2291 BLAKE2B 4fa7e202464800dd5466f120d10fcc4ed55a591a60a7727e00df3dddedafc2e4e17cbfc813d9fb5732ab06bad07985553a56eca3cdfc1ff8867fad9836761ef2 SHA512 f1a48643c78c2326620419391e1a234810e8414929bbb6d478a361d20ae6680b7cd42fa48bd694619c06d6fe7e00072dcb479446b8880667b8884cf735d44567
+EBUILD meson-0.53.1.ebuild 1682 BLAKE2B 5cc1651bf2c30681948eafd4e6f4620d575ba136af9450838e2859a46d5a238b1ff063a5c591b611636b412be2ed582541b27eab377b5c85b167eb99142d4749 SHA512 2858564cb4b9457242ac4413b8e96fd40f7dcc621e050aed4c4fdc753191349a674d36324ab850b31f9a4b35499ae94e642336eb12905883e2ae4087a2cac08e
+EBUILD meson-0.54.0.ebuild 1682 BLAKE2B 5cc1651bf2c30681948eafd4e6f4620d575ba136af9450838e2859a46d5a238b1ff063a5c591b611636b412be2ed582541b27eab377b5c85b167eb99142d4749 SHA512 2858564cb4b9457242ac4413b8e96fd40f7dcc621e050aed4c4fdc753191349a674d36324ab850b31f9a4b35499ae94e642336eb12905883e2ae4087a2cac08e
--- a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
+++ b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
@ -0,0 +1,27 @@
+From 75f2d7a004387edc7a7e73da5097bf01daf38769 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Sat, 15 Feb 2020 12:24:42 -0600
+Subject: [PATCH 1/2] remove asan ld_preload
+
+ASAN and sandbox both want control over LD_PRELOAD
+https://bugs.gentoo.org/673016
+---
+ run_unittests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index 676604f4..1c9aaf0c 100755
+--- a/run_unittests.py
+++ b/run_unittests.py
+@@ -4985,7 +4985,7 @@ class LinuxlikeTests(BasePlatformTests):
+                              r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n')
+ 
+     @skip_if_not_base_option('b_sanitize')
+-    def test_generate_gir_with_address_sanitizer(self):
+    def _test_generate_gir_with_address_sanitizer(self):
+         if is_cygwin():
+             raise unittest.SkipTest('asan not available on Cygwin')
+         if is_openbsd():
+-- 
+2.24.1
+
--- a/dev-util/meson/files/0.53.1-remove-asan.patch
+++ b/dev-util/meson/files/0.53.1-remove-asan.patch
@ -0,0 +1,27 @@
+From 9ddb289ca9611281a45734d92fdfd2d5fb83f050 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Sat, 15 Feb 2020 12:28:35 -0600
+Subject: [PATCH 2/2] remove asan
+
+ASAN is unsupported on some targets
+https://bugs.gentoo.org/692822
+---
+ run_unittests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index 1c9aaf0c..171ee0f0 100755
+--- a/run_unittests.py
+++ b/run_unittests.py
+@@ -5475,7 +5475,7 @@ class LinuxlikeTests(BasePlatformTests):
+         self.assertEqual(install_rpath, 'baz')
+ 
+     @skip_if_not_base_option('b_sanitize')
+-    def test_pch_with_address_sanitizer(self):
+    def _test_pch_with_address_sanitizer(self):
+         if is_cygwin():
+             raise unittest.SkipTest('asan not available on Cygwin')
+         if is_openbsd():
+-- 
+2.24.1
+
--- a/dev-util/meson/meson-0.50.1.ebuild
+++ b/dev-util/meson/meson-0.50.1.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors et al.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="*"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="vim-syntax bash-completion zsh-completion test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-util/ninja-1.5
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-vcs/git
+		virtual/pkgconfig
+	)
+"
+python_prepare_all() {
+	# ASAN and sandbox both want control over LD_PRELOAD
+	# https://bugs.gentoo.org/673016
+
+	# test_testsetups doesn't throw CalledProcessError with --setup=valgrind
+
+	# lcov up to 1.14 fails on gcc 9.1
+	# https://github.com/linux-test-project/lcov/issues/58
+	sed -e 's/test_generate_gir_with_address_sanitizer(/_&/' \
+		-e 's/test_testsetups(/_&/' \
+		-e 's/test_coverage(/_&/' \
+		-i run_unittests.py || die
+
+	# Remove test cases that break due to over-eager detection
+	rm -r "${S}/test cases/java"
+	rm -r "${S}/test cases/frameworks/17 mpi"
+	rm -r "${S}/test cases/frameworks/22 gir link order"
+	rm -r "${S}/test cases/frameworks/26 netcdf"
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+#	tc-export PKG_CONFIG
+#	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+#		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+#	else
+		distutils-r1_src_test
+#	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles
+		doins -r data/syntax-highlighting/vim/{ftdetect,ftplugin,indent,syntax}
+	fi
+
+	if use bash-completion ; then
+		insinto /usr/share/bash-completion/completions
+		doins data/shell-completions/bash/meson
+	fi
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins data/shell-completions/zsh/_meson
+	fi
+}
--- a/dev-util/meson/meson-0.53.1.ebuild
+++ b/dev-util/meson/meson-0.53.1.ebuild
@ -0,0 +1,78 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3+ )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="*"
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	# ASAN and sandbox both want control over LD_PRELOAD
+	# https://bugs.gentoo.org/673016
+	"${FILESDIR}"/0.53.1-remove-asan-ld_preload.patch
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	"${FILESDIR}"/0.53.1-remove-asan.patch
+	)
+
+python_prepare_all() {
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
--- a/dev-util/meson/meson-0.54.0.ebuild
+++ b/dev-util/meson/meson-0.54.0.ebuild
@ -0,0 +1,78 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3+ )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="*"
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	# ASAN and sandbox both want control over LD_PRELOAD
+	# https://bugs.gentoo.org/673016
+	"${FILESDIR}"/0.53.1-remove-asan-ld_preload.patch
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	"${FILESDIR}"/0.53.1-remove-asan.patch
+	)
+
+python_prepare_all() {
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}