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: dev-libs/plasma-wayland-protocols/
Date: Sun,  3 Mar 2024 16:37:48 +0000 (UTC)	[thread overview]
Message-ID: <1709483841.f4a6d15842cd05117e24f86d8bf1dd2ad4860fb1.asturm@gentoo> (raw)

commit:     f4a6d15842cd05117e24f86d8bf1dd2ad4860fb1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 16:24:08 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 16:37:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a6d158

dev-libs/plasma-wayland-protocols: Use cmake instead of ecm.eclass

The latter was just overkill for the needs of this simple build system,
this ensures that it works for Qt5/Qt6 "purity" builds alike.

Closes: https://bugs.gentoo.org/923502
Closes: https://github.com/gentoo/kde/pull/980
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ld => plasma-wayland-protocols-1.12.0-r1.ebuild} | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild
similarity index 54%
rename from dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild
rename to dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild
index 5a9c09e22f1e..ad0d538fed5b 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.12.0-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-ECM_NONGUI=true
-inherit ecm kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Plasma Specific Protocols for Wayland"
 HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
@@ -16,3 +15,21 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+
+BDEPEND="
+	dev-libs/libpcre2:*
+	>=kde-frameworks/extra-cmake-modules-5.115.0:*
+	|| (
+		dev-qt/qtbase:6
+		dev-qt/qtcore:5
+	)
+"
+
+ecm_src_configure() {
+	local mycmakeargs=(
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON # ecm.eclass
+		-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" # ecm.eclass
+	)
+
+	cmake_src_configure
+}


             reply	other threads:[~2024-03-03 16:37 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-03 16:37 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-21 14:33 [gentoo-commits] repo/gentoo:master commit in: dev-libs/plasma-wayland-protocols/ Andreas Sturmlechner
2025-03-19 23:18 Andreas Sturmlechner
2025-02-07 21:41 Sam James
2025-02-07 21:16 Arthur Zamarin
2025-02-07 20:51 Arthur Zamarin
2025-02-07 18:04 Sam James
2025-01-15 19:31 Sam James
2025-01-15 16:24 Sam James
2025-01-09 20:10 Andreas Sturmlechner
2024-12-18 21:22 Andreas Sturmlechner
2024-12-17 17:56 Andreas Sturmlechner
2024-12-07 13:14 Andreas Sturmlechner
2024-10-31 22:34 Andreas Sturmlechner
2024-10-25 11:59 Arthur Zamarin
2024-10-24 10:20 Arthur Zamarin
2024-10-22  1:34 Sam James
2024-10-22  1:34 Sam James
2024-10-21 18:46 Arthur Zamarin
2024-09-12 19:29 Andreas Sturmlechner
2024-06-29 16:34 Andreas Sturmlechner
2024-06-28  0:59 Sam James
2024-06-28  0:59 Sam James
2024-06-28  0:16 Sam James
2024-06-28  0:16 Sam James
2024-06-28  0:16 Sam James
2024-05-24 19:28 Andreas Sturmlechner
2024-01-14 22:28 Andreas Sturmlechner
2024-01-12  8:17 Arthur Zamarin
2024-01-12  8:17 Arthur Zamarin
2024-01-12  8:17 Arthur Zamarin
2024-01-12  8:17 Arthur Zamarin
2024-01-12  8:17 Arthur Zamarin
2023-12-08  0:27 Andreas Sturmlechner
2023-11-15 19:37 Andreas Sturmlechner
2023-11-14 22:55 Andreas Sturmlechner
2023-05-20  5:43 Sam James
2023-05-20  0:54 Sam James
2023-04-22 18:09 Andreas Sturmlechner
2023-01-20 13:56 Andreas Sturmlechner
2022-12-15 23:29 Andreas Sturmlechner
2022-09-29 12:52 Andreas Sturmlechner
2022-09-29 12:52 Andreas Sturmlechner
2022-05-07  7:17 Sam James
2022-02-10  9:13 Andreas Sturmlechner
2022-02-10  0:40 Sam James
2022-02-08 11:02 Jakov Smolić
2022-01-14 19:10 Andreas Sturmlechner
2021-12-14 13:27 Andreas Sturmlechner
2021-12-10 18:37 Jakov Smolić
2021-12-10 11:15 Jakov Smolić
2021-11-22 16:37 Andreas Sturmlechner
2021-11-07 15:41 Andreas Sturmlechner
2021-06-05 10:57 Mikle Kolyada
2021-06-05 10:55 Mikle Kolyada
2021-06-05 10:53 Mikle Kolyada
2021-05-15 18:37 Andreas Sturmlechner
2021-05-02 22:59 Andreas Sturmlechner
2021-04-04 13:23 Andreas Sturmlechner
2021-03-28 14:17 Andreas Sturmlechner
2020-09-04 13:45 Andreas Sturmlechner
2020-07-31 14:45 Andreas Sturmlechner
2020-07-31 14:45 Andreas Sturmlechner
2020-07-24  8:25 Andreas Sturmlechner
2020-06-04 14:03 Andreas Sturmlechner
2020-05-22 23:08 Georgy Yakovlev
2020-05-13 21:21 Andreas Sturmlechner

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=1709483841.f4a6d15842cd05117e24f86d8bf1dd2ad4860fb1.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