Add a patch to deal with canna character API change. bug #353949

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

5 files changed, 29 insertions, 22 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 4333dfcb4fdc..8e88a68e5cbc 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.233 2011/07/29 00:26:53 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.234 2011/08/28 15:55:55 naota Exp $
+
+  28 Aug 2011; Naohiro Aota <naota@gentoo.org> uim-1.6.1.ebuild,
+  +files/uim-1.6.1-canna.patch, uim-1.7.0.ebuild:
+  Add a patch to deal with canna character API change. bug #353949
 
 *uim-1.7.1 (29 Jul 2011)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 6fe566ee0c64..da29cc1843a1 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -7,6 +7,7 @@ AUX uim-1.5.4-gentoo.patch 1366 RMD160 2ff73cab38b95772245ed78c06166ca865aa4474
 AUX uim-1.5.4-zhTW.patch 1034 RMD160 8d9102b0937d2746a1b4bad5470b1480b94b5eb8 SHA1 d93cf2c1f7e253fefdbdb80f2207b2080d2d1768 SHA256 82afb0a1cc1c2e706ac02da71084fe16655bbcb9719710ae37057ab6c14b9196
 AUX uim-1.6.0-gentoo.patch 381 RMD160 b1be11c6cda393fac0c9d7848d52c0421e7fee77 SHA1 be3ab78b9262862f7b8e461f118dfd5e94700757 SHA256 c44e97d8c4d2125e17fe0d8107ce3d258c930b9dda3329eec170cfb291ae6c80
 AUX uim-1.6.0-linker.patch 5969 RMD160 a6e60d17606a1bede3bb159b0ed34bf2705877a3 SHA1 eded83ebc0dc5ac4bffad982b64f7cd7895ec695 SHA256 432d51518a51aeca563ec9ae0a8b84b3968032afe5b0313c403a2fe872a883d0
+AUX uim-1.6.1-canna.patch 193 RMD160 d2f360d3f6aabac52d6070f39b557f9e54c152bf SHA1 d80a37169c1cc788e10fa7c77fcc17c6ed12f4e7 SHA256 7df7a9e356cda2620d114e9888f72d7adc09aff6eee0bb315a6d85a94ae0eb69
 AUX uim-1.6.1-libnotify-0.7.patch 661 RMD160 18ded31a4895abd2491fb470e20d8dfc8fbe5f1b SHA1 3130c041f0f62248b1ff0ae5f1a78a6953872f50 SHA256 f96f6fb81208a4a11382f08687bb92e0738ab54bb39a06146a284d8232edd8bb
 AUX xinput-uim 108 RMD160 f8a0998539cc569d5be54e378104561d6798186d SHA1 ed2669ba359cfd27254728b2a16565bc36b87596 SHA256 972c38f0c227cdf2ace54fa3cb0d0095864e88cf38c73759645151e3eae4b548
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
@@ -16,25 +17,15 @@ DIST uim-1.7.0.tar.bz2 6402469 RMD160 e866f4270e60d0590a0a37331f3ccf64d7e48fbf S
 DIST uim-1.7.1.tar.bz2 6354866 RMD160 af62d79be189e0cafda37fbb34bd94441ebeff77 SHA1 9001955f9efbd3cf23c9ad62c027f44060553fa8 SHA256 81964ed6786eaa8306b0a638193db8171b78b386b9443d2e6a78e7f2cdf9a773
 EBUILD uim-1.4.2.ebuild 3987 RMD160 d290986b0fbefcd7855237c56ac59ec7457de6d4 SHA1 01fd6a01801b0aa17335c7df5582ef460cb229f3 SHA256 02cf0e6dba0b37e028d5e5aedd0aed1b4091a7522e245d55c95ef455d0a81143
 EBUILD uim-1.5.7.ebuild 5340 RMD160 e1bea05e98821a63e91c5c687757878744aa2c9e SHA1 fbd35bd0e661dc6c55a05eb81c41f6387d90c8f8 SHA256 681eaeae231fdb61e242a736988b8bce08978a0bc15788101476ab24ad9f278e
-EBUILD uim-1.6.1.ebuild 6001 RMD160 684885daddc35675be899fcd409ccb0ffbd59390 SHA1 fce90623f2f0f119dedb67c57fc3ca7fa4d521e8 SHA256 4f372578688a3ec393cfa8619d84d7189f0bdb6f23c0f03557616a0f02f8ffb1
-EBUILD uim-1.7.0.ebuild 6767 RMD160 95b64f1012e05055bed60efcb685baf03ce6a1b4 SHA1 3971dff6899668c4d4f5edbd048742c5f53ffdcf SHA256 44d489fe8d4edcc5c3af2c1a1d737b6b19b3670f5ceacf4bf4c47c822a296e25
+EBUILD uim-1.6.1.ebuild 6041 RMD160 afc417d09dc862a85cf90a9e9688b266904518d2 SHA1 3975fe4050788156b2ae0e09586deced7ea54896 SHA256 e75f5ea6f4d63a8ad9a053592c99c629ee128d8742d45ec40f63efbe5cd6c68c
+EBUILD uim-1.7.0.ebuild 6808 RMD160 82eabe9b89881bed3fcfe3d3539c6009e7b4d4a8 SHA1 fc67b4e59215ee6cb412d4b429989f25ed3ead99 SHA256 12b0686632e818f914a3e48889e314835f485842fff81486fe4ccfa49230b061
 EBUILD uim-1.7.1.ebuild 6767 RMD160 8467cb16d31d12a07cdf0a88ce346f68c2647319 SHA1 6b79e1e9900bf860f3d72e547c08b09b611e9fda SHA256 8b13df36b0f039c3844158643b3c70c7a66b7cc812bd5a684eebdf258a47959c
