Backport patch from upstream to fix build with USE="-semantic-desktop", wrt bug #494712.

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

4 files changed, 67 insertions, 55 deletions

diff --git a/kde-base/kwalletd/ChangeLog b/kde-base/kwalletd/ChangeLog
index 86e3de01e237..d5f1e8fed518 100644
--- a/kde-base/kwalletd/ChangeLog
+++ b/kde-base/kwalletd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwalletd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.189 2014/01/20 14:59:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/ChangeLog,v 1.190 2014/01/21 05:20:13 kensington Exp $
+
+  21 Jan 2014; Michael Palimaka <kensington@gentoo.org>
+  +files/kwalletd-4.12.1-nosemanticdesktop.patch,
+  -files/kwalletd-4.12.0-qgpgme.patch, kwalletd-4.12.1.ebuild:
+  Backport patch from upstream to fix build with USE="-semantic-desktop", wrt
+  bug #494712.
 
   20 Jan 2014; Michael Palimaka <kensington@gentoo.org>
   -kwalletd-4.12.0.ebuild:
diff --git a/kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch b/kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch
deleted file mode 100644
index 29dfdf15f0d4..000000000000
--- a/kde-base/kwalletd/files/kwalletd-4.12.0-qgpgme.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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/files/kwalletd-4.12.1-nosemanticdesktop.patch b/kde-base/kwalletd/files/kwalletd-4.12.1-nosemanticdesktop.patch
new file mode 100644
index 000000000000..2bb54475740e
--- /dev/null
+++ b/kde-base/kwalletd/files/kwalletd-4.12.1-nosemanticdesktop.patch
@@ -0,0 +1,57 @@
+From 3ecfd295947fce6c2009ca23e626887bafece1ea Mon Sep 17 00:00:00 2001
+From: Valentin Rusu <kde@rusu.info>
+Date: Mon, 20 Jan 2014 22:37:41 +0100
+Subject: [PATCH 1/2] Fix compilation withoug gpgme
+
+BUG: 328476
+FIXED-IN: 4.12.2
+FIXED-IN: 4.13
+---
+ kwalletd/kwalletwizard.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/kwalletd/kwalletwizard.h b/kwalletd/kwalletwizard.h
+index b29bddc..95b422b 100644
+--- a/kwalletd/kwalletwizard.h
++++ b/kwalletd/kwalletwizard.h
+@@ -20,7 +20,9 @@
+ #define KWALLETWIZARD_H
+ 
+ #include <QWizard>
++#ifdef HAVE_QGPGME
+ #include <gpgme++/key.h>
++#endif
+ 
+ class PageGpgKey;
+ class PagePassword;
+-- 
+1.8.3.2
+
+
+From 6a79fc09c0b0d48bd0cc09d32fb0c8b306251c00 Mon Sep 17 00:00:00 2001
+From: Valentin Rusu <kde@rusu.info>
+Date: Mon, 20 Jan 2014 23:48:48 +0100
+Subject: [PATCH 2/2] Fix compilation without gpgme++
+
+BUG: 328476
+---
+ kwalletd/kwalletd.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/kwalletd/kwalletd.cpp b/kwalletd/kwalletd.cpp
+index 0266bdf..20bc8c0 100644
+--- a/kwalletd/kwalletd.cpp
++++ b/kwalletd/kwalletd.cpp
+@@ -49,7 +49,9 @@
+ #include <kpluginfactory.h>
+ #include <kpluginloader.h>
+ #include <KNotification>
++#ifdef HAVE_QGPGME
+ #include <gpgme++/key.h>
++#endif
+ 
+ #include <QtCore/QDir>
+ #include <QTextDocument> // Qt::escape
+-- 
+1.8.3.2
+
diff --git a/kde-base/kwalletd/kwalletd-4.12.1.ebuild b/kde-base/kwalletd/kwalletd-4.12.1.ebuild
index 2db9ddc4db8a..b016fd0fa66c 100644
--- a/kde-base/kwalletd/kwalletd-4.12.1.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.12.1.ebuild,v 1.1 2014/01/18 11:23:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.12.1.ebuild,v 1.2 2014/01/21 05:20:13 kensington Exp $
 
 EAPI=5
 
@@ -19,6 +19,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-nosemanticdesktop.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop Gpgme)