* [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/, net-libs/signond/files/
@ 2016-03-22 14:41 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-03-22 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 98ef14d718e37203a1ac40aee0b43b4ee2fcb7a8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 13:02:57 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 14:41:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98ef14d7
net-libs/signond: remove old
Package-Manager: portage-2.2.28
net-libs/signond/Manifest | 1 -
net-libs/signond/files/signond-8.57-qt55.patch | 24 ------------
net-libs/signond/signond-8.57.ebuild | 54 --------------------------
3 files changed, 79 deletions(-)
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 744e61a..6f769c0 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,2 +1 @@
-DIST signon-8.57.tar.bz2 197988 SHA256 239a2c6bb39c338402d9ae29287fbc439f422f82e7e6d060be23104173620bee SHA512 98bdee0b15fbc0ade1158df95f727ba56ae2966117d8ce7074b4f355dc3be0db27ab52340654da8ab4324e6d8d160c65802e1bed295ac3ad02ddc720581bbdb3 WHIRLPOOL e7bc4f31e2d59ce361b45c77f0eb838e601bf55e24e53413fec3ec91feaec7fad85581b1dba80cb9350584a10822202af748e74f46bc06dc96b2aeff52bf105b
DIST signond-8.58.tar.gz 277287 SHA256 301e2e3b6919585c8ffc56f73ec1f0f9b18a533e1db88461e9fa4e2acf75a34a SHA512 74c9f32ea99c869c0aa72b5816962336869131ea4e8484c53636b35f2ed669a49cbc0ccf10c2c446697892235b94cf2c74f8d5402f430081d7d51421646eec91 WHIRLPOOL 7cff41e9ca37627a6a80a3c23d960958543ee2344ee24771d5e02c6a519d82f68a5003bf9a2bb413c9cbf20f7b450adaf9a82160cd422146431fce237d87d084
diff --git a/net-libs/signond/files/signond-8.57-qt55.patch b/net-libs/signond/files/signond-8.57-qt55.patch
deleted file mode 100644
index 580c2c4..0000000
--- a/net-libs/signond/files/signond-8.57-qt55.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 68fc7ac7511cb6c55a507442c0736d8bbcb213cf Mon Sep 17 00:00:00 2001
-From: Alberto Mardegan <mardy@users.sourceforge.net>
-Date: Thu, 23 Apr 2015 14:34:19 +0300
-Subject: [PATCH] Fix build with Qt 5.5
-
----
- lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp | 1 +
- 1 file changed, 1 insertion(+), 0 deletions(-)
-
-diff --git a/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp b/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp
-index bb00e7d..188324a 100644
---- a/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp
-+++ b/lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp
-@@ -25,6 +25,7 @@
-
- #include <QDBusArgument>
- #include <QBuffer>
-+#include <QDataStream>
- #include <QDebug>
-
- #include "SignOn/signonplugincommon.h"
---
-libgit2 0.22.2
-
diff --git a/net-libs/signond/signond-8.57.ebuild b/net-libs/signond/signond-8.57.ebuild
deleted file mode 100644
index 8e1e54c..0000000
--- a/net-libs/signond/signond-8.57.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="signon"
-MY_P="${MY_PN}-${PV}"
-inherit qmake-utils
-
-DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RESTRICT="test"
-
-# libproxy[kde] results to segfaults
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- net-libs/libproxy[-kde]
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-qt55.patch"
-
- sed -e "s|qdbusxml2cpp|$(qt5_get_bindir)/&|" -i src/signond/signond.pro || die
- sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
- use test || sed -i -e '/^SUBDIRS/s/tests//' signon.pro || die "couldn't disable tests"
- use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" -i \
- ${MY_PN}.pro -i lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/, net-libs/signond/files/
@ 2020-06-05 0:39 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-06-05 0:39 UTC (permalink / raw
To: gentoo-commits
commit: eb77bf011bd6d6a7c81fb6ed27d0bc23b7782c71
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 5 00:24:41 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 00:38:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb77bf01
net-libs/signond: Fix runtime crashes
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/signond/files/signond-8.60-crashfix.patch | 160 +++++++++++++++++++++
net-libs/signond/signond-8.60-r2.ebuild | 76 ++++++++++
2 files changed, 236 insertions(+)
diff --git a/net-libs/signond/files/signond-8.60-crashfix.patch b/net-libs/signond/files/signond-8.60-crashfix.patch
new file mode 100644
index 00000000000..8cfc79ac431
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-crashfix.patch
@@ -0,0 +1,160 @@
+From ab9fab9763277783363f8c6d4b62405c3b0b0413 Mon Sep 17 00:00:00 2001
+From: Chris Adams <chris.adams@jollamobile.com>
+Date: Wed, 31 Jul 2019 12:45:14 +1000
+Subject: [PATCH] Don't emit QObject::destroyed() within Identity::destroy()
+
+QObject::destroyed() should not be emitted manually, as that can
+cause unwanted side effects.
+
+Specifically, in this case, the
+QDBusConnectionPrivate::objectDestroyed() slot was invoked with
+invalidated object parameter (perhaps due to duplicate invocation)
+resulting in a warning in QObject::disconnect().
+
+Instead, ensure the object is unregistered from DBus immediately.
+---
+ src/signond/signondaemonadaptor.cpp | 29 ++++++++++++++++++++++++++++-
+ src/signond/signondaemonadaptor.h | 3 +++
+ src/signond/signonidentity.cpp | 13 ++++++++-----
+ src/signond/signonidentity.h | 1 +
+ 4 files changed, 40 insertions(+), 6 deletions(-)
+
+diff --git a/src/signond/signondaemonadaptor.cpp b/src/signond/signondaemonadaptor.cpp
+index 8b35e4bd..abd8fd3a 100644
+--- a/src/signond/signondaemonadaptor.cpp
++++ b/src/signond/signondaemonadaptor.cpp
+@@ -29,6 +29,13 @@
+
+ namespace SignonDaemonNS {
+
++struct RegisteredIdentity {
++ RegisteredIdentity(const QDBusConnection &connection, QObject *identity)
++ : conn(connection), ident(identity) {}
++ QDBusConnection conn;
++ QObject *ident = nullptr;
++};
++
+ SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
+ QDBusAbstractAdaptor(parent),
+ m_parent(parent)
+@@ -38,6 +45,7 @@ SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
+
+ SignonDaemonAdaptor::~SignonDaemonAdaptor()
+ {
++ qDeleteAll(m_registeredIdentities);
+ }
+
+ void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
+@@ -46,7 +54,10 @@ void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
+ Q_UNUSED(applicationContext);
+
+ QObject *identity = m_parent->registerNewIdentity();
+- objectPath = registerObject(parentDBusContext().connection(), identity);
++ QDBusConnection dbusConnection(parentDBusContext().connection());
++ objectPath = registerObject(dbusConnection, identity);
++ m_registeredIdentities.append(new RegisteredIdentity(dbusConnection, identity));
++ connect(identity, SIGNAL(unregistered()), this, SLOT(onIdentityUnregistered()));
+
+ SignonDisposable::destroyUnused();
+ }
+@@ -130,6 +141,22 @@ void SignonDaemonAdaptor::getIdentity(const quint32 id,
+ SignonDisposable::destroyUnused();
+ }
+
++void SignonDaemonAdaptor::onIdentityUnregistered()
++{
++ QObject *ident = sender();
++ if (!ident) {
++ return;
++ }
++
++ for (int i = 0; i < m_registeredIdentities.size(); ++i) {
++ if (m_registeredIdentities[i]->ident == ident) {
++ m_registeredIdentities[i]->conn.unregisterObject(ident->objectName());
++ delete m_registeredIdentities.takeAt(i);
++ return;
++ }
++ }
++}
++
+ void SignonDaemonAdaptor::onIdentityAccessReplyFinished()
+ {
+ SignOn::AccessReply *reply = qobject_cast<SignOn::AccessReply*>(sender());
+diff --git a/src/signond/signondaemonadaptor.h b/src/signond/signondaemonadaptor.h
+index db8d875f..1c20cac3 100644
+--- a/src/signond/signondaemonadaptor.h
++++ b/src/signond/signondaemonadaptor.h
+@@ -34,6 +34,7 @@
+ namespace SignonDaemonNS {
+
+ typedef QList<QVariantMap> MapList;
++class RegisteredIdentity;
+
+ class SignonDaemonAdaptor: public QDBusAbstractAdaptor
+ {
+@@ -74,10 +75,12 @@ private:
+ QObject *object);
+
+ private Q_SLOTS:
++ void onIdentityUnregistered();
+ void onIdentityAccessReplyFinished();
+ void onAuthSessionAccessReplyFinished();
+
+ private:
++ QList<RegisteredIdentity*> m_registeredIdentities;
+ SignonDaemon *m_parent;
+ }; //class SignonDaemonAdaptor
+
+diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp
+index ce1ecfb0..a143c223 100644
+--- a/src/signond/signonidentity.cpp
++++ b/src/signond/signonidentity.cpp
+@@ -84,7 +84,8 @@ private:
+ SignonIdentity::SignonIdentity(quint32 id, int timeout,
+ SignonDaemon *parent):
+ SignonDisposable(timeout, parent),
+- m_pInfo(NULL)
++ m_pInfo(NULL),
++ m_destroyed(false)
+ {
+ m_id = id;
+
+@@ -112,7 +113,10 @@ SignonIdentity::SignonIdentity(quint32 id, int timeout,
+
+ SignonIdentity::~SignonIdentity()
+ {
+- emit unregistered();
++ if (!m_destroyed) {
++ m_destroyed = true;
++ Q_EMIT unregistered();
++ }
+
+ delete m_signonui;
+ delete m_pInfo;
+@@ -125,9 +129,8 @@ SignonIdentity *SignonIdentity::createIdentity(quint32 id, SignonDaemon *parent)
+
+ void SignonIdentity::destroy()
+ {
+- /* Emitting the destroyed signal makes QDBusConnection unregister the
+- * object */
+- Q_EMIT destroyed();
++ m_destroyed = true;
++ Q_EMIT unregistered();
+ deleteLater();
+ }
+
+diff --git a/src/signond/signonidentity.h b/src/signond/signonidentity.h
+index 9ec9be4e..f6321f30 100644
+--- a/src/signond/signonidentity.h
++++ b/src/signond/signonidentity.h
+@@ -96,6 +96,7 @@ private:
+ quint32 m_id;
+ SignonUiAdaptor *m_signonui;
+ SignonIdentityInfo *m_pInfo;
++ bool m_destroyed;
+ }; //class SignonDaemon
+
+ } //namespace SignonDaemonNS
+--
+2.26.2
+
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
new file mode 100644
index 00000000000..b1040feb3ec
--- /dev/null
+++ b/net-libs/signond/signond-8.60-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Signon daemon for libaccounts-glib"
+HOMEPAGE="https://gitlab.com/accounts-sso"
+SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ net-libs/libproxy
+"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-buildsystem.patch"
+ "${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
+ "${FILESDIR}/${P}-crashfix.patch"
+)
+
+S="${WORKDIR}/${PN}-VERSION_${PV}"
+
+src_prepare() {
+ default
+
+ # 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
+
+ # std flags
+ sed -e "/CONFIG += c++11/d" \
+ -i common-project-config.pri || die "failed fixing CXXFLAGS"
+
+ # fix runtime failures
+ sed -e "/fno-rtti/d" \
+ -i common-project-config.pri src/plugins/plugins.pri \
+ src/{remotepluginprocess/remotepluginprocess,extensions/cryptsetup/cryptsetup}.pro \
+ tests/{signond-tests/signond-tests,extensions/extensions}.pri \
+ tests/{passwordplugintest/passwordplugintest,libsignon-qt-tests/libsignon-qt-tests}.pro \
+ || die "failed disabling -fno-rtti"
+
+ 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"
+}
+
+src_configure() {
+ eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir)
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/, net-libs/signond/files/
@ 2020-06-07 9:30 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-06-07 9:30 UTC (permalink / raw
To: gentoo-commits
commit: 99cf5d18d565dbfe4570e7456c79ad6f59c3e8ae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 7 09:02:58 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 09:30:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99cf5d18
net-libs/signond: Drop bogus dependency
Closes: https://bugs.gentoo.org/727346
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/signond/files/signond-8.60-unused-dep.patch | 10 ++++++++++
net-libs/signond/signond-8.60-r2.ebuild | 1 +
2 files changed, 11 insertions(+)
diff --git a/net-libs/signond/files/signond-8.60-unused-dep.patch b/net-libs/signond/files/signond-8.60-unused-dep.patch
new file mode 100644
index 00000000000..dd32af041d4
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-unused-dep.patch
@@ -0,0 +1,10 @@
+--- a/tests/signond-tests/signond-tests.pri 2020-06-07 10:57:19.327456979 +0200
++++ b/tests/signond-tests/signond-tests.pri 2020-06-07 11:00:39.866322814 +0200
+@@ -6,7 +6,6 @@
+ QT += core \
+ sql \
+ testlib \
+- xml \
+ network \
+ dbus
+
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
index b1040feb3ec..e704d007dd6 100644
--- a/net-libs/signond/signond-8.60-r2.ebuild
+++ b/net-libs/signond/signond-8.60-r2.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${P}-buildsystem.patch"
"${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
"${FILESDIR}/${P}-crashfix.patch"
+ "${FILESDIR}/${P}-unused-dep.patch" # bug 727346
)
S="${WORKDIR}/${PN}-VERSION_${PV}"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/, net-libs/signond/files/
@ 2022-05-15 10:55 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-05-15 10:55 UTC (permalink / raw
To: gentoo-commits
commit: ebc51a6566126cd0981ce681cf4a7adc98b79a49
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 10:39:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 15 10:55:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc51a65
net-libs/signond: Drop 8.60-r2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/signond/Manifest | 1 -
net-libs/signond/files/signond-8.60-crashfix.patch | 160 ---------------------
.../signond/files/signond-8.60-drop-fno-rtti.patch | 123 ----------------
net-libs/signond/signond-8.60-r2.ebuild | 67 ---------
4 files changed, 351 deletions(-)
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index c66ce3941787..9e1ac2b6a93d 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,2 +1 @@
-DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
DIST signond-8.61.tar.gz 282965 BLAKE2B 8ab8f4ac3f8416ef9c1b8d8c73057ffcf0024a7e3cf6c2fa97a3119826f6c655b215e2530137c199e60e9e9518b0858fa1a23a3f107c71751f33d2a34898a610 SHA512 1652ee8e97d6aee036075f5416909649c5848e33c3c71f367176f3e5d6f9c360fd7a46c65ba877d58b3ae8fb8df0712938c5e073409ba945d66d8afeacfd6f72
diff --git a/net-libs/signond/files/signond-8.60-crashfix.patch b/net-libs/signond/files/signond-8.60-crashfix.patch
deleted file mode 100644
index 8cfc79ac431e..000000000000
--- a/net-libs/signond/files/signond-8.60-crashfix.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From ab9fab9763277783363f8c6d4b62405c3b0b0413 Mon Sep 17 00:00:00 2001
-From: Chris Adams <chris.adams@jollamobile.com>
-Date: Wed, 31 Jul 2019 12:45:14 +1000
-Subject: [PATCH] Don't emit QObject::destroyed() within Identity::destroy()
-
-QObject::destroyed() should not be emitted manually, as that can
-cause unwanted side effects.
-
-Specifically, in this case, the
-QDBusConnectionPrivate::objectDestroyed() slot was invoked with
-invalidated object parameter (perhaps due to duplicate invocation)
-resulting in a warning in QObject::disconnect().
-
-Instead, ensure the object is unregistered from DBus immediately.
----
- src/signond/signondaemonadaptor.cpp | 29 ++++++++++++++++++++++++++++-
- src/signond/signondaemonadaptor.h | 3 +++
- src/signond/signonidentity.cpp | 13 ++++++++-----
- src/signond/signonidentity.h | 1 +
- 4 files changed, 40 insertions(+), 6 deletions(-)
-
-diff --git a/src/signond/signondaemonadaptor.cpp b/src/signond/signondaemonadaptor.cpp
-index 8b35e4bd..abd8fd3a 100644
---- a/src/signond/signondaemonadaptor.cpp
-+++ b/src/signond/signondaemonadaptor.cpp
-@@ -29,6 +29,13 @@
-
- namespace SignonDaemonNS {
-
-+struct RegisteredIdentity {
-+ RegisteredIdentity(const QDBusConnection &connection, QObject *identity)
-+ : conn(connection), ident(identity) {}
-+ QDBusConnection conn;
-+ QObject *ident = nullptr;
-+};
-+
- SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
- QDBusAbstractAdaptor(parent),
- m_parent(parent)
-@@ -38,6 +45,7 @@ SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
-
- SignonDaemonAdaptor::~SignonDaemonAdaptor()
- {
-+ qDeleteAll(m_registeredIdentities);
- }
-
- void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
-@@ -46,7 +54,10 @@ void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
- Q_UNUSED(applicationContext);
-
- QObject *identity = m_parent->registerNewIdentity();
-- objectPath = registerObject(parentDBusContext().connection(), identity);
-+ QDBusConnection dbusConnection(parentDBusContext().connection());
-+ objectPath = registerObject(dbusConnection, identity);
-+ m_registeredIdentities.append(new RegisteredIdentity(dbusConnection, identity));
-+ connect(identity, SIGNAL(unregistered()), this, SLOT(onIdentityUnregistered()));
-
- SignonDisposable::destroyUnused();
- }
-@@ -130,6 +141,22 @@ void SignonDaemonAdaptor::getIdentity(const quint32 id,
- SignonDisposable::destroyUnused();
- }
-
-+void SignonDaemonAdaptor::onIdentityUnregistered()
-+{
-+ QObject *ident = sender();
-+ if (!ident) {
-+ return;
-+ }
-+
-+ for (int i = 0; i < m_registeredIdentities.size(); ++i) {
-+ if (m_registeredIdentities[i]->ident == ident) {
-+ m_registeredIdentities[i]->conn.unregisterObject(ident->objectName());
-+ delete m_registeredIdentities.takeAt(i);
-+ return;
-+ }
-+ }
-+}
-+
- void SignonDaemonAdaptor::onIdentityAccessReplyFinished()
- {
- SignOn::AccessReply *reply = qobject_cast<SignOn::AccessReply*>(sender());
-diff --git a/src/signond/signondaemonadaptor.h b/src/signond/signondaemonadaptor.h
-index db8d875f..1c20cac3 100644
---- a/src/signond/signondaemonadaptor.h
-+++ b/src/signond/signondaemonadaptor.h
-@@ -34,6 +34,7 @@
- namespace SignonDaemonNS {
-
- typedef QList<QVariantMap> MapList;
-+class RegisteredIdentity;
-
- class SignonDaemonAdaptor: public QDBusAbstractAdaptor
- {
-@@ -74,10 +75,12 @@ private:
- QObject *object);
-
- private Q_SLOTS:
-+ void onIdentityUnregistered();
- void onIdentityAccessReplyFinished();
- void onAuthSessionAccessReplyFinished();
-
- private:
-+ QList<RegisteredIdentity*> m_registeredIdentities;
- SignonDaemon *m_parent;
- }; //class SignonDaemonAdaptor
-
-diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp
-index ce1ecfb0..a143c223 100644
---- a/src/signond/signonidentity.cpp
-+++ b/src/signond/signonidentity.cpp
-@@ -84,7 +84,8 @@ private:
- SignonIdentity::SignonIdentity(quint32 id, int timeout,
- SignonDaemon *parent):
- SignonDisposable(timeout, parent),
-- m_pInfo(NULL)
-+ m_pInfo(NULL),
-+ m_destroyed(false)
- {
- m_id = id;
-
-@@ -112,7 +113,10 @@ SignonIdentity::SignonIdentity(quint32 id, int timeout,
-
- SignonIdentity::~SignonIdentity()
- {
-- emit unregistered();
-+ if (!m_destroyed) {
-+ m_destroyed = true;
-+ Q_EMIT unregistered();
-+ }
-
- delete m_signonui;
- delete m_pInfo;
-@@ -125,9 +129,8 @@ SignonIdentity *SignonIdentity::createIdentity(quint32 id, SignonDaemon *parent)
-
- void SignonIdentity::destroy()
- {
-- /* Emitting the destroyed signal makes QDBusConnection unregister the
-- * object */
-- Q_EMIT destroyed();
-+ m_destroyed = true;
-+ Q_EMIT unregistered();
- deleteLater();
- }
-
-diff --git a/src/signond/signonidentity.h b/src/signond/signonidentity.h
-index 9ec9be4e..f6321f30 100644
---- a/src/signond/signonidentity.h
-+++ b/src/signond/signonidentity.h
-@@ -96,6 +96,7 @@ private:
- quint32 m_id;
- SignonUiAdaptor *m_signonui;
- SignonIdentityInfo *m_pInfo;
-+ bool m_destroyed;
- }; //class SignonDaemon
-
- } //namespace SignonDaemonNS
---
-2.26.2
-
diff --git a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
deleted file mode 100644
index 175d88361c43..000000000000
--- a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From e21867fa27e32f5391d73d145eef1c8d908dee44 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 18 Jun 2020 10:22:04 +0200
-Subject: [PATCH] Don't use -fno-rtti
-
-QProcess uses typeid and crashes otherwise.
----
- common-project-config.pri | 2 --
- src/extensions/cryptsetup/cryptsetup.pro | 1 -
- src/plugins/plugins.pri | 3 +--
- src/remotepluginprocess/remotepluginprocess.pro | 3 +--
- tests/extensions/extensions.pri | 3 +--
- tests/libsignon-qt-tests/libsignon-qt-tests.pro | 3 +--
- tests/passwordplugintest/passwordplugintest.pro | 3 +--
- tests/signond-tests/signond-tests.pri | 3 +--
- 8 files changed, 6 insertions(+), 15 deletions(-)
-
-diff --git a/common-project-config.pri b/common-project-config.pri
-index 606f70bb..abe6cf6d 100644
---- a/common-project-config.pri
-+++ b/common-project-config.pri
-@@ -13,8 +13,6 @@ RCC_DIR = resources
-
- # we don't like warnings...
- QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
--# Disable RTTI
--QMAKE_CXXFLAGS += -fno-rtti
- # Disable exceptions
- CONFIG += exceptions_off
- # Use C++11
-diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro
-index f4b6e53b..5cc214e4 100644
---- a/src/extensions/cryptsetup/cryptsetup.pro
-+++ b/src/extensions/cryptsetup/cryptsetup.pro
-@@ -29,7 +29,6 @@ QT -= gui
-
- QMAKE_CXXFLAGS += \
- -fno-exceptions \
-- -fno-rtti \
- -fvisibility=hidden
-
- DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
-index 2c03e743..074896d5 100644
---- a/src/plugins/plugins.pri
-+++ b/src/plugins/plugins.pri
-@@ -22,8 +22,7 @@ LIBS += -lsignon-plugins
- QMAKE_LIBDIR += \
- $${TOP_BUILD_DIR}/lib/plugins
-
--QMAKE_CXXFLAGS += -fno-exceptions \
-- -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
-
- headers.path = $${INSTALL_PREFIX}/include/signon-plugins
-
-diff --git a/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro
-index 7c2ea007..36b4cbe0 100644
---- a/src/remotepluginprocess/remotepluginprocess.pro
-+++ b/src/remotepluginprocess/remotepluginprocess.pro
-@@ -40,8 +40,7 @@ LIBS += \
- -lsignon-plugins-common \
- -lsignon-plugins
-
--QMAKE_CXXFLAGS += -fno-exceptions \
-- -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
-
- #DEFINES += QT_NO_CAST_TO_ASCII \
- # QT_NO_CAST_FROM_ASCII
-diff --git a/tests/extensions/extensions.pri b/tests/extensions/extensions.pri
-index 179cd28d..2fd75955 100644
---- a/tests/extensions/extensions.pri
-+++ b/tests/extensions/extensions.pri
-@@ -20,5 +20,4 @@ INCLUDEPATH += . \
- $$TOP_SRC_DIR/lib/signond
-
- QMAKE_CXXFLAGS += \
-- -fno-exceptions \
-- -fno-rtti
-+ -fno-exceptions
-diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-index 43f2d59f..ac87781d 100644
---- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-+++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-@@ -36,8 +36,7 @@ INCLUDEPATH += . \
- $$TOP_SRC_DIR/src/plugins/test
- DEFINES += SSO_CI_TESTMANAGEMENT
- DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}"
--QMAKE_CXXFLAGS += -fno-exceptions \
-- -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
-
- check.depends = $$TARGET
- check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./libsignon-qt-tests"
-diff --git a/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro
-index 6132921e..ce16fdcf 100644
---- a/tests/passwordplugintest/passwordplugintest.pro
-+++ b/tests/passwordplugintest/passwordplugintest.pro
-@@ -19,5 +19,4 @@ INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \
- $${TOP_SRC_DIR}/src/plugins \
- $${TOP_SRC_DIR}/lib
-
--QMAKE_CXXFLAGS += -fno-exceptions \
-- -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
-diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri
-index 1bbd5a15..e95556ba 100644
---- a/tests/signond-tests/signond-tests.pri
-+++ b/tests/signond-tests/signond-tests.pri
-@@ -34,8 +34,7 @@ INCLUDEPATH += . \
- $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \
- $${TOP_SRC_DIR}/lib \
-
--QMAKE_CXXFLAGS += -fno-exceptions \
-- -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
-
- check.depends = $$TARGET
- check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./$$TARGET"
---
-GitLab
-
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
deleted file mode 100644
index f9995daf5819..000000000000
--- a/net-libs/signond/signond-8.60-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://gitlab.com/accounts-sso"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="doc test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- net-libs/libproxy
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-# tests are brittle; they all pass when stars align, bug 727666
-RESTRICT="test !test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${P}-buildsystem.patch"
- "${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
- "${FILESDIR}/${P}-crashfix.patch"
- "${FILESDIR}/${P}-unused-dep.patch" # bug 727346
- "${FILESDIR}/${P}-drop-fno-rtti.patch" # runtime crashes
-)
-
-S="${WORKDIR}/${PN}-VERSION_${PV}"
-
-src_prepare() {
- default
-
- # 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"
-}
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir)
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/, net-libs/signond/files/
@ 2024-06-29 16:34 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-06-29 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 08805e6d237058912c319c69af2beffc950a888a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 20:39:06 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 16:33:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08805e6d
net-libs/signond: drop 8.61
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-libs/signond/Manifest | 1 -
.../files/signond-8.60-consistent-paths.patch | 266 ---------------------
net-libs/signond/signond-8.61.ebuild | 80 -------
3 files changed, 347 deletions(-)
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index f62f3f43ee5a..6c69363a696f 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,2 +1 @@
DIST signond-8.61.tar.bz2 203066 BLAKE2B 2f78e08143d346777ab3517ef6b76b54ab1b17efa6d15b2c5a16487c2e11f38c88cb2820bff8dd04deb334d0c178c16bd061c0eba694c5edfb0e31411581648a SHA512 95e83bc672792ec10493f1f456788af7e8051ce0bed6b047b6b6f5fa9ac019dd3392063152930be49cf68d590567fd7467c544d642cc58624b1aabdc0b405258
-DIST signond-8.61.tar.gz 282965 BLAKE2B 8ab8f4ac3f8416ef9c1b8d8c73057ffcf0024a7e3cf6c2fa97a3119826f6c655b215e2530137c199e60e9e9518b0858fa1a23a3f107c71751f33d2a34898a610 SHA512 1652ee8e97d6aee036075f5416909649c5848e33c3c71f367176f3e5d6f9c360fd7a46c65ba877d58b3ae8fb8df0712938c5e073409ba945d66d8afeacfd6f72
diff --git a/net-libs/signond/files/signond-8.60-consistent-paths.patch b/net-libs/signond/files/signond-8.60-consistent-paths.patch
deleted file mode 100644
index 6743a92678af..000000000000
--- a/net-libs/signond/files/signond-8.60-consistent-paths.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From 62ce2305081075a53836999441214f03d37b50b5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 28 Jun 2020 21:44:42 +0200
-Subject: [PATCH 3/3] Consistent overrideable install paths
-
-At least signon-plugins.pc and signon-plugins-common.pc were getting it wrong.
-
-This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath
-INSTALL_PREFIX.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- common-installs-config.pri | 2 +-
- common-pkgconfig.pri | 2 +-
- common-project-config.pri | 30 +++++++++----------
- lib/SignOn/SignOnQt5Config.cmake.in | 6 ++--
- lib/SignOn/libsignon-qt.pc.in | 2 +-
- lib/SignOn/libsignon-qt.pri | 2 +-
- lib/SignOn/libsignon-qt5.pc.in | 2 +-
- .../signon-plugins-common.pc.in | 4 +--
- lib/plugins/signon-plugins.pc.in | 4 +--
- lib/signond/SignOn/SignOnExtension.pc.in | 2 +-
- lib/signond/signond.pc.in | 2 +-
- src/extensions/cryptsetup/cryptsetup.pro | 2 +-
- src/plugins/plugins.pri | 4 +--
- 13 files changed, 32 insertions(+), 32 deletions(-)
-
-diff --git a/common-installs-config.pri b/common-installs-config.pri
-index 69c5ae8..b72477a 100644
---- a/common-installs-config.pri
-+++ b/common-installs-config.pri
-@@ -18,7 +18,7 @@ contains( TEMPLATE, app ) {
- # default installation target for libraries
- #-----------------------------------------------------------------------------
- contains( TEMPLATE, lib ) {
-- target.path = $${INSTALL_LIBDIR}
-+ target.path = $${INSTALL_PREFIX}/$${LIBDIR}
- INSTALLS += target
- message("====")
- message("==== INSTALLS += target")
-diff --git a/common-pkgconfig.pri b/common-pkgconfig.pri
-index 975068a..9f010d3 100644
---- a/common-pkgconfig.pri
-+++ b/common-pkgconfig.pri
-@@ -3,7 +3,7 @@
- !isEmpty(pkgconfig.files) {
- QMAKE_SUBSTITUTES += $${pkgconfig.files}.in
- pkgconfig.CONFIG = no_check_exist
-- pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig
-+ pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig
- QMAKE_EXTRA_TARGETS += pkgconfig
-
- QMAKE_CLEAN += $${pkgconfig.files}
-diff --git a/common-project-config.pri b/common-project-config.pri
-index 606f70b..1185559 100644
---- a/common-project-config.pri
-+++ b/common-project-config.pri
-@@ -57,36 +57,36 @@ exists( meego-release ) {
- ARCH = $$system(uname -m)
- }
-
--linux-g++-64|linux-icc-64: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
--else: linux-g++-32|linux-icc-32: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib32
--else: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
-+linux-g++-64|linux-icc-64: DEFAULT_LIBDIR = lib64
-+else: linux-g++-32|linux-icc-32: DEFAULT_LIBDIR = lib32
-+else: DEFAULT_LIBDIR = lib
-
- # default library directory can be overriden by defining LIBDIR when
- # running qmake
- isEmpty( LIBDIR ) {
-+ LIBDIR = $${DEFAULT_LIBDIR}
- message("====")
-- message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'")
-- message("==== (current installation path is `$${INSTALL_LIBDIR}')")
-+ message("==== NOTE: To override the library dir beneath INSTALL_PREFIX run: `qmake LIBDIR=customdir'")
-+ message("==== (current library dir is `$${LIBDIR}`, install path `$${INSTALL_PREFIX}/$${LIBDIR}')")
- } else {
-- INSTALL_LIBDIR = $${LIBDIR}
- message("====")
-- message("==== library install path set to `$${INSTALL_LIBDIR}'")
-+ message("==== library dir set to `$${LIBDIR}`, install path `$${INSTALL_PREFIX}/$${LIBDIR}'")
- }
-
--isEmpty ( CMAKE_CONFIG_PATH ) {
-- CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake/$${CMAKE_BASENAME}
-+isEmpty ( CMAKE_MODULE_DIR ) {
-+ CMAKE_MODULE_DIR = $${LIBDIR}/cmake/$${CMAKE_BASENAME}
- message("====")
-- message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'")
-- message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')")
-+ message("==== NOTE: To override the cmake module dir beneath INSTALL_PREFIX run: `qmake CMAKE_MODULE_DIR=customdir'")
-+ message("==== (current cmake module dir is `$${CMAKE_MODULE_DIR}`, install path `$${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}')")
- } else {
- message("====")
-- message("==== cmake module install path set to `$${CMAKE_CONFIG_PATH}'")
-+ message("==== cmake module dir set to `$${CMAKE_MODULE_DIR}', install path `$${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}')")
- }
-
- # Default directory for signond extensions
- _EXTENSIONS = $$(SIGNOND_EXTENSIONS_DIR)
- isEmpty(_EXTENSIONS) {
-- SIGNOND_EXTENSIONS_DIR = $${INSTALL_LIBDIR}/signon/extensions
-+ SIGNOND_EXTENSIONS_DIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon/extensions
- } else {
- SIGNOND_EXTENSIONS_DIR = $$_EXTENSIONS
- }
-@@ -94,7 +94,7 @@ SIGNOND_EXTENSIONS_DIR_QUOTED = \\\"$$SIGNOND_EXTENSIONS_DIR\\\"
-
- _PLUGINS = $$(SIGNOND_PLUGINS_DIR)
- isEmpty(_PLUGINS) {
-- SIGNOND_PLUGINS_DIR = $${INSTALL_LIBDIR}/signon
-+ SIGNOND_PLUGINS_DIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon
- } else {
- SIGNOND_PLUGINS_DIR = $$_PLUGINS
- }
-@@ -102,7 +102,7 @@ SIGNOND_PLUGINS_DIR_QUOTED = \\\"$$SIGNOND_PLUGINS_DIR\\\"
-
- # Note that you have to CONFIG+=install_tests in order to install tests
- isEmpty(TESTDIR) {
-- INSTALL_TESTDIR = $${INSTALL_LIBDIR}/signon
-+ INSTALL_TESTDIR = $${INSTALL_PREFIX}/$${LIBDIR}/signon
- } else {
- INSTALL_TESTDIR = $${TESTDIR}
- }
-diff --git a/lib/SignOn/SignOnQt5Config.cmake.in b/lib/SignOn/SignOnQt5Config.cmake.in
-index 523fffb..7105315 100644
---- a/lib/SignOn/SignOnQt5Config.cmake.in
-+++ b/lib/SignOn/SignOnQt5Config.cmake.in
-@@ -2,6 +2,6 @@
- # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt
- # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt
-
--set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
--set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a)
--set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET})
-\ No newline at end of file
-+set(SIGNONQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so)
-+set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.a)
-+set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET})
-diff --git a/lib/SignOn/libsignon-qt.pc.in b/lib/SignOn/libsignon-qt.pc.in
-index 26f0f5b..c614541 100644
---- a/lib/SignOn/libsignon-qt.pc.in
-+++ b/lib/SignOn/libsignon-qt.pc.in
-@@ -1,6 +1,6 @@
- prefix=$$INSTALL_PREFIX
- exec_prefix=${prefix}
--libdir=$$INSTALL_LIBDIR
-+libdir=${prefix}/$$LIBDIR
- includedir=${prefix}/include
-
- Name: libsignon-qt
-diff --git a/lib/SignOn/libsignon-qt.pri b/lib/SignOn/libsignon-qt.pri
-index 1458c50..d80f8bb 100644
---- a/lib/SignOn/libsignon-qt.pri
-+++ b/lib/SignOn/libsignon-qt.pri
-@@ -79,6 +79,6 @@ QMAKE_SUBSTITUTES += $${CMAKE_BASENAME}Config.cmake.in \
- $${CMAKE_BASENAME}ConfigVersion.cmake.in
- cmake_modules.files = $${CMAKE_BASENAME}Config.cmake \
- $${CMAKE_BASENAME}ConfigVersion.cmake
--cmake_modules.path = $${CMAKE_CONFIG_PATH}
-+cmake_modules.path = $${INSTALL_PREFIX}/$${CMAKE_MODULE_DIR}
-
- INSTALLS += cmake_modules
-diff --git a/lib/SignOn/libsignon-qt5.pc.in b/lib/SignOn/libsignon-qt5.pc.in
-index 2181359..5d98b6d 100644
---- a/lib/SignOn/libsignon-qt5.pc.in
-+++ b/lib/SignOn/libsignon-qt5.pc.in
-@@ -1,6 +1,6 @@
- prefix=$$INSTALL_PREFIX
- exec_prefix=${prefix}
--libdir=$$INSTALL_LIBDIR
-+libdir=${prefix}/$$LIBDIR
- includedir=${prefix}/include
-
- Name: libsignon-qt5
-diff --git a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in
-index 3d7f3db..2240789 100644
---- a/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in
-+++ b/lib/plugins/signon-plugins-common/signon-plugins-common.pc.in
-@@ -1,10 +1,10 @@
- prefix=$$INSTALL_PREFIX
- exec_prefix=${prefix}
--libdir=$$INSTALL_LIBDIR
-+libdir=${prefix}/$$LIBDIR
- includedir=${prefix}/include
- plugin_includedir=${includedir}/signon-plugins/SignOn
- Name: signon-plugins-common
- Description: SignonPluginsCommon
- Version: $$PROJECT_VERSION
--Libs.private: -L/usr/lib -lQt5Core
-+Libs.private: -L${libdir} -lQt5Core
- Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn
-diff --git a/lib/plugins/signon-plugins.pc.in b/lib/plugins/signon-plugins.pc.in
-index 5be38df..2e3c087 100644
---- a/lib/plugins/signon-plugins.pc.in
-+++ b/lib/plugins/signon-plugins.pc.in
-@@ -1,6 +1,6 @@
- prefix=$$INSTALL_PREFIX
- exec_prefix=${prefix}
--libdir=$$INSTALL_LIBDIR
-+libdir=${prefix}/$$LIBDIR
- includedir=${prefix}/include
- plugin_includedir=${includedir}/signon-plugins/SignOn
- plugindir=$$SIGNOND_PLUGINS_DIR
-@@ -8,6 +8,6 @@ Name: signon-plugins
- Description: SignonPlugins
- Version: $$PROJECT_VERSION
- Requires: $${LIBSIGNON}
--Libs.private: -L/usr/lib -lQt5Core
-+Libs.private: -L${libdir} -lQt5Core
- Cflags: -I${includedir}/signon-plugins -I${includedir}/signon-plugins/SignOn
- Libs: -lsignon-plugins
-diff --git a/lib/signond/SignOn/SignOnExtension.pc.in b/lib/signond/SignOn/SignOnExtension.pc.in
-index e439284..8fc669c 100644
---- a/lib/signond/SignOn/SignOnExtension.pc.in
-+++ b/lib/signond/SignOn/SignOnExtension.pc.in
-@@ -1,6 +1,6 @@
- prefix=$$INSTALL_PREFIX
- exec_prefix=${prefix}
--libdir=$$INSTALL_LIBDIR
-+libdir=${prefix}/$$LIBDIR
- includedir=${prefix}/include
- plugindir=$$SIGNOND_EXTENSIONS_DIR
-
-diff --git a/lib/signond/signond.pc.in b/lib/signond/signond.pc.in
-index a7b5036..9ec0b1a 100644
---- a/lib/signond/signond.pc.in
-+++ b/lib/signond/signond.pc.in
-@@ -1,6 +1,6 @@
- prefix=$$INSTALL_PREFIX
- exec_prefix=${prefix}
--libdir=$$INSTALL_LIBDIR
-+libdir=${prefix}/$$LIBDIR
- includedir=${prefix}/include
-
- Name: signond-dev
-diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro
-index f4b6e53..2657b47 100644
---- a/src/extensions/cryptsetup/cryptsetup.pro
-+++ b/src/extensions/cryptsetup/cryptsetup.pro
-@@ -41,6 +41,6 @@ LIBS += \
-
- include( $${TOP_SRC_DIR}/common-installs-config.pri )
-
--target.path = $${INSTALL_LIBDIR}/signon/extensions
-+target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon/extensions
- INSTALLS += target
-
-diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
-index 2c03e74..ea2fcb2 100644
---- a/src/plugins/plugins.pri
-+++ b/src/plugins/plugins.pri
-@@ -27,7 +27,7 @@ QMAKE_CXXFLAGS += -fno-exceptions \
-
- headers.path = $${INSTALL_PREFIX}/include/signon-plugins
-
--pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig
-+pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig
-
--target.path = $${INSTALL_LIBDIR}/signon
-+target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon
- INSTALLS = target
---
-2.27.0
-
diff --git a/net-libs/signond/signond-8.61.ebuild b/net-libs/signond/signond-8.61.ebuild
deleted file mode 100644
index 6f21b1bec048..000000000000
--- a/net-libs/signond/signond-8.61.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://gitlab.com/accounts-sso"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-VERSION_${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="doc test"
-
-# tests are brittle; they all pass when stars align, bug 727666
-RESTRICT="test !test? ( test )"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- net-libs/libproxy
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
- doc? (
- app-text/doxygen[dot]
- dev-qt/qthelp:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-8.60-buildsystem.patch"
- "${FILESDIR}/${PN}-8.60-consistent-paths.patch" # bug 701142
- "${FILESDIR}/${PN}-8.60-unused-dep.patch" # bug 727346
-)
-
-src_prepare() {
- default
-
- sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt5_get_bindir)/&|" \
- -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"
-}
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir)
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-29 16:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-29 16:34 [gentoo-commits] repo/gentoo:master commit in: net-libs/signond/, net-libs/signond/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-05-15 10:55 Andreas Sturmlechner
2020-06-07 9:30 Andreas Sturmlechner
2020-06-05 0:39 Andreas Sturmlechner
2016-03-22 14:41 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox