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

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

4 files changed, 77 insertions, 17 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/Manifest b/kde-base/kwalletd/Manifest
index e67c2bc5193d..f395c2e37a36 100644
--- a/kde-base/kwalletd/Manifest
+++ b/kde-base/kwalletd/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kwalletd-4.12.0-qgpgme.patch 1734 SHA256 a4f6c353c1fff46c257edb164acf726187489bbce87fd35035f85f458865442c SHA512 4a30cd935bc935d6874ab7c3f9cd4a36679c8a8018cff74b53713fad8d97c6a704188adc3727efd8e1e048401cb591356ad980b3bb479d522bab4ac259a47795 WHIRLPOOL 75f1d727929e1c1b3e85ac7dad7ee87c1c47733b9573415f5eb2544a6ba70938b7aa1c9ff68bd80470e3fc652ce1240da0dead844f947633a5b1ba716f9c0457
 DIST kde-runtime-4.11.2.tar.xz 7974692 SHA256 045f38375be1c6c0753a6fc85e7211d3d2dadc974ffc3848920ebfa5d0569df0 SHA512 21ecca605d94215d6fa68d1b988a8c2c5efeba7ec264bf9ac607462577d3dac0321b4b09af55078a8bc556b2dd68e53c1a4163c87a0300e1c4bff945f71f9396 WHIRLPOOL 14c05b1554eeda1466640dd3f70a2284180bf223f208123e565e420d9cc2f024dae0464a42a9c11b8f996d87d2f52c48f7973f357673cf5c2d3b637484a7c0b9
 DIST kde-runtime-4.11.4.tar.xz 7978552 SHA256 b28104cd16d2ecd06c52664523d912dee5a2f16e75c24ee0a4229a5e7204cd16 SHA512 7169f535fcac03bfff757e853a8bd01b2fbe8dc5dac3b4d8590693c07ead5402cb194c7b85154702044d7bfc4b1e0aa81e956113928d50b68212b77b6c6a7674 WHIRLPOOL c780cffa6213819c7d47c5b9eec69bbb29dedd2ec9e816385bfc9b47c269171d398fa53dba1eeed95513cbcf89b3f5e595288ff5efd4fa2be0237fb37a451522
 DIST kde-runtime-4.12.0.tar.xz 7850996 SHA256 e207c220ebba421d5145c94a3ed05ba30e90c60b02b95fd2bf69eaa2099e8f24 SHA512 105bad7fc4045095a603b67922f9086714e645683bca7b53607371bfa5120b840407b81c37e5c70f09574af52bd248ee62ec21f8a0c81eda3513df3406626da0 WHIRLPOOL be67dc0a323c9b6f36314fe8b32542459cf8764e12190fc2ac076dbb3bc43fc5f91991c47bf0bf807faaa48c23fce46bd12d58eb483d4721808ff0c60ffc8006
 EBUILD kwalletd-4.11.2.ebuild 397 SHA256 8205e96f73ddf8ead62902e834e5f8e09f1157d2ced3569bc0ef5b653fe10021 SHA512 9c18eb3a462eddc6ea4c3a7b3134b619c2fa7d3ae7c98a5a8ca6079540bea33072d7d09425f32b72d65f76d1667a47f0ccadbe5066bf421acf5334f98ec90be7 WHIRLPOOL 72a733a647e4eacf3286f81951bc0eb4147e81815dca1e336c4c26a1c2816a53968fc09b60001318fd83efc2bd3b3106ff8b6952457a0aec0abb518ca79deccf
 EBUILD kwalletd-4.11.4.ebuild 403 SHA256 48d14a603b2175f10ba536467d02c35e87a05a0ef781a16eff3b248d7683679d SHA512 0d03e1a3a071a8b8205d11084ca68d63bc1a3f2b4889ec7d3a730b7c534468ba69e4facaba966eb18e66543a96c6818c3170011cff44b6c4755bdb8d7e633f8f WHIRLPOOL 360eb88e8fe582dd3b3bae8fd9e17825255d98ce83bad19f35a8050ab922cd92add7e0dd012462360fd6e15037a32c2582a2f789de50daa3ca87099c229e7851
