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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 83 insertions, 71 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/Manifest b/kde-base/kwalletd/Manifest
index 5f640d2b2602..a1581452e1ae 100644
--- a/kde-base/kwalletd/Manifest
+++ b/kde-base/kwalletd/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX kwalletd-4.12.0-qgpgme.patch 1734 SHA256 a4f6c353c1fff46c257edb164acf726187489bbce87fd35035f85f458865442c SHA512 4a30cd935bc935d6874ab7c3f9cd4a36679c8a8018cff74b53713fad8d97c6a704188adc3727efd8e1e048401cb591356ad980b3bb479d522bab4ac259a47795 WHIRLPOOL 75f1d727929e1c1b3e85ac7dad7ee87c1c47733b9573415f5eb2544a6ba70938b7aa1c9ff68bd80470e3fc652ce1240da0dead844f947633a5b1ba716f9c0457
+AUX kwalletd-4.12.1-nosemanticdesktop.patch 1302 SHA256 1962ae8a6f4bdf4d2f77c7cdae50cdb2a726bc3ad6ab75acde7a63a4f2cdeee9 SHA512 51b27e5f19be11c6bd4aa534b1ac586d14ef2004a31fc9214f02062c104e1824aea0750c86b593547bccc9cbedf8c1f83c0cb05c64882ad44a3248b654d66b75 WHIRLPOOL ee1b4fd771081e9bcdb3026938d8676c8a0dea48395a6b9b0b2a555b48eaaaeb1b00fa2feeafd032c2ce62409f5ad0661ca37543ac92c31a10601184d2bc893a
 DIST kde-runtime-4.11.2.tar.xz 7974692 SHA256 045f38375be1c6c0753a6fc85e7211d3d2dadc974ffc3848920ebfa5d0569df0 SHA512 21ecca605d94215d6fa68d1b988a8c2c5efeba7ec264bf9ac607462577d3dac0321b4b09af55078a8bc556b2dd68e53c1a4163c87a0300e1c4bff945f71f9396 WHIRLPOOL 14c05b1554eeda1466640dd3f70a2284180bf223f208123e565e420d9cc2f024dae0464a42a9c11b8f996d87d2f52c48f7973f357673cf5c2d3b637484a7c0b9
 DIST kde-runtime-4.11.5.tar.xz 7870568 SHA256 7fa0597e8dae8aff7ce06874ffd1894aded6b4c40c5c43263af31f4db2b856e3 SHA512 6284db9fd2e99378e70917d488dcb94174e3e5b3002ec585e8913741e99fac8ae856d76305ebd886116f0378f34989e91e504cbfde6c4bdb601489bbd25d836e WHIRLPOOL a007b1763ae67cb1f7c31a4f22f3896dd4a5f36c0e00f87d52ad005ceb38a5408b355f99e1dfaf755d3c4a9477b5542f82f24d4883602c29c63165783376e75f
 DIST kde-runtime-4.12.1.tar.xz 7854616 SHA256 0af569914a369af7bdfd504309c4811f82429d2f30abf2071d0e006d3ca8d4e8 SHA512 d09eaba6eae85897aa7dc8838f65596db72f16af8da398f05f6a3131d1cef5aea2a289d57f68729187d3851024cbedf285846bac34203bbcdb87a7b05ea4a2c2 WHIRLPOOL 46734e0ee865030715a952a10e8a193c57a611cbf53edb4d8a277a15fe4ab7c8b6d208f9494b21e1067e71f5ca63993cdb6f7adcada3142343b8960d989450bc
 EBUILD kwalletd-4.11.2.ebuild 397 SHA256 8205e96f73ddf8ead62902e834e5f8e09f1157d2ced3569bc0ef5b653fe10021 SHA512 9c18eb3a462eddc6ea4c3a7b3134b619c2fa7d3ae7c98a5a8ca6079540bea33072d7d09425f32b72d65f76d1667a47f0ccadbe5066bf421acf5334f98ec90be7 WHIRLPOOL 72a733a647e4eacf3286f81951bc0eb4147e81815dca1e336c4c26a1c2816a53968fc09b60001318fd83efc2bd3b3106ff8b6952457a0aec0abb518ca79deccf
 EBUILD kwalletd-4.11.5.ebuild 408 SHA256 9851ec26868f5975c704adecf4f088f20eb713d6037c5e2048217db4560c6023 SHA512 5d8dbf222ca2fc0be5a71d1e798a5e873824b6332d90478e764addfacd9cd562750ded9d60e02720108371a5b4a8191310877279acfd05a977c23b41e6bbc1fc WHIRLPOOL 837d8ce872b91c713eaa8d675cf19c8c63b3eb4cba6c2da611a49d0d78abf5eb522378a499e0840c60750e185f437cbb59499952511deb3f419c793b912a3a96
