commit: 9c3f62cd0d98ca76908cc3d661159cfc6c119d12 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun May 22 12:41:34 2022 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun May 22 12:41:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3f62cd
x11-wm/xpra: Patch around setup.py hardcoded call to cpp This has been merged upstream. Closes: https://bugs.gentoo.org/831337 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> x11-wm/xpra/files/xpra-4.3-cpp.patch | 34 ++++++++++++++++++++++++++++++++++ x11-wm/xpra/xpra-4.3.3.ebuild | 1 + 2 files changed, 35 insertions(+) diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch b/x11-wm/xpra/files/xpra-4.3-cpp.patch new file mode 100644 index 000000000000..41f1263e3465 --- /dev/null +++ b/x11-wm/xpra/files/xpra-4.3-cpp.patch @@ -0,0 +1,34 @@ +From c80d18b41701082e60ce6bfa5bd6a274affaff96 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <ch...@gentoo.org> +Date: Sun, 22 May 2022 12:00:01 +0100 +Subject: [PATCH] Most build systems respect the CPP env var instead of just + calling cpp + +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index f84d56c6d..7f0db3b69 100755 +--- a/setup.py ++++ b/setup.py +@@ -149,6 +149,7 @@ ARM = ARCH.startswith("arm") or ARCH.startswith("aarch") + print("ARCH=%s" % (ARCH,)) + + INCLUDE_DIRS = os.environ.get("INCLUDE_DIRS", os.path.join(sys.prefix, "include")).split(os.pathsep) ++CPP = os.environ.get("CPP", "cpp") + + from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED + shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT +@@ -2423,7 +2424,7 @@ if v4l2_ENABLED: + ENABLE_DEVICE_CAPS = 0 + if os.path.exists(videodev2_h): + try: +- with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h, ++ with subprocess.Popen("%s -fpreprocessed %s | grep -q device_caps" % (CPP, videodev2_h), + shell=True) as proc: + ENABLE_DEVICE_CAPS = proc.wait()==0 + except OSError: +-- +2.35.1 + diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild index 337531a3c0f3..a6855e815cf0 100644 --- a/x11-wm/xpra/xpra-4.3.3.ebuild +++ b/x11-wm/xpra/xpra-4.3.3.ebuild @@ -117,6 +117,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch "${FILESDIR}"/${PN}-4.2-suid-warning.patch "${FILESDIR}"/${PN}-4.3-no-service.patch + "${FILESDIR}"/${PN}-4.3-cpp.patch "${DISTDIR}"/${PN}-4.3.1-tests.patch )
