diff options
author | 2012-04-19 09:42:27 +0000 | |
---|---|---|
committer | 2012-04-19 09:42:27 +0000 | |
commit | f7baa92acc5a491bab48744fb9972fd2dc375f8e (patch) | |
tree | a35e8e4d94621bbb4ebe089d0ad72c643d087375 /app-i18n | |
parent | Bump (diff) | |
download | gentoo-2-f7baa92acc5a491bab48744fb9972fd2dc375f8e.tar.gz gentoo-2-f7baa92acc5a491bab48744fb9972fd2dc375f8e.tar.bz2 gentoo-2-f7baa92acc5a491bab48744fb9972fd2dc375f8e.zip |
Fix glib-2.32 building, bug #412071 by Looze Vladimir.
(Portage version: 2.1.10.56/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
-rw-r--r-- | app-i18n/uim/ChangeLog | 6 | ||||
-rw-r--r-- | app-i18n/uim/files/uim-1.8.0-glib2.32.patch | 12 | ||||
-rw-r--r-- | app-i18n/uim/uim-1.8.0.ebuild | 5 |
3 files changed, 20 insertions, 3 deletions
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog index 37ff24fc09f5..6f055f97a5fb 100644 --- a/app-i18n/uim/ChangeLog +++ b/app-i18n/uim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/uim # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.240 2012/04/12 11:46:38 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.241 2012/04/19 09:42:27 pacho Exp $ + + 19 Apr 2012; Pacho Ramos <pacho@gentoo.org> +files/uim-1.8.0-glib2.32.patch, + uim-1.8.0.ebuild: + Fix glib-2.32 building, bug #412071 by Looze Vladimir. *uim-1.8.0 (12 Apr 2012) diff --git a/app-i18n/uim/files/uim-1.8.0-glib2.32.patch b/app-i18n/uim/files/uim-1.8.0-glib2.32.patch new file mode 100644 index 000000000000..8e8ed6307ecf --- /dev/null +++ b/app-i18n/uim/files/uim-1.8.0-glib2.32.patch @@ -0,0 +1,12 @@ +Index: uim-1.8.0/notify/uim-libnotify.c +=================================================================== +--- uim-1.8.0.orig/notify/uim-libnotify.c ++++ uim-1.8.0/notify/uim-libnotify.c +@@ -37,7 +37,6 @@ + #include <stdarg.h> + #include <string.h> + #include <glib.h> +-#include <glib/gconvert.h> + #include <libnotify/notify.h> + + #include "uim.h" /* for uim_bool */ diff --git a/app-i18n/uim/uim-1.8.0.ebuild b/app-i18n/uim/uim-1.8.0.ebuild index 4aeffd728a90..32b1b805f308 100644 --- a/app-i18n/uim/uim-1.8.0.ebuild +++ b/app-i18n/uim/uim-1.8.0.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/app-i18n/uim/uim-1.8.0.ebuild,v 1.1 2012/04/12 11:46:38 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0.ebuild,v 1.2 2012/04/19 09:42:27 pacho Exp $ EAPI="4" inherit autotools eutils multilib elisp-common flag-o-matic @@ -114,7 +114,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.8.0-glib2.32.patch # bug 275420 sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die |