| 1 |
johu 13/12/23 07:55:00 |
| 2 |
|
| 3 |
Added: kwalletd-4.12.0-qgpgme.patch |
| 4 |
Log: |
| 5 |
Add upstream patch to fix build without USE semantic-desktop, bug #494712. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kwalletd-4.12.0-qgpgme.patch |
| 16 |
=================================================================== |
| 17 |
commit 47f54d65518cfcda5e4f9afc9c3ff941209b4920 |
| 18 |
Author: Valentin Rusu <kde@××××.info> |
| 19 |
Date: Sun Dec 22 20:58:02 2013 +0100 |
| 20 |
|
| 21 |
Fix compile when QGpgme is not present |
| 22 |
|
| 23 |
BUG: 328476 |
| 24 |
FIXED-IN: 4.12.1 |
| 25 |
|
| 26 |
diff --git a/kwalletd/kwalletd.cpp b/kwalletd/kwalletd.cpp |
| 27 |
index b522156..0266bdf 100644 |
| 28 |
--- a/kwalletd/kwalletd.cpp |
| 29 |
+++ b/kwalletd/kwalletd.cpp |
| 30 |
@@ -833,11 +833,13 @@ void KWalletD::doTransactionChangePassword(const QString& appid, const QString& |
| 31 |
|
| 32 |
assert(w); |
| 33 |
|
| 34 |
+#ifdef HAVE_QGPGME |
| 35 |
if (w->cipherType() == KWallet::BACKEND_CIPHER_GPG) { |
| 36 |
QString keyID = w->gpgKey().shortKeyID(); |
| 37 |
assert(!keyID.isNull()); |
| 38 |
KMessageBox::errorWId((WId)wId, i18n("<qt>The <b>%1</b> wallet is encrypted using GPG key <b>%2</b>. Please use <b>GPG</b> tools (such as <b>kleopatra</b>) to change the passphrase associated to that key.</qt>", Qt::escape(wallet), keyID)); |
| 39 |
} else { |
| 40 |
+#endif |
| 41 |
QPointer<KNewPasswordDialog> kpd = new KNewPasswordDialog(); |
| 42 |
kpd->setPrompt(i18n("<qt>Please choose a new password for the wallet '<b>%1</b>'.</qt>", Qt::escape(wallet))); |
| 43 |
kpd->setCaption(i18n("KDE Wallet Service")); |
| 44 |
@@ -862,7 +864,9 @@ void KWalletD::doTransactionChangePassword(const QString& appid, const QString& |
| 45 |
} |
| 46 |
|
| 47 |
delete kpd; |
| 48 |
+#ifdef HAVE_QGPGME |
| 49 |
} |
| 50 |
+#endif |
| 51 |
|
| 52 |
if (reclose) { |
| 53 |
internalClose(w, handle, true); |
| 54 |
diff --git a/kwalletd/kwalletwizard.cpp b/kwalletd/kwalletwizard.cpp |
| 55 |
index e97057c..49ffed1 100644 |
| 56 |
--- a/kwalletd/kwalletwizard.cpp |
| 57 |
+++ b/kwalletd/kwalletwizard.cpp |
| 58 |
@@ -120,7 +120,11 @@ public: |
| 59 |
} |
| 60 |
|
| 61 |
private: |
| 62 |
+#ifdef HAVE_QGPGME |
| 63 |
Ui::KWalletWizardPagePasswordGpg ui; |
| 64 |
+#else |
| 65 |
+ Ui::KWalletWizardPagePassword ui; |
| 66 |
+#endif |
| 67 |
}; |
| 68 |
|
| 69 |
#ifdef HAVE_QGPGME |
Archives