Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: net-im/nheko/
Date: Sat, 15 Aug 2020 18:15:16
Message-Id: 1597493497.8d48c4e2221cca354735589d67215e1af1a6258b.andrewammerlaan@gentoo
1 commit: 8d48c4e2221cca354735589d67215e1af1a6258b
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Sat Aug 15 12:11:37 2020 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Sat Aug 15 12:11:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d48c4e2
7
8 net-im/nheko: Don't call base_src_prepare() 2 times.
9
10 cmake_src_prepare() and xdg_src_prepare() both call default()
11 a.k.a. base_src_prepare(). That would result in the attempt to apply
12 each patch 2 times.
13
14 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
15
16 net-im/nheko/nheko-0.7.1.ebuild | 2 +-
17 net-im/nheko/nheko-0.7.2.ebuild | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/net-im/nheko/nheko-0.7.1.ebuild b/net-im/nheko/nheko-0.7.1.ebuild
21 index 16b387a..43287ca 100644
22 --- a/net-im/nheko/nheko-0.7.1.ebuild
23 +++ b/net-im/nheko/nheko-0.7.1.ebuild
24 @@ -34,7 +34,7 @@ BDEPEND="dev-qt/linguist-tools:5"
25
26 src_prepare() {
27 cmake_src_prepare
28 - xdg_src_prepare
29 + xdg_environment_reset
30
31 # TODO: Unbundle SingleApplication, blurhash and cpp-httplib.
32 }
33
34 diff --git a/net-im/nheko/nheko-0.7.2.ebuild b/net-im/nheko/nheko-0.7.2.ebuild
35 index b226c0c..e6ce8bd 100644
36 --- a/net-im/nheko/nheko-0.7.2.ebuild
37 +++ b/net-im/nheko/nheko-0.7.2.ebuild
38 @@ -34,7 +34,7 @@ BDEPEND="dev-qt/linguist-tools:5"
39
40 src_prepare() {
41 cmake_src_prepare
42 - xdg_src_prepare
43 + xdg_environment_reset
44
45 # TODO: Unbundle SingleApplication, blurhash and cpp-httplib.
46 }