public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: net-im/nheko/
Date: Sat, 15 Aug 2020 18:15:12 +0000 (UTC)	[thread overview]
Message-ID: <1597493497.8d48c4e2221cca354735589d67215e1af1a6258b.andrewammerlaan@gentoo> (raw)

commit:     8d48c4e2221cca354735589d67215e1af1a6258b
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sat Aug 15 12:11:37 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Aug 15 12:11:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d48c4e2

net-im/nheko: Don't call base_src_prepare() 2 times.

cmake_src_prepare() and xdg_src_prepare() both call default()
a.k.a. base_src_prepare(). That would result in the attempt to apply
each patch 2 times.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 net-im/nheko/nheko-0.7.1.ebuild | 2 +-
 net-im/nheko/nheko-0.7.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/nheko/nheko-0.7.1.ebuild b/net-im/nheko/nheko-0.7.1.ebuild
index 16b387a..43287ca 100644
--- a/net-im/nheko/nheko-0.7.1.ebuild
+++ b/net-im/nheko/nheko-0.7.1.ebuild
@@ -34,7 +34,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
 	cmake_src_prepare
-	xdg_src_prepare
+	xdg_environment_reset
 
 	# TODO: Unbundle SingleApplication, blurhash and cpp-httplib.
 }

diff --git a/net-im/nheko/nheko-0.7.2.ebuild b/net-im/nheko/nheko-0.7.2.ebuild
index b226c0c..e6ce8bd 100644
--- a/net-im/nheko/nheko-0.7.2.ebuild
+++ b/net-im/nheko/nheko-0.7.2.ebuild
@@ -34,7 +34,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
 	cmake_src_prepare
-	xdg_src_prepare
+	xdg_environment_reset
 
 	# TODO: Unbundle SingleApplication, blurhash and cpp-httplib.
 }


             reply	other threads:[~2020-08-15 18:15 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-15 18:15 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-13 10:19 [gentoo-commits] repo/proj/guru:dev commit in: net-im/nheko/ David Roman
2024-09-13 10:22 ` [gentoo-commits] repo/proj/guru:master " David Roman
2024-09-13  9:24 David Roman
2024-09-12 17:35 [gentoo-commits] repo/proj/guru:dev " David Roman
2024-09-12 17:54 ` [gentoo-commits] repo/proj/guru:master " David Roman
2024-07-31  9:16 David Roman
2024-07-26 20:29 David Roman
2024-07-26 20:29 David Roman
2024-07-08 16:36 David Roman
2024-06-17 21:40 Julien Roy
2024-03-24 19:31 Julien Roy
2024-03-12 14:48 Haelwenn Monnier
2024-02-07 10:10 David Roman
2024-02-07 10:10 David Roman
2023-11-30 10:44 Andrew Ammerlaan
2023-11-30 10:44 Andrew Ammerlaan
2023-07-01 18:15 Haelwenn Monnier
2023-06-15  9:33 Florian Schmaus
2023-06-11 11:47 Viorel Munteanu
2023-02-24  7:41 Viorel Munteanu
2023-02-24  7:41 Viorel Munteanu
2023-02-23  9:24 Viorel Munteanu
2023-02-23  9:24 Viorel Munteanu
2023-02-23  9:24 Viorel Munteanu
2023-02-03 21:15 Andrew Ammerlaan
2023-01-24  9:10 Florian Schmaus
2023-01-14 18:43 Andrew Ammerlaan
2022-12-07 19:50 Ronny Gutbrod
2022-12-05  9:20 Viorel Munteanu
2022-10-04  2:54 Haelwenn Monnier
2022-09-28 16:04 [gentoo-commits] repo/proj/guru:dev " Ronny Gutbrod
2022-09-28 16:05 ` [gentoo-commits] repo/proj/guru:master " Ronny Gutbrod
2022-09-28 16:04 [gentoo-commits] repo/proj/guru:dev " Ronny Gutbrod
2022-09-28 16:05 ` [gentoo-commits] repo/proj/guru:master " Ronny Gutbrod
2022-09-08  1:46 Ronny Gutbrod
2022-09-08  0:09 [gentoo-commits] repo/proj/guru:dev " Ronny Gutbrod
2022-09-08  1:46 ` [gentoo-commits] repo/proj/guru:master " Ronny Gutbrod
2022-07-23 17:37 Haelwenn Monnier
2022-07-23 17:37 Haelwenn Monnier
2022-03-29  0:23 Ronny Gutbrod
2022-03-25 15:17 Ronny Gutbrod
2022-03-25  9:42 [gentoo-commits] repo/proj/guru:dev " Ronny Gutbrod
2022-03-25 15:17 ` [gentoo-commits] repo/proj/guru:master " Ronny Gutbrod
2022-03-10 13:53 [gentoo-commits] repo/proj/guru:dev " Ronny Gutbrod
2022-03-10 14:03 ` [gentoo-commits] repo/proj/guru:master " Ronny Gutbrod
2022-03-07 16:22 [gentoo-commits] repo/proj/guru:dev " Ronny Gutbrod
2022-03-07 21:21 ` [gentoo-commits] repo/proj/guru:master " Ronny Gutbrod
2022-01-20 19:21 Andrew Ammerlaan
2021-11-20 13:05 Haelwenn Monnier
2021-11-20 13:05 Haelwenn Monnier
2021-11-20 13:05 Haelwenn Monnier
2021-11-20 13:05 Haelwenn Monnier
2021-06-24 12:22 Jian Lin
2021-04-23 12:25 Andrew Ammerlaan
2021-04-23 12:25 Andrew Ammerlaan
2021-04-21  7:32 Andrew Ammerlaan
2021-04-10 10:07 Andrew Ammerlaan
2021-01-28 11:45 Andrew Ammerlaan
2021-01-28 11:45 Andrew Ammerlaan
2021-01-23 11:49 Michał Górny
2021-01-23 11:49 Michał Górny
2020-08-15 18:15 Andrew Ammerlaan
2020-07-20 11:40 Andrew Ammerlaan
2020-06-13 13:13 Andrew Ammerlaan
2020-05-26 10:49 Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1597493497.8d48c4e2221cca354735589d67215e1af1a6258b.andrewammerlaan@gentoo \
    --to=andrewammerlaan@riseup.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox