From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kompare/, eclass/
Date: Mon, 20 May 2024 21:24:07 +0000 (UTC) [thread overview]
Message-ID: <1716240166.c8ab59af6b882dbad18a61e1af30035c068f1f44.asturm@gentoo> (raw)
commit: c8ab59af6b882dbad18a61e1af30035c068f1f44
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 11:15:10 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 20 21:22:46 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8ab59af
kde-apps/kompare: Revert "Port to KF6"
This reverts commit 86da703c2c80f7d7c9af429cd2d4857d66910498,
to not conflict with also reverted-back-to-KF5 libkomparediff2.
Follow-up to commit 68a074bcd0592c2e625bcd4ee925907ac04c3821.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/gear.kde.org.eclass | 1 -
kde-apps/kompare/kompare-9999.ebuild | 40 +++++++++++++++++++-----------------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 0bf4e6bf5e..a271a9f79f 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -282,7 +282,6 @@ if $(ver_test -gt 24.10.75); then
case ${PN} in
kalzium | \
kdesdk-thumbnailers | \
- kompare | \
krdc | \
minuet | \
skanlite | \
diff --git a/kde-apps/kompare/kompare-9999.ebuild b/kde-apps/kompare/kompare-9999.ebuild
index ecfd5b99fe..cb9296c63b 100644
--- a/kde-apps/kompare/kompare-9999.ebuild
+++ b/kde-apps/kompare/kompare-9999.ebuild
@@ -5,34 +5,36 @@ EAPI=8
ECM_HANDBOOK="forceoptional"
PVCUT=$(ver_cut 1-3)
-KFMIN=6.0.0
-QTMIN=6.6.2
+KFMIN=5.115.0
+QTMIN=5.15.12
inherit ecm gear.kde.org
DESCRIPTION="A program to view the differences between files"
HOMEPAGE="https://apps.kde.org/kompare/"
LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
+SLOT="5"
KEYWORDS=""
IUSE=""
DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
- >=kde-apps/libkomparediff2-${PVCUT}:6
- >=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kcodecs-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kjobwidgets-${KFMIN}:6
- >=kde-frameworks/kparts-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/ktexteditor-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/libkomparediff2-${PVCUT}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
"
RDEPEND="${DEPEND}"
reply other threads:[~2024-05-20 21:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1716240166.c8ab59af6b882dbad18a61e1af30035c068f1f44.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