public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/files/, x11-misc/xdg-utils/
Date: Sun, 28 Jul 2024 02:39:34 +0000 (UTC)	[thread overview]
Message-ID: <1722134299.51ca07dfca5e5f0b34a4296ad054179d89a520c3.sam@gentoo> (raw)

commit:     51ca07dfca5e5f0b34a4296ad054179d89a520c3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 02:38:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 02:38:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ca07df

x11-misc/xdg-utils: fix path to qtpaths6 & typo

Thanks-to: Emanuel Komínek <drake127 <AT> planescape.cz>
Bug: https://bugs.gentoo.org/934941
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch                  | 2 +-
 .../xdg-utils/{xdg-utils-1.2.1-r4.ebuild => xdg-utils-1.2.1-r5.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch b/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch
index a92d652bf2dc..de4bde42a1af 100644
--- a/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch
+++ b/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch
@@ -12,7 +12,7 @@ Pending questions:
 -    if [ "${KDE_SESSION_VERSION:-0}" -gt 4 ] ; then
 -        default_dir="$(qtpaths --writable-path ConfigLocation)"
 +    if [ "${KDE_SESSION_VERSION:-0}" -gt 5 ] ; then
-+        default_dir="$($(pkg-config --variable=bindir Qt6Core)/qt6paths) --writable-path ConfigLocation)"
++        default_dir="$($(pkg-config --variable=bindir Qt6Core)/qtpaths6 --writable-path ConfigLocation)"
 +        default_file="$default_dir/mimeapps.list"
 +    elif [ x"$KDE_SESSION_VERSION" = x"5" ; then
 +        default_dir="$(qtpaths5 --writable-path ConfigLocation)"

diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r5.ebuild
similarity index 100%
rename from x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild
rename to x11-misc/xdg-utils/xdg-utils-1.2.1-r5.ebuild


             reply	other threads:[~2024-07-28  2:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-28  2:39 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29 19:03 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/files/, x11-misc/xdg-utils/ Andreas Sturmlechner
2024-07-28 17:12 Sam James
2024-01-30 21:37 Sam James
2021-09-07 14:08 Pacho Ramos
2018-06-17 18:30 Mike Gilbert
2016-04-29  9:17 Johannes Huber

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=1722134299.51ca07dfca5e5f0b34a4296ad054179d89a520c3.sam@gentoo \
    --to=sam@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