diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-10-23 10:07:36 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-10-23 10:07:36 +0000 |
| commit | 1aec0b2abb25fc99797a7b489c77f40593d50610 (patch) | |
| tree | 94a08c0eedc6e1310d6eeff649bbb1f03f95c47b /app-i18n | |
| parent | stable x86, bug 341241 (diff) | |
| download | gentoo-2-1aec0b2abb25fc99797a7b489c77f40593d50610.tar.gz gentoo-2-1aec0b2abb25fc99797a7b489c77f40593d50610.tar.bz2 gentoo-2-1aec0b2abb25fc99797a7b489c77f40593d50610.zip | |
Patch to build against Qt-4.7. Thanks to Muneyuki Noguchi<nogu.dev@gmail.com>. Bug #331133
(Portage version: 2.2_rc99/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/uim/ChangeLog | 7 | ||||
| -rw-r--r-- | app-i18n/uim/files/uim-1.5.7-qt4.7.patch | 14 | ||||
| -rw-r--r-- | app-i18n/uim/uim-1.5.7-r1.ebuild | 5 |
3 files changed, 23 insertions, 3 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/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 |