Add patch for kwallet, upstream applied it to trunk, but did not include it in the following release, should now really fix bug 421575

Package-Manager: portage-2.2.0_alpha116-r1/cvs/Linux x86_64

4 files changed, 61 insertions, 10 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 41b9f09aa4fa..8e6e51b5ba49 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.81 2012/08/21 20:53:41 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.82 2012/08/22 20:33:10 tommy Exp $
+
+  22 Aug 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  subversion-1.7.6.ebuild, +files/subversion-1.7.6-kwallet.patch:
+  Add patch for kwallet, upstream applied it to trunk, but did not include it
+  in the following release, should now really fix bug 421575
 
   21 Aug 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   subversion-1.7.6.ebuild:
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 77ab50a7fb9d..d89886b171fd 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -9,6 +9,7 @@ AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 SHA25
 AUX subversion-1.6.2-local_library_preloading.patch 6412 SHA256 50b83dd31eaf5ed577b7656dcd06e314d3acd31814089f4e3eba014a1efa442d SHA512 df37e02c4c1354d854be252368f4eef4b6fcf1b28b8fc81788a41619bae77a470962950eabb7eca0e9fd7d84bfd15c319d9140acacbaf4bd7ebed41b4a5962c4 WHIRLPOOL 5d8fbfd1bbc6b642696d0cfef0bf2bfe60a874f707f7cf1dac1adee38a1a898bd2ebc66210ab6faf6b32dc8521ade79b88a592c229c19f18f06d59cbb5133d1b
 AUX subversion-1.6.3-hpux-dso.patch 627 SHA256 0fa69598635ea9630e95e3e8b693cd5f1b853784900e34d58ffe9e03d8c65b36 SHA512 4ca24738d527c8f845e0d255950f0121a445ec1357bea03e2c3cd0c1ca077f8aefd6769eb4dc4bc3787c593c9542f3a64ad283ae5154201a7fcf2392e7ea076b WHIRLPOOL d90944d8cb30db9e8f88606f5054cc54af0a2f496125f6462237b964b2f4faefdde94b26c9a80e9273d19fffbce71cbf89dba961300c3a764de4c21782499533
 AUX subversion-1.6.3-kwallet_window.patch 10012 SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de SHA512 e21fc601ee23ca75ebf089627e425696e39015fc9ceb55defc85d758e3a9ee191c11a7af8b78857b32c821730313b75b237b674d1eec31e51292b82f4fe10352 WHIRLPOOL 74fcd09ff7f4e6831ef1708970794f7b16e711fe0d264c4d5748afae7ed071b301ef72021076d14260d9032be873930d59ca87c0b92cbb6174d3a0cab1c071f5
+AUX subversion-1.7.6-kwallet.patch 1624 SHA256 61a1f2c9a05553ab874a07765e9680bcf7af5adc843fcfaf7f6c4c0a1e5454a7 SHA512 90b8b2e8200f54deeb2da7b79d133b57863b3279dc7bb169e1d71ee54c9c727bda5cd60abdfb5076f25a6273bd64ccfa3c577e55d70545fa252dd1092eefcdde WHIRLPOOL fcb1ca01e3b2e510d9a9bb2614d0a4893414d0093a05e2930edb98ef1c2d7cb2e136b1f714172858a327db4beea7995274e37db8ebf98f4fcb7cc8ad6063144c
 AUX subversion-1.7.6-revert-mod_dontdothat-move.patch 6001 SHA256 c01a12f8fd96c6470caabce97c7a3ef651b4fbe8dd8656bc8854fc3f65e4f7dd SHA512 927be300babe1692f4ca942e8e9fc3e4211aa3890c22adf6a70804c7293761335015da98040ed3acdee3f151b7f92a8d15014589b718711165ebf638f35b56a3 WHIRLPOOL 65d01a348c11dcfe6f23d6f0761f47ee328774b0dc954c56194fed12fe6945d4c408be55d852cba5f541aff4efc118abc07d2cfd1a45c4a6b77d7528b4da1d45
 AUX subversion-fix-parallel-build-support-for-perl-bindings.patch 515 SHA256 c7a9fe0f095de7e49e219af5cabdff28751ee39aa42e712c4b8b3bc0ed64d50c SHA512 c24cf217e3d5c8e31b28c38d63e994ef131b410a7a6ab00b31772a0863f216d9d3482810928ab2cf7025baf632a415435653fd3fd2fd3780013b70a53ccf5cad WHIRLPOOL e7bb2c833d2393f82f769007d5df35e97ed8766cea5f9f5c64e41ed6369950a6aa8c73e44e9803656ec2ac21706e69cc3cf05f45a5dd1abe85fdb2cb9d0894bf
 AUX svnserve.confd 322 SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97 SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289 WHIRLPOOL c91f8454f4a6d7fc9823bfbded1432993da14574693cfb4ffd6902fce136b2a14dc23616b523cf89e06493f96317ed0520a586af022d2cb1bea025ec99e53ed8
