diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-09-12 15:29:40 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-09-12 22:32:55 +0200 |
commit | d94e4d403a72074c80a12e088cfb2ed055669d76 (patch) | |
tree | ca9547cd2515508030ce07f6ac893e7fdd5c4b5d /kde-frameworks/kwallet | |
parent | kde-frameworks/kirigami: Drop old (diff) | |
download | gentoo-d94e4d403a72074c80a12e088cfb2ed055669d76.tar.gz gentoo-d94e4d403a72074c80a12e088cfb2ed055669d76.tar.bz2 gentoo-d94e4d403a72074c80a12e088cfb2ed055669d76.zip |
kde-frameworks: Drop KDE Frameworks 5.34.0
Except ECM which is required for hppa.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'kde-frameworks/kwallet')
7 files changed, 0 insertions, 325 deletions
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest index 122f45fe35c5..da518adc83e0 100644 --- a/kde-frameworks/kwallet/Manifest +++ b/kde-frameworks/kwallet/Manifest @@ -1,3 +1,2 @@ -DIST kwallet-5.34.0.tar.xz 303892 SHA256 e537d561b536802bd0d881638a6068d8383d1f2497e9ad85c5c596aa746be323 SHA512 19a3a6e8f77e0a566befba7bc72ecdc7b870773944176247b53af312b475a0a00fbd5403cef8de6393cf8261c43627c947084231201a51074b8955ffe5989568 WHIRLPOOL 5e25beef155f3e167a26e6cda9d17c2f0ae3b95e7a04032c20e8af35ac8b252b06d6efa7f3cef9761cc319f985591fa79844cc5567fe4b2c1a38c3be0116fbef DIST kwallet-5.37.0.tar.xz 303728 SHA256 5fc368410da498dcd9eb9d5b7119f37c87f3a6b9859bbb2ce4a2ff0cfca0f2d0 SHA512 2b15caca7459e367f07d2aad98859db08f9e6bd337348ab63abd671dc45a434bf305e18e044b469a981c12661ce4dac2407af8b2dac7c3d0588a7b6f907548af WHIRLPOOL 71b238d749faf13e22a98a6763591fd51d708c92fc5ac329b1c1ec7c550c0efa2b8c0175c6be90c145331f6d1679b1d04c1faa37bad212c5be57e505d1edcf77 DIST kwallet-5.38.0.tar.xz 303756 SHA256 dc06fe8917cf5ea61251e42e9c7e9e5662eb223aace1bf8ee4becf6a896cdae3 SHA512 e66266015c674a7ba731fc5c37fe2bed1edf18645393793b6dfa552dcc1fb93227db73913503961f46d72c5c71b11c807d61a1bb0980f5ac1d62bab59efa72db WHIRLPOOL ef012950f779d127146f149ce8bc2c9c452583bc29b0add296fe516102ac9bd258dd794a2eacc28e794201ae6b385ff0ac2c522217893db78bc473e94c51526f diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-1.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-1.patch deleted file mode 100644 index e231369e7805..000000000000 --- a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-1.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bf775a9a9fa2c8ba66bf5106969b076c68ecedca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Sun, 31 May 2015 06:40:38 +0200 -Subject: [PATCH 1/5] Check for unique applicaton instance as early as possible -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Exit before KWalletD and the MigrationAgent has been initialized. -The return value is changed, but concurrent instatiation of kwalletd is -not a fault. - -Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> ---- - src/runtime/kwalletd/main.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp -index ff96208..c98c1b3 100644 ---- a/src/runtime/kwalletd/main.cpp -+++ b/src/runtime/kwalletd/main.cpp -@@ -189,9 +189,10 @@ int main(int argc, char **argv) - aboutdata.addAuthor(i18n("George Staikos"), i18n("Former maintainer"), QStringLiteral("staikos@kde.org")); - aboutdata.addAuthor(i18n("Thiago Maceira"), i18n("D-Bus Interface"), QStringLiteral("thiago@kde.org")); - -+ KDBusService dbusUniqueInstance(KDBusService::Unique); -+ - KWalletD walletd; - MigrationAgent migrationAgent(&walletd, hash); -- KDBusService dbusUniqueInstance(KDBusService::Unique); - - // NOTE: the command should be parsed only after KDBusService instantiation - QCommandLineParser cmdParser; --- -2.12.0 - diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-2.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-2.patch deleted file mode 100644 index dd6a7833335b..000000000000 --- a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-2.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f63407a129910cac5b2f7bbf56a348932fdeb05a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Sun, 31 May 2015 06:56:44 +0200 -Subject: [PATCH 2/5] Only start timer for migration agent if necessary -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> ---- - src/runtime/kwalletd/migrationagent.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp -index f3da947..110a5e0 100644 ---- a/src/runtime/kwalletd/migrationagent.cpp -+++ b/src/runtime/kwalletd/migrationagent.cpp -@@ -41,7 +41,11 @@ MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) : - , _kde4_daemon(nullptr) - , _pam_hash(hash) - { -- QTimer::singleShot(100, this, SLOT(migrateWallets())); -+ if (isAlreadyMigrated()) { -+ qDebug() << "old wallets were already migrated"; -+ } else { -+ QTimer::singleShot(100, this, SLOT(migrateWallets())); -+ } - } - - void MigrationAgent::migrateWallets() -@@ -55,7 +59,7 @@ void MigrationAgent::migrateWallets() - // if the migration wizard returns without error - // create "alreadyMigrated=true" setting - qDebug() << "Migration agent starting..."; -- if (!isAlreadyMigrated()) { -+ { - if (connectOldDaemon()) { - if (!isEmptyOldWallet()) { - if (isMigrationWizardOk()) { -@@ -70,8 +74,6 @@ void MigrationAgent::migrateWallets() - } else { - qDebug() << "KDE4 kwalletd not present, stopping migration agent"; - } -- } else { -- qDebug() << "old wallets were already migrated"; - } - qDebug() << "Migration agent stop."; - } --- -2.12.0 - diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-3.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-3.patch deleted file mode 100644 index f993faf95cf8..000000000000 --- a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-3.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 574fdd416b5f6b0907826034916c03dddb08341a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Sun, 31 May 2015 06:47:55 +0200 -Subject: [PATCH 3/5] Whitespace fixup -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> ---- - src/runtime/kwalletd/migrationagent.cpp | 20 +++++++++----------- - 1 file changed, 9 insertions(+), 11 deletions(-) - -diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp -index 110a5e0..ec60812 100644 ---- a/src/runtime/kwalletd/migrationagent.cpp -+++ b/src/runtime/kwalletd/migrationagent.cpp -@@ -59,21 +59,19 @@ void MigrationAgent::migrateWallets() - // if the migration wizard returns without error - // create "alreadyMigrated=true" setting - qDebug() << "Migration agent starting..."; -- { -- if (connectOldDaemon()) { -- if (!isEmptyOldWallet()) { -- if (isMigrationWizardOk()) { -- setAlreadyMigrated(); -- } else { -- qDebug() << "Migration wizard returned an error or has been canceled. The migration agent will resume upon next daemon start"; -- } -- } else { -- qDebug() << "Old wallet is empty. No need to migrate."; -+ if (connectOldDaemon()) { -+ if (!isEmptyOldWallet()) { -+ if (isMigrationWizardOk()) { - setAlreadyMigrated(); -+ } else { -+ qDebug() << "Migration wizard returned an error or has been canceled. The migration agent will resume upon next daemon start"; - } - } else { -- qDebug() << "KDE4 kwalletd not present, stopping migration agent"; -+ qDebug() << "Old wallet is empty. No need to migrate."; -+ setAlreadyMigrated(); - } -+ } else { -+ qDebug() << "KDE4 kwalletd not present, stopping migration agent"; - } - qDebug() << "Migration agent stop."; - } --- -2.12.0 - diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-4.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-4.patch deleted file mode 100644 index a0cc6d73f518..000000000000 --- a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-4.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8d5636d8185cf3a572a9b81a9b9246eb6371685b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Sun, 31 May 2015 06:49:46 +0200 -Subject: [PATCH 4/5] Signal completion of migration agent -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> ---- - src/runtime/kwalletd/migrationagent.cpp | 4 ++++ - src/runtime/kwalletd/migrationagent.h | 1 + - 2 files changed, 5 insertions(+) - -diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp -index ec60812..6eb6013 100644 ---- a/src/runtime/kwalletd/migrationagent.cpp -+++ b/src/runtime/kwalletd/migrationagent.cpp -@@ -43,6 +43,7 @@ MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) : - { - if (isAlreadyMigrated()) { - qDebug() << "old wallets were already migrated"; -+ emit migrationFinished(); - } else { - QTimer::singleShot(100, this, SLOT(migrateWallets())); - } -@@ -63,15 +64,18 @@ void MigrationAgent::migrateWallets() - if (!isEmptyOldWallet()) { - if (isMigrationWizardOk()) { - setAlreadyMigrated(); -+ emit migrationFinished(); - } else { - qDebug() << "Migration wizard returned an error or has been canceled. The migration agent will resume upon next daemon start"; - } - } else { - qDebug() << "Old wallet is empty. No need to migrate."; - setAlreadyMigrated(); -+ emit migrationFinished(); - } - } else { - qDebug() << "KDE4 kwalletd not present, stopping migration agent"; -+ emit migrationFinished(); - } - qDebug() << "Migration agent stop."; - } -diff --git a/src/runtime/kwalletd/migrationagent.h b/src/runtime/kwalletd/migrationagent.h -index 0f6467c..9c974a0 100644 ---- a/src/runtime/kwalletd/migrationagent.h -+++ b/src/runtime/kwalletd/migrationagent.h -@@ -48,6 +48,7 @@ public Q_SLOTS: - - Q_SIGNALS: - void progressMessage(const QString &); -+ void migrationFinished(); - - private: - KWalletD *_kf5_daemon; --- -2.12.0 - diff --git a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-5.patch b/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-5.patch deleted file mode 100644 index 21f4a3509a99..000000000000 --- a/kde-frameworks/kwallet/files/kwallet-5.34.0-kwalletd4-5.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e9d8932d04a7882471f722800b7b4603074d560d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Sun, 31 May 2015 07:03:31 +0200 -Subject: [PATCH 5/5] Replace kwalletd4 after migration has finished -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -kwalletd5 can service both org.kde.kwalletd5 and org.kde.kwalletd - -Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> ---- - src/runtime/kwalletd/kwalletd.cpp | 13 +++++++++++++ - src/runtime/kwalletd/kwalletd.h | 1 + - src/runtime/kwalletd/migrationagent.cpp | 1 + - 3 files changed, 15 insertions(+) - -diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp -index 18ef9fa..da851da 100644 ---- a/src/runtime/kwalletd/kwalletd.cpp -+++ b/src/runtime/kwalletd/kwalletd.cpp -@@ -151,6 +151,19 @@ KWalletD::KWalletD() - SLOT(slotServiceOwnerChanged(QString, QString, QString))); - } - -+void KWalletD::registerKWalletd4Service() -+{ -+ auto bus = QDBusConnection::sessionBus().interface(); -+ auto reply = bus->registerService(QLatin1String("org.kde.kwalletd"), QDBusConnectionInterface::QueueService); -+ if (reply.isValid() && (reply.value() == QDBusConnectionInterface::ServiceQueued)) { -+ QDBusInterface _kde_kwalletd4("org.kde.kwalletd", "/MainApplication", "org.kde.KApplication"); -+ if (_kde_kwalletd4.isValid()) { -+ auto qreply = _kde_kwalletd4.call("quit"); -+ } -+ } -+ QDBusConnection::sessionBus().registerObject(QLatin1String("/modules/kwalletd"), this); -+} -+ - KWalletD::~KWalletD() - { - #ifdef Q_WS_X11 -diff --git a/src/runtime/kwalletd/kwalletd.h b/src/runtime/kwalletd/kwalletd.h -index 3571535..a862faf 100644 ---- a/src/runtime/kwalletd/kwalletd.h -+++ b/src/runtime/kwalletd/kwalletd.h -@@ -182,6 +182,7 @@ private Q_SLOTS: - void notifyFailures(); - void processTransactions(); - void activatePasswordDialog(); -+ void registerKWalletd4Service(); - #ifdef Q_WS_X11 - void connectToScreenSaver(); - #endif -diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp -index 6eb6013..639ee8d 100644 ---- a/src/runtime/kwalletd/migrationagent.cpp -+++ b/src/runtime/kwalletd/migrationagent.cpp -@@ -41,6 +41,7 @@ MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) : - , _kde4_daemon(nullptr) - , _pam_hash(hash) - { -+ connect(this, &MigrationAgent::migrationFinished, _kf5_daemon, &KWalletD::registerKWalletd4Service); - if (isAlreadyMigrated()) { - qDebug() << "old wallets were already migrated"; - emit migrationFinished(); --- -2.12.0 - diff --git a/kde-frameworks/kwallet/kwallet-5.34.0-r1.ebuild b/kde-frameworks/kwallet/kwallet-5.34.0-r1.ebuild deleted file mode 100644 index 9a53e9c822e1..000000000000 --- a/kde-frameworks/kwallet/kwallet-5.34.0-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Framework providing desktop-wide storage for passwords" -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm x86" -IUSE="gpg +man" - -RDEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - dev-libs/libgcrypt:0= - gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) -" -DEPEND="${RDEPEND} - man? ( $(add_frameworks_dep kdoctools) ) -" - -PATCHES=( "${FILESDIR}"/${PN}-5.34.0-kwalletd4-{1,2,3,4,5}.patch ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package gpg Gpgmepp) - $(cmake-utils_use_find_package man KF5DocTools) - ) - - kde5_src_configure -} - -pkg_postinst() { - if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then - elog - elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login." - elog "Install kde-apps/kwalletmanager:5 to manage your kwallet." - elog - fi - if has_version "kde-apps/kwalletd"; then - elog "Starting with 5.34.0-r1, ${PN} is able to serve applications" - elog "that still require old kwalletd4. After migration has finished," - elog "kde-apps/kwalletd can be removed." - elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet" - fi -} |