-EBUILD kwalletd-4.12.0.ebuild 673 SHA256 c0dc744883ac44fe475c80cd3d1058672ec564a71a8b6c87223d9ce4c0e062cd SHA512 021c782515753cfe6764e705e4359c270d624bb3b4054317b649930597a522b43063b12bb4ffba17615a7f9ba4fb88ab8e0be2c6c27553150d7d7e8756aaae2f WHIRLPOOL 3dbb255d7f4abd4bd5a3ef818c8cef09b653075a26b5d3b37d312c1f14d48f17fa0d32d411b023892433676fde07caf9dd783db65ad9bc115d0080f8402a06fe
-MISC ChangeLog 21322 SHA256 b97339e653317ccc6ac94f92acef5937546e481c137f4a342a044d19b23f9d11 SHA512 bd2463d2e818861a7559701bc25b1beba9f09c32c763ca8db16f6cf3abac08af2eb905ecda09606ef62bf5634bf814ca7bc9e01a648b70c72b50a4e972708a65 WHIRLPOOL af384adc8174044360061a8c9fdffdb010b11256e2a8a02cfe5f1ba12084de2d0f251e01371dfb8fe635ce23410852663e16ca9022922d71ae8cc890225e293d
+EBUILD kwalletd-4.12.0.ebuild 718 SHA256 0e432b18b6f5dc10446e9b424f510a1aded8dd81e2cd5b2b806d41d0fb459036 SHA512 092fd0efda99a4f6943f75e88e9478975608698b05b04048509d615577bc20fa2ac120bbabf9be8fbf2c7f408bd4bd545e0560e3be4264bd7e02bd889a039c81 WHIRLPOOL fdac9d878392fe7d8b6eca2f264248b6e8ec21b39a9678fc515e971e188dab8f60e4a7819373a54ec7ac009c0d618c634c4136d72481d6194c8f0bc0b8a1e7da
+MISC ChangeLog 21511 SHA256 1a95821ef99c4ea92602e785496f30faa1cc4d8b1724838024851b4bae5c875a SHA512 a05984be8c837ecba5fd1a8a4055d49b3951caccfc5b40b8672f730b91d8c896bd71fc7300511b5989ce536099c64a61d20fffa0b4e1814df3a6b1dbc27e33b7 WHIRLPOOL aa974f257a3464a76a88a1de65a79a1dc779f073acb71d6846eb3f5486f9a99906be5c89ad7c2448ce058659e72a11f219ccb77841e6487bb59a7bfa1660a16e
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSsf6PAAoJEGVpnaTzz9K9yWAP/3DIN79RnqeN/Brflm1NALhE
-pYXLDm+SqWRwz7zzL/r3VIUcMYid8gK6gPL8Ksuz3q6YCzGO2VsIWGoSYhZvEWj+
-JQcmSnv6Fi/JcZO3m4O8jj76oiaJgZHymvQsJ7UU9onHSGvKOdofPcK9l+zoDB6S
-w6WclTAKv/NrVDn5zU/tGtq2F1TqeydnLdWyRZsbtMVqrrB8vK4+B4vU8nVbc3th
-4JyQuKERIG7w1VDDz8+O5a5eozn+Q+hG/+G13KL/fFcN5s8jHbExylg7QFgnvaPR
-Cb4XfJpDbxwoBmAMTMsG2XHl+fNkM46bxCYr7YdAEtJK3jHRBUZrBrxXyF3Wq6UA
-ANdMSsXhPk1IfogOM/1d7rmBhrHoitawyXoQ5NyLNhosAB5qq9Ogap5ZnV3WM8ai
-VlCcB0rZe1E/MldzdVR65RsRx4DRlK8ZElNsaL5mWwze0OXYloV9yLNp+D0BJE1g
-/DGog1uvnfbfBrewTJzHRg4wETrSvM6zq4N99H+aH9jNZUpA+duMZx3F/C182dJ0
-LEjn/ys+JaL5onToQYy9NvqN0AmNYTtewrwVNYseAp+fZ2WhnMdz8adn1F5tXheI
-y0OWf+ghSnCXskFkWBwNSc6JhJK/iKOeCFbF3grhQheAkBthxeBsVwFPSEtt9sre
-17StCAEkdP1A5bc+lTEf
-=8UlY
+iQIcBAEBCAAGBQJSt+xYAAoJEGVpnaTzz9K9rnYP/jGAsYlx5ZVm5wYtMqYT0u5D
+t7E+wW/8SbbP2QE37qaHRnoX7k4p1O9ekFehyGDMo4x/mRlVIAm6Q3VTf+S8RK2k
+eupeAyN9K66T4RERcv+JdAQfSlQKSQp8D/of7xgF/ZcyCQ8gR8IqVTkuZ6mmJs7L
+gUR2mEkI6A4P0/zsgW+14gYG2KXzZyuloUwE7sOzYlDPyNXtbDRteHWB55If6LTG
+a54AJ6xIIUqKNj+faZOX0EOj1A62LM8qk7cFNe4E305GcaqIrNehnOZZ4S1YFlnW
+TcePx9cWcfbTiv/ZJr2z8BIvkpmyTn1E2oqbIwWkPIWRGGqKyyLViq8ispMIyu5E
+QWwa29gIHnEAMUE+DBoDGYMAWomgniZP/ywjguMpyH1RCAUh4kd9sbepalyjyrbu
+W5yhvSt03kZTewdanhJ8btJ0pq+1uo+giJrW6ACvuepHE6ANCmvzLMQrjPTBAZVJ
+DEP/8w3qKueJnocZlFkyvKHbuDaYe3ASSIRL2KIYAYDJS1i7FWuU6sc3nQF1YVVJ
+0f81zbjtL6zLaC4hMnUCU8BSZ2SX61hA7nUP4kl8yaiKp5tGhDQAsrb6lTvJ8PO/
+sE9prD0rRJSTc/11TBWJ0EyRleOzuvGGvXCB8ILSrT/yJqC72jNIcIO3tSa6jngF
+YrIjKjqfs6GimjlbFUtS
+=1Ubg
 -----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
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)