Patch to build against Qt-4.7. Thanks to Muneyuki Noguchi<nogu.dev@gmail.com>. Bug #331133

Package-Manager: portage-2.2_rc99/cvs/Linux x86_64

4 files changed, 36 insertions, 5 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 17f9e703a307..4f4174b74f14 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/uim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.221 2010/07/10 19:17:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.222 2010/10/23 10:07:36 hwoarang Exp $
+
+  23 Oct 2010; Markos Chandras <hwoarang@gentoo.org> uim-1.5.7-r1.ebuild,
+  +files/uim-1.5.7-qt4.7.patch:
+  Patch to build against Qt-4.7. Thanks to Muneyuki
+  Noguchi<nogu.dev@gmail.com>. Bug #331133
 
   10 Jul 2010; Raúl Porcel <armin76@gentoo.org> uim-1.5.7.ebuild:
   alpha/sparc stable wrt #298221
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 044d2ed21000..f693233d5cc8 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50uim-gentoo.el 113 RMD160 4830acc8f32525aaae156cf0252d9e93cd41cc2c SHA1 64b0c88335dbfdab07938a8d92218407ebec2db1 SHA256 58a536e5b7d0ffac6802e60d348b092623601d25c8917d64a51347efab9e4cb7
 AUX uim-1.5.4-gcc43.patch 404 RMD160 99bb3adb856b82b7efcf5e9e07dfe1a647cde83d SHA1 5ec9d1ffbd7eb44568795b9e532e05e7caf59457 SHA256 560494a526ab30d7524d769f359a592c1a73671b51491e426d48306cc537707a
 AUX uim-1.5.4-gentoo.patch 1366 RMD160 2ff73cab38b95772245ed78c06166ca865aa4474 SHA1 cb729594bd9d1cf56c084050ed954bf07fac0e8d SHA256 5b9639144848e42a049426172d7a4b53cbc74532e9787881a807511ab8b6552b
@@ -5,6 +8,7 @@ AUX uim-1.5.4-zhTW.patch 1034 RMD160 8d9102b0937d2746a1b4bad5470b1480b94b5eb8 SH
 AUX uim-1.5.6-toplevel-delete-event.patch 870 RMD160 397d29ab572a0a5aabfa18dce56670f0ee6b998f SHA1 6bea0229eaa4187f0eac4b97d5ee284320876b0c SHA256 4a1b9bc9bbb4742e5a9fb0da2b19b985e711df7afeabef7ee3edc065692ccde6
 AUX uim-1.5.7-kde4-applet.patch 426 RMD160 6a94e138421e65484337827e3ddd8e0d257af5ec SHA1 9a9e64864c7f47ac23b8a9c792de1d8ee2e2c8be SHA256 ca178782cf9b7b84a6b81a90f654ed0078a8dee76b7275895098c41208762a7d
 AUX uim-1.5.7-kde4.patch 6397 RMD160 df19bf38df9146c7adaadbb3c590c8670b716a49 SHA1 1bc8ed999a17831360d083478bee91f5cc3a8aa3 SHA256 f587331dd97031e94e11dff08f64bb2ef4aee7bccf7d7d970ddfdc0590b73ee1
+AUX uim-1.5.7-qt4.7.patch 478 RMD160 823e323e03d514b529d8c70ce871b7264d71378b SHA1 320dd7576788aba98c87313d60f1bcdf7f5224e7 SHA256 f2b57414e3c8f2189d279df4e15b86f0166196714505a7307b28be4784e794c6
 AUX uim-disable-notify.diff 1738 RMD160 a19b315a0b5f1408c543535886665562e90dd666 SHA1 023ce4cb996ddcd50ce19892a202c6d09dcab522 SHA256 05325e441d0c7d6ae241976ac0e432e4cb7f56c9c4b2d37eddfd081e45490848
 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2
 DIST uim-1.5.6.tar.bz2 3343584 RMD160 01774ff38e64436945290a5c3b2e1dc1a14d6771 SHA1 24b33991db4813fe82af7862c5e0d0f6d6b284dd SHA256 ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f
