From 37be7e43056738c9ccfd6eb27f17f83b7eb9b558 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Fri, 28 Mar 2025 14:05:54 +0800 Subject: [PATCH] app-editors/qhexedit2: backport fix 952787 Bug: https://bugs.gentoo.org/952787 Closes: https://github.com/gentoo/gentoo/pull/41336 Signed-off-by: Huang Rui Signed-off-by: Yixun Lan --- ...r3.ebuild => qhexedit2-0.8.9_p20210525-r4.ebuild} | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) rename app-editors/qhexedit2/{qhexedit2-0.8.9_p20210525-r3.ebuild => qhexedit2-0.8.9_p20210525-r4.ebuild} (86%) diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r3.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r4.ebuild similarity index 86% rename from app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r3.ebuild rename to app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r4.ebuild index facd3ab0add9f..c74e154f49b56 100644 --- a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r3.ebuild +++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-r1 qmake-utils EGIT_COMMIT="541139125be034b90b6811a84faa1413e357fd94" @@ -69,7 +69,13 @@ src_compile() { export PATH="$(qt5_get_bindir):${PATH}" python_build() { pushd "${S}" || die - sip-build || die + # sip-build is not able to handle CFLAGS and CXXFLAGS + # so we need to pass them as QMAKE_CFLAGS and QMAKE_CXXFLAGS + # https://bugs.gentoo.org/952787 + sip-build \ + --qmake-setting "QMAKE_CFLAGS += ${CFLAGS}" \ + --qmake-setting "QMAKE_CXXFLAGS += ${CXXFLAGS}" \ + || die popd || die } python_foreach_impl run_in_build_dir python_build