From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/
Date: Fri, 4 Oct 2024 21:04:07 +0000 (UTC) [thread overview]
Message-ID: <1728075797.b0711247d6637ff1bb483708a0849a4bd21a9532.asturm@gentoo> (raw)
commit: b0711247d6637ff1bb483708a0849a4bd21a9532
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 19:11:02 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 21:03:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0711247
net-libs/signond: Drop IUSE qt6, don't enable qt5 by default
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/signond/signond-8.61-r101.ebuild | 150 ++++++++++++++++++++++++++++++
1 file changed, 150 insertions(+)
diff --git a/net-libs/signond/signond-8.61-r101.ebuild b/net-libs/signond/signond-8.61-r101.ebuild
new file mode 100644
index 000000000000..1f6aa38aae06
--- /dev/null
+++ b/net-libs/signond/signond-8.61-r101.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils multibuild
+
+if [[ ${PV} = *9999* ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/nicolasfella/signond.git/"
+ EGIT_BRANCH="qt6"
+ inherit git-r3
+else
+ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.bz2 -> ${P}.tar.bz2"
+ S="${WORKDIR}/${PN}-VERSION_${PV}"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Signon daemon for libaccounts-glib"
+HOMEPAGE="https://gitlab.com/accounts-sso"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+# The qt5/qt6 situation is complicated:
+# https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/merge_requests/28#note_1689621252
+# 1) the library is coinstallable for qt5/qt6
+# 2) signond (the daemon) must be built for only one Qt version, matching the
+# Qt version of all consumer plugins.
+IUSE="doc qt5 test"
+
+# tests are brittle; they all pass when stars align, bug 727666
+RESTRICT="test !test? ( test )"
+
+RDEPEND="
+ dev-qt/qtbase:6[dbus,gui,network,sql]
+ net-libs/libproxy
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( qt5? ( dev-qt/qttest:5 ) )
+"
+BDEPEND="
+ doc? (
+ app-text/doxygen[dot]
+ || (
+ dev-qt/qttools:6[assistant]
+ dev-qt/qthelp:5
+ )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/0001-Don-t-forward-declare-QStringList.patch
+ "${FILESDIR}"/0002-Remove-usage-of-Q_EXTERN_C.patch
+ "${FILESDIR}"/0003-Port-from-QProcess-pid-to-processId.patch
+ "${FILESDIR}"/0004-Port-away-from-deprecated-QString-SplitBehavior.patch
+ "${FILESDIR}"/0005-Port-away-from-QtContainer-toSet.patch
+ "${FILESDIR}"/0006-Port-away-from-deprecated-QMap-unite.patch
+ "${FILESDIR}"/0008-Use-return-instead-of-reference-for-DBus-output-para.patch
+ "${FILESDIR}"/0009-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch
+ "${FILESDIR}"/0010-Fix-plugin-datastream-in-Qt6.patch
+ "${FILESDIR}"/0011-Port-away-from-deprecated-QProcess-signal.patch
+ "${FILESDIR}/${PN}-8.60-buildsystem.patch"
+ "${FILESDIR}/${PN}-8.60-unused-dep.patch" # bug 727346
+ "${FILESDIR}/${PN}-8.61-consistent-paths.patch" # bug 701142
+)
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt5) qt6 )
+}
+
+src_prepare() {
+ default
+
+ local qhelpgeneratorpath
+ if has_version "dev-qt/qttools:6[assistant]"; then
+ qhelpgeneratorpath="$(qt6_get_libdir)/qt6/libexec"
+ elif has_version "dev-qt/qthelp:5"; then
+ qhelpgeneratorpath="$(qt5_get_bindir)"
+ else
+ eerror "dev-qt/qttools:6[assistant] nor dev-qt/qthelp:5 available even though in deps(?)"
+ fi
+
+ sed -e "/QHG_LOCATION/s|qhelpgenerator|${qhelpgeneratorpath}/&|" \
+ -i {lib/plugins/,lib/SignOn/,}doc/doxy.conf || die
+
+ # install docs to correct location
+ sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \
+ -i doc/doc.pri || die
+ sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/\$\${TARGET}/" \
+ -i lib/plugins/doc/doc.pri || die
+ sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \
+ -i lib/SignOn/doc/doc.pri || die
+
+ use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \
+ -i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
+
+ use test || sed -e '/^SUBDIRS/s/tests//' \
+ -i signon.pro || die "couldn't disable tests"
+
+ multibuild_copy_sources
+}
+
+src_configure() {
+ my_src_configure() {
+ cd "${BUILD_DIR}" || die
+
+ local myqmakeargs=(
+ PREFIX="${EPREFIX}"/usr
+ LIBDIR=$(get_libdir)
+ )
+
+ if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+ eqmake6 "${myqmakeargs[@]}"
+ else
+ eqmake5 "${myqmakeargs[@]}"
+ fi
+ }
+
+ multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+ my_src_compile() {
+ emake -C "${BUILD_DIR}"
+ }
+
+ multibuild_foreach_variant my_src_compile
+}
+
+src_install() {
+ my_src_install() {
+ emake -C "${BUILD_DIR}" INSTALL_ROOT="${D}" install
+ }
+
+ multibuild_foreach_variant my_src_install
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]] && \
+ ! has_version "kde-apps/signon-kwallet-extension:*"; then
+ ewarn "Without kde-apps/signon-kwallet-extension installed, passwords"
+ ewarn "will be saved in plaintext!"
+ fi
+}
next reply other threads:[~2024-10-04 21:04 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-04 21:04 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-09 8:33 [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/ Andreas Sturmlechner
2025-01-03 20:31 Andreas Sturmlechner
2025-01-03 20:31 Andreas Sturmlechner
2024-10-05 7:07 Michał Górny
2024-06-28 12:59 Sam James
2024-06-28 0:59 Sam James
2024-06-28 0:16 Sam James
2024-04-25 20:43 Andreas Sturmlechner
2024-01-12 14:03 Sam James
2023-03-23 19:52 Andreas Sturmlechner
2022-10-16 11:42 Andreas Sturmlechner
2022-10-06 9:14 Andreas Sturmlechner
2022-09-21 21:36 Andreas Sturmlechner
2022-05-09 8:37 Jakov Smolić
2022-05-09 7:33 Jakov Smolić
2022-05-09 7:33 Jakov Smolić
2022-03-20 13:47 Andreas Sturmlechner
2022-03-16 16:40 Andreas Sturmlechner
2021-08-01 18:27 Sam James
2020-06-30 9:27 Andreas Sturmlechner
2020-06-30 6:32 Agostino Sarubbo
2020-06-29 13:40 Agostino Sarubbo
2020-06-28 21:55 Andreas Sturmlechner
2020-06-08 16:34 Mart Raudsepp
2019-12-11 16:52 Andreas Sturmlechner
2019-12-11 16:14 Aaron Bauman
2019-12-10 9:17 Agostino Sarubbo
2019-12-09 14:38 Agostino Sarubbo
2019-12-08 23:01 Andreas Sturmlechner
2019-12-08 22:35 Andreas Sturmlechner
2019-08-04 10:19 Michael Palimaka
2019-01-09 11:52 Andreas Sturmlechner
2018-12-23 1:25 Andreas Sturmlechner
2017-12-25 2:23 Michael Palimaka
2017-12-25 2:23 Michael Palimaka
2017-10-28 20:52 Andreas Sturmlechner
2016-07-25 21:00 Michael Palimaka
2016-06-23 13:40 Michael Palimaka
2016-05-24 11:39 Mikle Kolyada
2016-03-22 14:41 Michael Palimaka
2015-12-21 14:17 Michael Palimaka
2015-12-20 18:31 Michael Palimaka
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=1728075797.b0711247d6637ff1bb483708a0849a4bd21a9532.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