-EBUILD kwalletd-4.12.1.ebuild 704 SHA256 4c993bd44bf6f3530555117b6db6c4d25abf09e4645a6761c49ce4fa058362bb SHA512 001706fb24db93e21e700d42663e8c9ab438fc69f330593146cdf6996b1712f254257b1b8d4d1d0cd7b1b54f6eee61415f1c8a906da56fb5453b53923a2576c0 WHIRLPOOL c40c605482c6a553ab8d6e9e9cc33d5020d808f59cc05e24b9673766c128aaa098a9416f2fe96aca650c78134ecd6d87fcd1e90e7ad211ed91b7fe2919af29de
-MISC ChangeLog 22132 SHA256 2c2bb8c2c0dd615c83e9759de298b1e5e0cfea9ec473953dc22b5eb13eab528c SHA512 8acc5385f30c23e5abef846502b53ac6eac5af40719a511b4da0c664ce478e053ae55f3be5c0cb6d55671d4bdff14ec2d95e47a0a3cd818a4dec0a44bda5efeb WHIRLPOOL 0bacad5bee6150805a23a26baedea9ecd1a6adab90c91357418b3dab2efbd5e96d25c89575351bf3bf2289058fa419b02fe1bb4bc2fbad611f806b3de9407cd9
+EBUILD kwalletd-4.12.1.ebuild 761 SHA256 e7b73ac109e5dbe57ccbb365e0f622d5efaf837e99767169dbd1877587fa0419 SHA512 864164381a0120493801441515a746eaa94c5fabeda222ad1d35aa1c50f56ac008bf2e6a676cac255e389ef5c5c22f20a4e569690a3af9fb1d3c4904069d2466 WHIRLPOOL 2641c9a3e639ed1ad5c6dabda9b57abfb76f85b5a39a2eaff027cec92554c182c49ac1f98fae9e44736a3d9daa79f0581d5de0451a4097eccc57b298aeb7624a
+MISC ChangeLog 22395 SHA256 ef77dcc0808b8e50e8cd0c14b21e2b7f00ca76f9e15b4fc0a605e936964b901a SHA512 1154903caab8ad038daa0c166b17e259df299337e18eaa6e7f3174ef0dd1c0ca60e8f83381872363be7a31e751d404de5446bcbc17ed5dc97fe14f220af6b29f WHIRLPOOL b57d3c6d4cc74c25c0a6d670b9beffd5c6dfae9799c68a9d28d82e74d3e0c495be36a0adbfab5fb8991b50ca505d5e7367b13b9ed16c845a4efba83f9746b1c8
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJS3TpmRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJS3gOMRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7JazEACuCJlT2rXPP2Im0jwAGlr0jOA6q9VKdPYbOfvxvlQZLIdfYogFh12Z1/oY
-U4MTx8IuPB2ZkIEiHcUwi4uDbNdyPaPI9KASLTrSM0LiSO6bx2tGMI+/qcr4fPvY
-uzyCyWywy+CWkK4xeP5j9uFAfE1kKImghwtNAVzL33UeDXqWxgRkZRlXiNDZ+wY1
-v5o96HK8bwDkVxeUcvM3kxT3C1cLUgb714Qm+pKfZUx7eZwummjAobrVdCdyQJcY
-aCOZ/bzEhxr7Fe5xPuWpSpYzCIT5ld8u6UfmuhWycAoiyYyxHtKiiTnWubv9sUV9
-iARl2ZENZp3qoT5GYMc3kVGY5TtQQMmAg1sbf2gMa1ZqwrGpyEly7YqBccWp6kqR
-uu8hilo8688e/4g7UfPctouEzZn2SUIqLyu6JzbF0UgryiIPnkZt36b6b0JD0GTj
-Sd1uTwE1fIX3vFGCnApGZXTRQHl46G1sTt4DoRZNqhK9/u7Y/NM6NwnjEHw1+209
-ou4oTtXcgToxRFhCM3x9hIB2aQ4NSqm6jtydZnT8pUPpnevLJLu+dUlbGRPw3rfy
-P3T8MFOK5jYCXv0DFXq8pA3bKDhMQMtEyxzXDoaTXn1Z3JFDcexsxSxXWzDVyH85
-Mqp97qpzL4dp7hXUkX+8/WydtIsxrnYqNaGB46T4pAPm/yJLTg==
-=+HGf
+7NBZD/9NMdYKXyfEPVgFgp/GgcnQqySNw/w3P56HoSRfdd6G6h8CG5G7RBPxRJUV
+zT4mr9vMNx2idNT9uKMwWSbrdQ1KL69X2ZQmP/df0r1LAewDWMwmgrho30no+mHZ
+2RAY2P6XAY4TSW0ou455EYgO/eushaza/YR8me323RneaBZXT/DKrM8J7RHEeqYE
+ryXMur40/iZnUPSx8SiyE+EMZEndZMuRixyh8j1rJvECpMPXMve0UGqpvKK9ZPuA
+44/YxCqH+89VdxhHM4hYL7jVemWc5432dIhaz/JncLBWKu2J/hBz4mtArZ8qwjSI
+yEAFm4CTVJQbXF8LhyfnpVVUYO2gos/jqTiPuO5fAkPlwNo8n3FJctwGg4/M1WcU
+VXXHK0zqPcXRgmjX8eMjofxurCyu9S7Sf5kBgbYZmYf40raDdFXP7iH+6ZN0cMEx
+V6xHbsDsmIZkbsRVxRBiuukoP34m0pev6JjolhFudCGlsQFdQHeK7PFqSZ+3HDGv
+k5h2e7Ho25SdIcmkaLRSwjOZ3nrBiogE5rlOrfWaqXGXnHZWWFvhpVt8c9JBfYhE
+gqaqF97r09j6wXap5YY0ZqOTmJYaWB8L+DnS9FOsRv/PyThtHDJvU3usFV/fAc6L
+LkGYubUujCx5FU5BLYWc4MuS+BT33+zYZ1Meb017JDCy62dILQ==
+=YJcA
 -----END PGP SIGNATURE-----
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)