@@ -28,15 +29,15 @@ EBUILD subversion-1.7.1.ebuild 14825 SHA256 e76693d51738bfca2e8a39d3b8e53a4d5011
 EBUILD subversion-1.7.2.ebuild 14913 SHA256 8162c5df5d310a74a29429fa984272e868d0f57c7c1cf292c5801ab1d1f8003a SHA512 29fb78e37fee60fd00a09aef1e35bd60d51fd38a728598e7cc72595f1a7cb1543bb37882758ee0b427df3cc2f831358838868a03a6db4b0accc52f685183e554 WHIRLPOOL 86a6f088300fc36bd673ee309d8535a4caf0847d8660c4e67c5ff7282704425aff1cd38664f3d0e7d28e8e858dcdc3204141ea04445460c765cd9b87eaca8c94
 EBUILD subversion-1.7.4.ebuild 15600 SHA256 158ec0cb4a85f7a345afe5341a7ee016c5f1205b19b9bf7ab7b869e2b826d8a0 SHA512 ec4ba26cdb29b3bc4b7aae43ee4809c78b28d83d2296cc147d4973647316efc90e26191d36d9c59d928766342dc1d823eac92ca8a2cc5c9e4da1a8d1625e1d5c WHIRLPOOL bbcdf40252573d22f6f159353adc1c6035a21174f0080f7501d051c0c2bda5de048588c7ac88e2cbec2a3f7e9e075680c69a105c957635de15a2f0d6cfa1b064
 EBUILD subversion-1.7.5.ebuild 15600 SHA256 dbbe674c0ff760e2f434b7e440bf9f1f0c762fdadf0d7953415f9667f34ba03a SHA512 6188ead1aa86e7b18d4219c471da2992ef573825f93a4b5b87d66dda553a0aaf22366dc117c1c64a673501d0f3891282877e4c701d029a402b0b345f6c0d44fa WHIRLPOOL 1d6a32c92f57b1e20a8f01de78bd14416fb6ea5053d9646e856a6d5d9ba5fc0abd064cafa3d8c751498f0a0f7977665ffea65e66655e0a5bc9148658afa5e6df
-EBUILD subversion-1.7.6.ebuild 15659 SHA256 86803e206615359acf8e384ed742fccd057cebe4b61668852b92076365e5bd80 SHA512 83f1e2b67556caf35bf32cd1093831175139118b6f406230bf00a66da9b09771e0325d0696432f433f1f68092922b5ce07eb19fe2dc9d37558b1d04de7bde219 WHIRLPOOL f5151a678c07b54f5860ee9f373b89a7cfa8bb8c0c6d5cefe5c3dcd7a7ef70fa2961da710c68603c26d55c675db60213d511f6215f56de2f0593e18ac9ed4282
-MISC ChangeLog 85636 SHA256 64368ce2fd17426f7dd53e815ea36556179dc63f25a592ecbe0a7dbbe125156b SHA512 a22d15b7a60b2cc2be87686aebf78cc6837e95e003a5aff75d352cce69e8dd182d7a729d65fd64d46d6974e8567a3b09e2cc385c0dacffb756f3a5e8c00b7137 WHIRLPOOL 6b4f56d664a7e6f7bcc36afbe08beea9bee0bf81ed891871f25695e071e30c27a471d42864df6f5ec83f00ffd22f76213bb6bc0e641f9b8fd68b3353863cac48
+EBUILD subversion-1.7.6.ebuild 15696 SHA256 ca8bba78fbb86603766d3dc7826120e2ef272fb153acbb2d3b6b31498c406c13 SHA512 4727f60930966ed0452a126ab221b36054262dee7314b0fc6e6838452e4ec087af592028b95f6ac5f846d3d9f5554500f05fdf5b4b613d4776e08415ec9740cb WHIRLPOOL cd2eb9ee0ba6abfdecf41b2a997fc3d9c2a99216594755d6927ad5b2db846cdea88101e4286a43b7afc80e1b69cbef1a0f51949cc51f30c46dfc99fe234f6d42
+MISC ChangeLog 85901 SHA256 d62b03c4c2290742c08a71a8375bf306128442f5c4152fe18abd4e96532b7db7 SHA512 e2e3d015a9ed5231cce3dd690710e94a0e43fe975e7944e1a9964fa04f024c7170d57f44328ceefc16fcb18d4caedf990a214fb32bd575db59398f4e4e02ce48 WHIRLPOOL e202fc8d276f86e2d00afda45cba5d36af7eb2985c3a73bfa0dbe9573be516067059a36efec6f82b49f52a0805a08111ce9814bcfd8d40cda47a03dbb9d71d9e
 MISC metadata.xml 628 SHA256 b3715692f57550cecbca66df385d0cc48ef3d6707b4832b88add2f689c35969d SHA512 2c1f375df0efee06e088db3c7c19b96e23b615053aaaa98bc45b5d4945a39a3c21a868c80b938be88ff840824b2e8aebe9379633f106d2cfead4b3fd74cff927 WHIRLPOOL 1387297f9b5b7feb6e90cbda59b0cd61519d0395ec94fb315d2ec97adb66c37a9aa59736d968920eab7229342105846805458b8789dc84ef9ecbd40e452c02c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQECAAYFAlAz9WEACgkQG7kqcTWJkGc0hQP8Dn51VF4bo8zaVlLWxfvo3tX+
