x11-libs/xapp: fix broken, untested sed

This is why sed is bad. The sed didn't apply, even in the first edition
of the ebuild that it was introduced in, because it used incorrect sed
syntax. Because it was a sed, this fact escaped all notice even though
it never ever worked.

Just use a patch. Patches always either apply or fail, they aren't prone
to silently doing *nothing*.

Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Eli Schwartz 2024-03-02 22:14:14 -05:00 committed by Sam James
parent de43013d05
commit 656a69372c
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
2 changed files with 29 additions and 3 deletions

View File

@ -0,0 +1,26 @@
From 3ef6f2cb9da305ac71d807ac3a51c3c8c345676f Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
Date: Sat, 2 Mar 2024 22:12:44 -0500
Subject: [PATCH] don't install pastebin upload wrapper
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
---
scripts/meson.build | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/scripts/meson.build b/scripts/meson.build
index 7b1c1bc..6c31e5d 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -1,7 +1,4 @@
-scripts = files(
- 'pastebin',
- 'upload-system-info',
- 'xapp-gpu-offload')
+scripts = files('xapp-gpu-offload')
if get_option('xfce')
scripts += files('xfce4-set-wallpaper')
--
2.43.0

View File

@ -53,15 +53,15 @@ PATCHES=(
# Make desktop environment integrations optional
# https://github.com/linuxmint/xapp/pull/176
"${FILESDIR}"/${PN}-optional-de-options.patch
# don't install pastebin upload wrapper
"${FILESDIR}"/0001-don-t-install-pastebin-upload-wrapper.patch
)
src_prepare() {
vala_src_prepare
default
# don't install pastebin upload wrapper
sed -iE "s/'(pastebin|upload-system-info)',//" scripts/meson.build || die
# Fix meson helpers
python_setup
python_fix_shebang .