-MISC ChangeLog 33345 RMD160 bbb2be9e694ee4a2791bcc5f8afd0c74d5998bfb SHA1 a8e0d1c0fd9166540d40cbad4acff700707707a9 SHA256 76979cd57832bdd428e325cc08d5d6e0eab34712158e3886de0ff8be6dd7e5e3
+MISC ChangeLog 33527 RMD160 aa969c60759381ad31fce0ee931fd678bb4b25b1 SHA1 e9c5bc27c146d79dd7dc5d221905beb2dd39c2ae SHA256 9884674600aec0614f4c845507d192e8cb02c5b2ed7f0409e5d9c53e3a6c3106
 MISC metadata.xml 1034 RMD160 429bb6d299b51424cae9a1819780f1fc584c0f98 SHA1 47841164009510e27566c649326d0aeca3372561 SHA256 db58c4986dba0f27028a4483ea64403ce8b5b5a47e25a9165f6c9d595eee5497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOMf5jAAoJECaGw+YFKA1pLDcP/iSBFYb4SuuvyPxBytTntMGw
-kEGvWv9wb08eWFU72B66CUJjGGZ5vlffu8yIBYFJzDUkQxgl6430ZajJW63OBImn
-GIFjxnQl20S5Gj+wGJxOKEFfLYN5DYmiVlrwPfkro7+IlTHlBIgO1igyvOUFE2Rw
-98NHlYlodzkp95x81OOFlIhfmNSAzUUyarVm6tzamkDXgmeoEVGpnx5YEHfiOzGu
-Pp4KhVVv7pGBua3JNb8/b7FCSz3sQbFG+ozkVbIbCl9QSmPtLLz4vUWSPZKwFla9
-MVkMORE/e7is/mjVuzrTeDNr3KIaJzQSn8jFXtuXiUzeZzB44Bpfv1zGQrCM4BYX
-3wvi5lBc3hkpbB2feGwlVTEpdewAuB1ylHO/NUa7iPlm5Ve4wqhm5ZP5wIr9MC1H
-4I9sN407OwNl9QB0SKYm25zUykNpJWcRa61NvwDuyZif3e9YXO6U3yiF+01FFWgR
-UPbH/8kbg2DPbU+yQybrbEJUgBBIgFrGmYgdQsRLuFKmjizvnvaY4BSl8PBPt5ok
-72c7Dusd+kPIAQ4krYrkDQ/Haig3BNXswU6Q8G8GUMUSC/KIIVrTqWijit2rRBj1
-x+kIOUn+MpuLZ7VqGw+y1/X+Dpi3yG0sunKti1Y60l/a7AwBk2ieN32DLHiaRNAF
-C0bBza1kOzIVH2CgpDHN
-=7NFk
+iEYEARECAAYFAk5aZQkACgkQGpDnPLSHuMAZBQCbBon41WHUW/aAV3KMC3TpqA3B
+sScAnjkVGuls0G0hZFybEaNN6kWc/Fkc
+=qBrl
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/uim-1.6.1-canna.patch b/app-i18n/uim/files/uim-1.6.1-canna.patch
new file mode 100644
index 000000000000..276c2aad502a
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.6.1-canna.patch
@@ -0,0 +1,10 @@
+--- helper/dict-canna.c
++++ helper/dict-canna.c
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
++#define CANNA_NEW_WCHAR_AWARE
+ #include <canna/RK.h>
+ 
+ #include <stdlib.h>
diff --git a/app-i18n/uim/uim-1.6.1.ebuild b/app-i18n/uim/uim-1.6.1.ebuild
index e9126b9136fe..65144cf3c903 100644
--- a/app-i18n/uim/uim-1.6.1.ebuild
+++ b/app-i18n/uim/uim-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.1.ebuild,v 1.3 2011/02/13 19:11:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.1.ebuild,v 1.4 2011/08/28 15:55:55 naota Exp $
 
 EAPI="3"
 inherit autotools eutils multilib elisp-common flag-o-matic
@@ -96,7 +96,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
 		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
 		"${FILESDIR}"/${PN}-1.6.0-linker.patch \
-		"${FILESDIR}"/${PN}-1.6.1-libnotify-0.7.patch
+		"${FILESDIR}"/${PN}-1.6.1-libnotify-0.7.patch \
+		"${FILESDIR}"/${PN}-1.6.1-canna.patch
 
 	# bug 275420
 	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
diff --git a/app-i18n/uim/uim-1.7.0.ebuild b/app-i18n/uim/uim-1.7.0.ebuild
index 4af289fe6c34..90a697356a99 100644
--- a/app-i18n/uim/uim-1.7.0.ebuild
+++ b/app-i18n/uim/uim-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.0.ebuild,v 1.1 2011/05/23 17:28:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.0.ebuild,v 1.2 2011/08/28 15:55:55 naota Exp $
 
 EAPI="3"
 inherit autotools eutils multilib elisp-common flag-o-matic
@@ -111,7 +111,8 @@ update_gtk3_immodules() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch
+		"${FILESDIR}"/${PN}-1.5.4-zhTW.patch \
+		"${FILESDIR}"/${PN}-1.6.1-canna.patch
 
 	# bug 275420
 	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die