commit:     aab45ee33f081fc6df88b8afac7d22cd18b9f9bf
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Sun Dec 31 12:16:08 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 11:47:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aab45ee3

net-im/telegram-desktop: Hardcode XDG_DATA_DIRS variable

Closes: https://bugs.gentoo.org/920819
Closes: https://github.com/gentoo/gentoo/pull/34576
Thanks-to: tt_1
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild | 6 ++++++
 net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild 
b/net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild
index 8e9ff6ff89ab..1173997980e4 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.12.2.ebuild
@@ -146,6 +146,12 @@ src_prepare() {
 }
 
 src_configure() {
+       # Having user paths sneak into the build environment through the
+       # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
+       # - bug 909038: can't read from flatpak directories (fixed upstream)
+       # - bug 920819: system-wide directories ignored when variable is set
+       export XDG_DATA_DIRS="${EPREFIX}/usr/share"
+
        # Evil flag (bug #919201)
        filter-flags -fno-delete-null-pointer-checks
 

diff --git a/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild 
b/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild
index a09373f9f9f1..0d903b5eaadb 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.13.1.ebuild
@@ -146,6 +146,12 @@ src_prepare() {
 }
 
 src_configure() {
+       # Having user paths sneak into the build environment through the
+       # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
+       # - bug 909038: can't read from flatpak directories (fixed upstream)
+       # - bug 920819: system-wide directories ignored when variable is set
+       export XDG_DATA_DIRS="${EPREFIX}/usr/share"
+
        # Evil flag (bug #919201)
        filter-flags -fno-delete-null-pointer-checks
 

Reply via email to