Add upstream patch to fix build without USE semantic-desktop, bug #494712.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 61 insertions, 2 deletions

diff --git a/kde-base/kwalletd/ChangeLog b/kde-base/kwalletd/ChangeLog
index 837f5a7236a5..716b8b1673da 100644
--- a/kde-base/kwalletd/ChangeLog
+++ b/kde-base/kwalletd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwalletd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.183 2013/12/18 19:57:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.184 2013/12/23 07:55:00 johu Exp $
+
+  23 Dec 2013; Johannes Huber <johu@gentoo.org>
+  +files/kwalletd-4.12.0-qgpgme.patch, kwalletd-4.12.0.ebuild:
+  Add upstream patch to fix build without USE semantic-desktop, bug #494712.
 
 *kwalletd-4.12.0 (18 Dec 2013)
 
diff --git a/kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch b/kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch
new file mode 100644
index 000000000000..29dfdf15f0d4
--- /dev/null
+++ b/kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch
@@ -0,0 +1,53 @@
+commit 47f54d65518cfcda5e4f9afc9c3ff941209b4920
+Author: Valentin Rusu <kde@rusu.info>
+Date:   Sun Dec 22 20:58:02 2013 +0100
+
+    Fix compile when QGpgme is not present
+    
+    BUG: 328476
+    FIXED-IN: 4.12.1
+
+diff --git a/kwalletd/kwalletd.cpp b/kwalletd/kwalletd.cpp
+index b522156..0266bdf 100644
+--- a/kwalletd/kwalletd.cpp
++++ b/kwalletd/kwalletd.cpp
+@@ -833,11 +833,13 @@ void KWalletD::doTransactionChangePassword(const QString& appid, const QString&
+ 
+ 	assert(w);
+ 
++#ifdef HAVE_QGPGME
+     if (w->cipherType() == KWallet::BACKEND_CIPHER_GPG) {
+         QString keyID = w->gpgKey().shortKeyID();
+         assert(!keyID.isNull());
+         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));
+     } else {
++#endif
+         QPointer<KNewPasswordDialog> kpd = new KNewPasswordDialog();
+         kpd->setPrompt(i18n("<qt>Please choose a new password for the wallet '<b>%1</b>'.</qt>", Qt::escape(wallet)));
+         kpd->setCaption(i18n("KDE Wallet Service"));
+@@ -862,7 +864,9 @@ void KWalletD::doTransactionChangePassword(const QString& appid, const QString&
+         }
+ 
+         delete kpd;
++#ifdef HAVE_QGPGME
+     }
++#endif
+ 
+ 	if (reclose) {
+ 		internalClose(w, handle, true);
+diff --git a/kwalletd/kwalletwizard.cpp b/kwalletd/kwalletwizard.cpp
+index e97057c..49ffed1 100644
+--- a/kwalletd/kwalletwizard.cpp
++++ b/kwalletd/kwalletwizard.cpp
+@@ -120,7 +120,11 @@ public:
+     }
+ 
+ private:
++#ifdef HAVE_QGPGME
+     Ui::KWalletWizardPagePasswordGpg ui;
++#else
++    Ui::KWalletWizardPagePassword ui;
++#endif
+ };
+ 
+ #ifdef HAVE_QGPGME
diff --git a/kde-base/kwalletd/kwalletd-4.12.0.ebuild b/kde-base/kwalletd/kwalletd-4.12.0.ebuild
index 986c7dec7948..7fca9b737006 100644
--- a/kde-base/kwalletd/kwalletd-4.12.0.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.12.0.ebuild,v 1.1 2013/12/18 19:57:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.12.0.ebuild,v 1.2 2013/12/23 07:55:00 johu Exp $
 
 EAPI=5
 
@@ -19,6 +19,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-qgpgme.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop Gpgme)