public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/
Date: Sun,  3 Mar 2024 09:49:19 +0000 (UTC)	[thread overview]
Message-ID: <1709459343.4e468b885729218ac14598511b99441dd7861e3e.asturm@gentoo> (raw)

commit:     4e468b885729218ac14598511b99441dd7861e3e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 09:33:34 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 09:49:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e468b88

kde-apps/konqueror: Block kde-apps/kio-extras:5

File collision at /usr/share/kio_bookmarks/kio_bookmarks.css

Closes: https://bugs.gentoo.org/926057
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../konqueror/{konqueror-24.02.0.ebuild => konqueror-24.02.0-r1.ebuild}  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/konqueror/konqueror-24.02.0.ebuild b/kde-apps/konqueror/konqueror-24.02.0-r1.ebuild
similarity index 98%
rename from kde-apps/konqueror/konqueror-24.02.0.ebuild
rename to kde-apps/konqueror/konqueror-24.02.0-r1.ebuild
index 9b69c036e6cf..3db16d7bcc70 100644
--- a/kde-apps/konqueror/konqueror-24.02.0.ebuild
+++ b/kde-apps/konqueror/konqueror-24.02.0-r1.ebuild
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
 	activities? ( kde-plasma/plasma-activities:6 )
 "
 RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kio-extras-23.08.5-r100:5
 	kde-apps/kfind:6
 	kde-plasma/kde-cli-tools:*
 "


             reply	other threads:[~2024-03-03  9:49 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-03  9:49 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-05 12:46 [gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/ Andreas Sturmlechner
2025-07-10 17:57 Andreas Sturmlechner
2024-09-02 14:50 Andreas Sturmlechner
2024-06-23 17:02 Andreas Sturmlechner
2024-06-13 17:40 Andreas Sturmlechner
2024-06-12 17:36 Sam James
2024-06-01  9:21 Andreas Sturmlechner
2024-01-07 13:51 Andreas Sturmlechner
2024-01-07 13:51 Andreas Sturmlechner
2023-11-11 20:00 Andreas Sturmlechner
2023-10-14 22:49 Andreas Sturmlechner
2023-07-06 12:13 Andreas Sturmlechner
2022-10-06  9:07 Andreas Sturmlechner
2021-10-03 11:46 Andreas Sturmlechner
2021-09-22 21:59 Andreas Sturmlechner
2021-06-05 10:57 Mikle Kolyada
2021-06-05 10:55 Mikle Kolyada
2021-06-05 10:53 Mikle Kolyada
2020-02-16 13:41 Andreas Sturmlechner
2020-02-16 13:41 Andreas Sturmlechner
2020-01-14 19:16 Andreas Sturmlechner
2018-11-18 19:04 Andreas Sturmlechner
2018-08-07  7:06 Andreas Sturmlechner
2018-07-29  0:38 Mikle Kolyada
2017-04-18 23:10 Andreas Sturmlechner
2017-04-17 11:53 Andreas Sturmlechner
2017-01-01 16:09 Andreas Sturmlechner
2016-07-20 15:17 Michael Palimaka
2016-07-18 20:41 Johannes Huber
2016-05-24 19:26 Mikle Kolyada
2016-03-05 11:07 Mikle Kolyada

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=1709459343.4e468b885729218ac14598511b99441dd7861e3e.asturm@gentoo \
    --to=asturm@gentoo.org \
    --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