| 1 |
kensington 14/01/21 05:20:13 |
| 2 |
|
| 3 |
Added: kwalletd-4.12.1-nosemanticdesktop.patch |
| 4 |
Removed: kwalletd-4.12.0-qgpgme.patch |
| 5 |
Log: |
| 6 |
Backport patch from upstream to fix build with USE="-semantic-desktop", wrt bug #494712. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 kde-base/kwalletd/files/kwalletd-4.12.1-nosemanticdesktop.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwalletd/files/kwalletd-4.12.1-nosemanticdesktop.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwalletd/files/kwalletd-4.12.1-nosemanticdesktop.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: kwalletd-4.12.1-nosemanticdesktop.patch |
| 17 |
=================================================================== |
| 18 |
From 3ecfd295947fce6c2009ca23e626887bafece1ea Mon Sep 17 00:00:00 2001 |
| 19 |
From: Valentin Rusu <kde@××××.info> |
| 20 |
Date: Mon, 20 Jan 2014 22:37:41 +0100 |
| 21 |
Subject: [PATCH 1/2] Fix compilation withoug gpgme |
| 22 |
|
| 23 |
BUG: 328476 |
| 24 |
FIXED-IN: 4.12.2 |
| 25 |
FIXED-IN: 4.13 |
| 26 |
--- |
| 27 |
kwalletd/kwalletwizard.h | 2 ++ |
| 28 |
1 file changed, 2 insertions(+) |
| 29 |
|
| 30 |
diff --git a/kwalletd/kwalletwizard.h b/kwalletd/kwalletwizard.h |
| 31 |
index b29bddc..95b422b 100644 |
| 32 |
--- a/kwalletd/kwalletwizard.h |
| 33 |
+++ b/kwalletd/kwalletwizard.h |
| 34 |
@@ -20,7 +20,9 @@ |
| 35 |
#define KWALLETWIZARD_H |
| 36 |
|
| 37 |
#include <QWizard> |
| 38 |
+#ifdef HAVE_QGPGME |
| 39 |
#include <gpgme++/key.h> |
| 40 |
+#endif |
| 41 |
|
| 42 |
class PageGpgKey; |
| 43 |
class PagePassword; |
| 44 |
-- |
| 45 |
1.8.3.2 |
| 46 |
|
| 47 |
|
| 48 |
From 6a79fc09c0b0d48bd0cc09d32fb0c8b306251c00 Mon Sep 17 00:00:00 2001 |
| 49 |
From: Valentin Rusu <kde@××××.info> |
| 50 |
Date: Mon, 20 Jan 2014 23:48:48 +0100 |
| 51 |
Subject: [PATCH 2/2] Fix compilation without gpgme++ |
| 52 |
|
| 53 |
BUG: 328476 |
| 54 |
--- |
| 55 |
kwalletd/kwalletd.cpp | 2 ++ |
| 56 |
1 file changed, 2 insertions(+) |
| 57 |
|
| 58 |
diff --git a/kwalletd/kwalletd.cpp b/kwalletd/kwalletd.cpp |
| 59 |
index 0266bdf..20bc8c0 100644 |
| 60 |
--- a/kwalletd/kwalletd.cpp |
| 61 |
+++ b/kwalletd/kwalletd.cpp |
| 62 |
@@ -49,7 +49,9 @@ |
| 63 |
#include <kpluginfactory.h> |
| 64 |
#include <kpluginloader.h> |
| 65 |
#include <KNotification> |
| 66 |
+#ifdef HAVE_QGPGME |
| 67 |
#include <gpgme++/key.h> |
| 68 |
+#endif |
| 69 |
|
| 70 |
#include <QtCore/QDir> |
| 71 |
#include <QTextDocument> // Qt::escape |
| 72 |
-- |
| 73 |
1.8.3.2 |
Archives