public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-mimeapps-list/
@ 2025-01-24  3:49 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-01-24  3:49 UTC (permalink / raw
  To: gentoo-commits

commit:     98fe098988b15cc75fb9581b51b32d42be341096
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 03:48:53 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 03:49:21 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=98fe0989

kde-plasma/plasma-mimeapps-list: fix install path

Closes: https://bugs.gentoo.org/946490
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{plasma-mimeapps-list-1.ebuild => plasma-mimeapps-list-2.ebuild}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-2.ebuild
similarity index 94%
rename from kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild
rename to kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-2.ebuild
index 0d851c73bb..b6d5866dc1 100644
--- a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-1.ebuild
+++ b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-2.ebuild
@@ -21,6 +21,6 @@ src_install() {
 	# TODO: Should we just remove the upstream one in /usr/share?
 	# /etc/xdg should really be available for site-local overrides, but then
 	# again we have CONFIG_PROTECT...
-	insinto /etc/xdg/mimeapps.list
+	insinto /etc/xdg
 	doins "${FILESDIR}"/mimeapps.list
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-mimeapps-list/
@ 2025-01-25 10:52 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-01-25 10:52 UTC (permalink / raw
  To: gentoo-commits

commit:     39abaaab4d28d0f326286b8d67978a8738461a4e
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sat Jan 25 04:33:30 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 10:52:26 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=39abaaab

kde-plasma/plasma-mimeapps-list: replace plasma-desktop kde-mimeapps.list

[sam: Note that pkgcheck complaints about insinto/newins here but it's bogus
as we're *not* installing a menu item. Will file a bug about that later,
though it may be awkward to handle.]

Bug: https://bugs.gentoo.org/948681
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../plasma-mimeapps-list-2.ebuild                  | 26 --------------------
 .../plasma-mimeapps-list-3.ebuild                  | 28 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-2.ebuild b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-2.ebuild
deleted file mode 100644
index b6d5866dc1..0000000000
--- a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Gentoo curated mimeapps list for KDE Plasma"
-HOMEPAGE="https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-1.0.1.html"
-SRC_URI=""
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-
-src_install() {
-	default
-
-	# TODO: Should we just remove the upstream one in /usr/share?
-	# /etc/xdg should really be available for site-local overrides, but then
-	# again we have CONFIG_PROTECT...
-	insinto /etc/xdg
-	doins "${FILESDIR}"/mimeapps.list
-}

diff --git a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild
new file mode 100644
index 0000000000..26e117dad7
--- /dev/null
+++ b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo curated mimeapps list for KDE Plasma"
+HOMEPAGE="https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-1.0.1.html"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# 6.2.4 and 6.2.5 both modified with a new revision to stop installing kde-mimeapps.list.
+RDEPEND="
+	!<kde-plasma/plasma-desktop-6.2.4-r1
+	!=kde-plasma/plasma-desktop-6.2.5-r0
+	!=kde-plasma/plasma-desktop-6.2.91-r0
+"
+
+src_install() {
+	default
+
+	insinto /usr/share/applications/
+	newins "${FILESDIR}"/mimeapps.list kde-mimeapps.list
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-mimeapps-list/
@ 2025-01-25 10:52 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-01-25 10:52 UTC (permalink / raw
  To: gentoo-commits

commit:     b9568f159f9eb0efe5bd189a5d64e4a132771813
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sat Jan 25 05:17:54 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 10:52:27 2025 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9568f15

kde-plasma/plasma-mimeapps-list: keyword 3 for ~arm64, ~loong, ~ppc64, ~riscv, ~x86

These are keywored one ::gentoo version as well. Otherwise there is
mismatch between plasma-desktop and plasma-mimeapps-list.

Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild
index 26e117dad7..6a9dd3b3a4 100644
--- a/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild
+++ b/kde-plasma/plasma-mimeapps-list/plasma-mimeapps-list-3.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # 6.2.4 and 6.2.5 both modified with a new revision to stop installing kde-mimeapps.list.


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-01-25 10:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-24  3:49 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-mimeapps-list/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-01-25 10:52 Sam James
2025-01-25 10:52 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox