From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
Date: Wed, 14 Feb 2024 00:27:25 +0000 (UTC) [thread overview]
Message-ID: <1707870341.56a5c9c531c45adfc1dfd0077832f55975bfc873.sam@gentoo> (raw)
commit: 56a5c9c531c45adfc1dfd0077832f55975bfc873
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 13 21:00:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 00:25:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a5c9c5
dev-build/meson: add 1.3.2
Drop patches which were backported to gentoo in 1.3.1-r1 and upstream in
1.3.2.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35310
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/meson/Manifest | 2 +
dev-build/meson/meson-1.3.2.ebuild | 130 +++++++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index 67d0986b387c..38c3e6a66ee7 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -10,3 +10,5 @@ DIST meson-1.3.0.tar.gz 2222383 BLAKE2B cb9ac8e00fe924df67166938687584a9de35e784
DIST meson-1.3.0.tar.gz.asc 833 BLAKE2B d83b819e75e732d694ac98412717af39a8115defc7371f1983e4619cf990b5cdfd7ab7c93911f2a8b6c7055c7252ebeba04d15f508f4278b506e326fa1801a25 SHA512 8c72bfe5f3bdec9c9f787dd5a7186599bb44079a89d0a87a535a6e890adb7718cbf570b2ac74583b72b92aa05160823a8571ca530384787c428e49d6fbe095ba
DIST meson-1.3.1.tar.gz 2222386 BLAKE2B 64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a SHA512 6e694beb70329535faca9405358c04e2fd5a490b0c0d2678d5831b7de3477e0fcf4f6a242f1bc6218da04ac4f6e096ee53cdf273c6b6a38a35d370e8c16694ba
DIST meson-1.3.1.tar.gz.asc 833 BLAKE2B 1db7aabe3b7d491dfcd288a780d10784517a73e07348f2d5b98d1fa347dd08b2afa210511c7f5ff867b10ecd3ce470ea764b5ce6907aa7dcaa4d619f705e339c SHA512 0f652d375fa7700f3048266330d783664593c08da47d4f0d87af0be5d8b5e21113521651fb923c6a1cfe88aef7067ebd85b27946f19e71133d7c9805839fc873
+DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb536c5b8e75b7267ae21292fe2a6a3ec16d64aa81cde63d33022decebcc051cf2d87d677f9b40eb2f4106a40cd SHA512 6369c6d64f91c769f0f4d3e2445bb3615785998489d41acba2134b44ec89abd04bd97a3d3d17c64779eb40b0bf4808e3419eb47638169446a98824d680f37a7b
+DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3
diff --git a/dev-build/meson/meson-1.3.2.ebuild b/dev-build/meson/meson-1.3.2.ebuild
new file mode 100644
index 000000000000..c41bb4b8cbf7
--- /dev/null
+++ b/dev-build/meson/meson-1.3.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+ inherit git-r3
+else
+ inherit verify-sig
+
+ MY_PV=${PV/_/}
+ MY_P=${P/_/}
+ S=${WORKDIR}/${MY_P}
+
+ SRC_URI="
+ https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+ verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc )
+ "
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ app-alternatives/ninja
+ dev-vcs/git
+ sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
+ )
+"
+RDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.1-python-path.patch
+
+ # backport fix for hiding compiler warnings (such as Modern C) in vala and cython
+ "${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch
+)
+
+python_prepare_all() {
+ local disable_unittests=(
+ # ASAN and sandbox both want control over LD_PRELOAD
+ # https://bugs.gentoo.org/673016
+ -e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+ # ASAN is unsupported on some targets
+ # https://bugs.gentoo.org/692822
+ -e 's/test_pch_with_address_sanitizer/_&/'
+ )
+
+ sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+ # 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
+ distutils-r1_src_test
+ fi
+}
+
+python_test() {
+ (
+ # remove unwanted python_wrapper_setup contents
+ # We actually do want to non-error if python2 is installed and tested.
+ remove="${T}/${EPYTHON}/bin:"
+ PATH=${PATH/${remove}/}
+
+ # test_meson_installed
+ unset PYTHONDONTWRITEBYTECODE
+
+ # https://bugs.gentoo.org/687792
+ unset PKG_CONFIG
+
+ # test_cross_file_system_paths
+ unset XDG_DATA_HOME
+
+ # 'test cases/unit/73 summary' expects 80 columns
+ export COLUMNS=80
+
+ # If JAVA_HOME is not set, meson looks for javac in PATH.
+ # If javac is in /usr/bin, meson assumes /usr/include is a valid
+ # JDK include path. Setting JAVA_HOME works around this broken
+ # autodetection. If no JDK is installed, we should end up with an empty
+ # value in JAVA_HOME, and the tests should get skipped.
+ export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+ ${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
+
+ dobashcomp data/shell-completions/bash/meson
+}
next reply other threads:[~2024-02-14 0:27 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-14 0:27 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-09 20:15 [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/ Sam James
2025-03-09 20:15 Sam James
2025-03-09 20:15 Sam James
2025-03-09 20:15 Sam James
2025-03-09 20:15 Sam James
2025-03-01 7:11 Michał Górny
2025-03-01 6:01 Sam James
2025-03-01 4:41 Sam James
2025-01-27 7:45 Eli Schwartz
2025-01-27 6:07 Eli Schwartz
2025-01-27 4:47 Eli Schwartz
2025-01-20 2:33 Sam James
2025-01-20 2:33 Sam James
2025-01-20 2:33 Sam James
2025-01-19 18:39 Arthur Zamarin
2025-01-19 18:39 Arthur Zamarin
2025-01-19 18:39 Arthur Zamarin
2025-01-10 13:28 Sam James
2024-12-17 0:13 Eli Schwartz
2024-12-06 21:19 Sam James
2024-11-24 11:02 Sam James
2024-11-02 6:18 Sam James
2024-10-21 6:34 Sam James
2024-10-21 6:34 Sam James
2024-10-21 5:48 Sam James
2024-10-21 2:55 Eli Schwartz
2024-10-14 5:28 Eli Schwartz
2024-10-06 22:26 Eli Schwartz
2024-09-20 21:23 Eli Schwartz
2024-08-29 14:32 Eli Schwartz
2024-08-29 14:28 Ionen Wolkens
2024-08-29 14:28 Ionen Wolkens
2024-08-21 9:40 Arthur Zamarin
2024-08-21 9:40 Arthur Zamarin
2024-08-21 9:40 Arthur Zamarin
2024-08-21 9:40 Arthur Zamarin
2024-08-21 9:40 Arthur Zamarin
2024-08-21 9:39 Arthur Zamarin
2024-08-21 7:16 Arthur Zamarin
2024-08-21 7:16 Arthur Zamarin
2024-08-21 7:16 Arthur Zamarin
2024-08-21 7:16 Arthur Zamarin
2024-08-20 22:22 Jakov Smolić
2024-08-20 18:05 Sam James
2024-08-16 1:16 Eli Schwartz
2024-08-14 23:29 Sam James
2024-08-14 23:29 Sam James
2024-07-29 1:19 Eli Schwartz
2024-07-29 1:19 Eli Schwartz
2024-07-11 16:29 Eli Schwartz
2024-07-11 3:15 Eli Schwartz
2024-07-11 0:34 Eli Schwartz
2024-07-11 0:34 Eli Schwartz
2024-07-08 19:25 Eli Schwartz
2024-07-03 21:25 Eli Schwartz
2024-06-25 4:48 Sam James
2024-06-25 3:35 Sam James
2024-06-25 3:35 Sam James
2024-06-25 3:35 Sam James
2024-06-25 3:35 Sam James
2024-06-25 3:35 Sam James
2024-06-25 3:35 Sam James
2024-06-25 3:11 Sam James
2024-06-25 1:32 Sam James
2024-06-25 1:32 Sam James
2024-06-25 1:32 Sam James
2024-05-31 20:10 Sam James
2024-05-13 19:41 Sam James
2024-05-13 18:45 Michał Górny
2024-05-05 20:07 Arthur Zamarin
2024-05-01 6:03 Sam James
2024-05-01 6:03 Sam James
2024-05-01 6:03 Sam James
2024-05-01 6:03 Sam James
2024-05-01 6:03 Sam James
2024-05-01 6:03 Sam James
2024-05-01 6:03 Sam James
2024-04-17 5:37 Arthur Zamarin
2024-03-22 6:14 Arthur Zamarin
2024-03-22 6:14 Arthur Zamarin
2024-03-22 4:03 Sam James
2024-03-22 4:03 Sam James
2024-03-22 4:03 Sam James
2024-03-22 4:03 Sam James
2024-03-22 4:03 Sam James
2024-03-19 7:21 Sam James
2024-03-19 6:09 Sam James
2024-03-19 5:50 Sam James
2024-03-19 5:50 Sam James
2024-03-19 5:50 Sam James
2024-03-19 3:42 Ionen Wolkens
2024-03-14 6:40 Sam James
2024-03-03 23:18 Sam James
2024-03-03 23:18 Sam James
2024-03-02 18:07 Arthur Zamarin
2024-02-28 15:27 Sam James
2024-02-26 22:27 Sam James
2024-02-19 5:08 Sam James
2024-02-19 5:08 Sam James
2024-02-19 5:08 Sam James
2024-02-19 5:08 Sam James
2024-02-19 5:08 Sam James
2024-02-19 4:04 Sam James
2024-01-14 3:18 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1707870341.56a5c9c531c45adfc1dfd0077832f55975bfc873.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox