diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2012-07-08 19:43:42 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2012-07-08 19:43:42 +0000 |
| commit | 8d49d15a1641becda000c1f7f64160b14859cbeb (patch) | |
| tree | 7762fbd9ca6e093d10951c00f2fc5b39b8bf2b69 /app-i18n/scim-bridge | |
| parent | Drop myself out of metadata. (diff) | |
| download | gentoo-2-8d49d15a1641becda000c1f7f64160b14859cbeb.tar.gz gentoo-2-8d49d15a1641becda000c1f7f64160b14859cbeb.tar.bz2 gentoo-2-8d49d15a1641becda000c1f7f64160b14859cbeb.zip | |
Add patch to build on gcc-4.7. #421899
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/scim-bridge')
| -rw-r--r-- | app-i18n/scim-bridge/ChangeLog | 7 | ||||
| -rw-r--r-- | app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch | 24 | ||||
| -rw-r--r-- | app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild | 3 |
3 files changed, 31 insertions, 3 deletions
diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog index 1f8f8ee7f246..63149d915aec 100644 --- a/app-i18n/scim-bridge/ChangeLog +++ b/app-i18n/scim-bridge/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/scim-bridge # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.35 2012/05/03 19:24:26 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.36 2012/07/08 19:43:42 naota Exp $ + + 08 Jul 2012; Naohiro Aota <naota@gentoo.org> + +files/scim-bridge-0.4.16+gcc-4.7.patch, scim-bridge-0.4.16-r2.ebuild: + Add patch to build on gcc-4.7. #421899 03 May 2012; Jeff Horelick <jdhore@gentoo.org> scim-bridge-0.4.16-r1.ebuild, scim-bridge-0.4.16-r2.ebuild: @@ -176,4 +180,3 @@ 26 Sep 2006; MATSUU Takuto <matsuu@gentoo.org> +metadata.xml, +scim-bridge-0.4.5.ebuild: Initial import, bug 143295. - diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch new file mode 100644 index 000000000000..99899d8c4b37 --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16+gcc-4.7.patch @@ -0,0 +1,24 @@ +diff --git a/agent/utils/scim-bridge-agent-panel-client.cpp b/agent/utils/scim-bridge-agent-panel-client.cpp +index 07cb14b..62fd3b3 100644 +--- a/agent/utils/scim-bridge-agent-panel-client.cpp ++++ b/agent/utils/scim-bridge-agent-panel-client.cpp +@@ -24,6 +24,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <sys/wait.h> ++#include <unistd.h> + + #define Uses_SCIM_CONFIG_PATH + +diff --git a/agent/scim-bridge-agent-signal-listener.cpp b/agent/scim-bridge-agent-signal-listener.cpp +index 433dc15..c9eff47 100644 +--- a/agent/scim-bridge-agent-signal-listener.cpp ++++ b/agent/scim-bridge-agent-signal-listener.cpp +@@ -22,6 +22,7 @@ + #include <signal.h> + #include <stdio.h> + #include <string.h> ++#include <unistd.h> + + #include <sys/socket.h> + #include <sys/types.h> diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild index bccdaa0a22e1..9eba80daa10f 100644 --- a/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild +++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.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/scim-bridge/scim-bridge-0.4.16-r2.ebuild,v 1.4 2012/05/03 19:24:26 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16-r2.ebuild,v 1.5 2012/07/08 19:43:42 naota Exp $ EAPI="2" @@ -45,6 +45,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-0.4.15.2-qt4.patch" epatch "${FILESDIR}/${PN}-0.4.15.2-gcc43.patch" epatch "${FILESDIR}/${P}+gcc-4.4.patch" + epatch "${FILESDIR}/${P}+gcc-4.7.patch" # bug #280887 epatch "${FILESDIR}/${P}-configure.ac.patch" |