-UQSeXDv+S8koa9M98HLfCtfvHchMZ2jT2VHSqkpeW2bYB+ea9qyj/QewPH6CRioh
-U788WYniBcGIpwiA99LJVM0olCbPOnlk71KLTIvyw+3evGla22YlwMYuX5JjGTyU
-U6o912h3cAWRRM/Lnk4=
-=1YV8
+iJwEAQECAAYFAlA1QhEACgkQG7kqcTWJkGdULAP/Z1z6e/bE/Lzm4cxxSEP2w6da
+SJc6LTm38cMuicxH0CcRcby565Xld3BCGMpEQ3TKv05SLixXlQGchyz7IJzDkHG7
+uOv2LTN/UBlafOVuOo/hBKkfiok6y9lQ3XD+KBuIBQP9FVXpaV07hG60fl3YzdU3
++dfG6ykyQJlW46CijPE=
+=A4fU
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch
new file mode 100644
index 000000000000..e568b88a3f46
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch
@@ -0,0 +1,44 @@
+--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/03/21 18:22:15	1303489
++++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/06/03 18:54:26	1345740
+@@ -60,6 +60,9 @@
+ /* KWallet simple provider, puts passwords in KWallet                    */
+ /*-----------------------------------------------------------------------*/
+ 
++static int q_argc = 1;
++static char q_argv0[] = "svn"; // Build non-const char * from string constant
++static char *q_argv[] = { q_argv0 };
+ 
+ static const char *
+ get_application_name(apr_hash_t *parameters,
+@@ -212,12 +215,11 @@
+   QCoreApplication *app;
+   if (! qApp)
+     {
+-      int argc = 1;
+-      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++      int argc = q_argc;
++      app = new QCoreApplication(argc, q_argv);
+     }
+ 
+-  KCmdLineArgs::init(1,
+-                     (char *[1]) {(char *) "svn"},
++  KCmdLineArgs::init(q_argc, q_argv,
+                      get_application_name(parameters, pool),
+                      "subversion",
+                      ki18n(get_application_name(parameters, pool)),
+@@ -289,12 +291,11 @@
+   QCoreApplication *app;
+   if (! qApp)
+     {
+-      int argc = 1;
+-      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++      int argc = q_argc;
++      app = new QCoreApplication(argc, q_argv);
+     }
+ 
+-  KCmdLineArgs::init(1,
+-                     (char *[1]) {(char *) "svn"},
++  KCmdLineArgs::init(q_argc, q_argv,
+                      get_application_name(parameters, pool),
+                      "subversion",
+                      ki18n(get_application_name(parameters, pool)),
diff --git a/dev-vcs/subversion/subversion-1.7.6.ebuild b/dev-vcs/subversion/subversion-1.7.6.ebuild
index b4a05fbb2631..9a4423762b33 100644
--- a/dev-vcs/subversion/subversion-1.7.6.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.6.ebuild,v 1.2 2012/08/21 20:53:41 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.6.ebuild,v 1.3 2012/08/22 20:33:10 tommy Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -109,7 +109,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
 		"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
 		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
-		"${FILESDIR}"/${P}-revert-mod_dontdothat-move.patch
+		"${FILESDIR}"/${P}-revert-mod_dontdothat-move.patch \
+		"${FILESDIR}"/${P}-kwallet.patch
 
 	fperms +x build/transform_libtool_scripts.sh