@@ -12,7 +16,14 @@ DIST uim-1.5.7.tar.bz2 3330555 RMD160 037677cd583c2b69293fbbc1c0393756d7c7adac S
 EBUILD uim-1.4.2.ebuild 3999 RMD160 43c80abb4398057ef4530d51b1cbc592d3d7ba3e SHA1 39939cf9710cd84f2304d346f97a3d2f0021227a SHA256 49ab526a6383f7922802d4b721543745e2dd987408ac4fa2a7effd5f76da378d
 EBUILD uim-1.5.6-r1.ebuild 5169 RMD160 e82f2e8c8f34bc4d791bb75d19e34c67a9982bd5 SHA1 701b76f6e22e3951d36b9f1c4e2da550c920b4dd SHA256 574c5354750de42007dd70e3fe8eecef4e4826ff665028e554d409b46e66891b
 EBUILD uim-1.5.6-r4.ebuild 5266 RMD160 3cef3cd7d431d22935bb172a95628a0ede220e73 SHA1 c3dd334ae92aca209ededf97ec522ca6edb706e6 SHA256 06adc9371af5449f669bc4f23e0bcb6d3e11b1b8288895a3dcbbeb54f78c4f13
-EBUILD uim-1.5.7-r1.ebuild 5379 RMD160 8b2ae20f3c3f78397d2bbeb0b4a12ae8f104bbc8 SHA1 299e4a451f8eef7e46ea8d0ce078dbb40787e564 SHA256 e607ba17e742bdfafebad662c5b7cc9ed25d7687a83994700fac94911c04fdaa
+EBUILD uim-1.5.7-r1.ebuild 5416 RMD160 804d1e87f0ef3fb4520cb0d07006c67d370bc267 SHA1 5c829d661aa9d4e0d6629b97562e276b4feacf07 SHA256 dc3230d6fe189071eba7bfde988359dd58ecf52832e73b0417979dbefe520e22
 EBUILD uim-1.5.7.ebuild 5296 RMD160 23fb62b18eb84c7792b45d7951c97a1fe193b7cd SHA1 d81dfdd0169c9eae48c1328bb685d905f9d9a13e SHA256 95d7baf47b0c95a4c001d95e79da044343401aa50be2753a86059ab166937af5
-MISC ChangeLog 30950 RMD160 99ace930377577c5da848c169cf7a6a96ff0efbc SHA1 3df138470a00a8f7b2f71848976ece206ef4eb67 SHA256 d33defe435a010a9af9e62878874aa3b75eb9975fffea6bd7cb83003c096645a
+MISC ChangeLog 31153 RMD160 dce8a3ef1974461e77cc738562334d485b7a2e70 SHA1 009a10f9ea454b85375f7e2ed301aab501f7ccad SHA256 dafb49cd77f3b7e3af70af767eba5eeee70ee9f58738eef704baad6dbc7ea471
 MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzCs/AACgkQ9/cejkQaxBATYQCeKX4hpu4e4malHlt5OUI4h3d7
+FEAAnjkxh4rkbYLl4foAuz34KqBmdp3y
+=FfT0
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/uim-1.5.7-qt4.7.patch b/app-i18n/uim/files/uim-1.5.7-qt4.7.patch
new file mode 100644
index 000000000000..d1e4af25ebc5
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.5.7-qt4.7.patch
@@ -0,0 +1,14 @@
+Index: qt4/pref/customwidgets.cpp
+===================================================================
+--- qt4/pref/customwidgets.cpp	(revision 6394)
++++ qt4/pref/customwidgets.cpp	(revision 6395)
+@@ -886,8 +886,7 @@
+     : QDialog( parent ),
+       pressed_keyval( 0 ),
+       pressed_keystate( Qt::NoModifier ),
+-      pressed_unichar ( 0 ),
+-      m_keystr( 0 )
++      pressed_unichar ( 0 )
+ {
+     QLabel *l = new QLabel( _("Press keys to grab (e.g. <Control>a)"), this );
+ 
diff --git a/app-i18n/uim/uim-1.5.7-r1.ebuild b/app-i18n/uim/uim-1.5.7-r1.ebuild
index 1b0a3cdcfbd2..5513a4e81012 100644
--- a/app-i18n/uim/uim-1.5.7-r1.ebuild
+++ b/app-i18n/uim/uim-1.5.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7-r1.ebuild,v 1.1 2010/02/04 16:33:10 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7-r1.ebuild,v 1.2 2010/10/23 10:07:36 hwoarang Exp $
 
 EAPI="2"
 inherit autotools eutils multilib elisp-common flag-o-matic
@@ -87,7 +87,8 @@ src_prepare() {
 		"${FILESDIR}/${PN}-1.5.4-gcc43.patch" \
 		"${FILESDIR}/${PN}-1.5.4-zhTW.patch" \
 		"${FILESDIR}/${P}-kde4.patch" \
-		"${FILESDIR}/${P}-kde4-applet.patch"
+		"${FILESDIR}/${P}-kde4-applet.patch" \
+		"${FILESDIR}/${P}-qt4.7.patch"
 
 	# bug 275420
 	sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die