diff options
| author |   Mu Qiao <qiaomuf@gentoo.org> | 2011-02-26 08:09:49 +0000 |
|---|---|---|
| committer | Mu Qiao <qiaomuf@gentoo.org> | 2011-02-26 08:09:49 +0000 |
| commit | 2deb87fd6cedd10b637598f32a0cb449b847b558 (patch) | |
| tree | 821ba83af0d18cbd1209c2789a606d6825448ad5 /app-i18n/sunpinyin | |
| parent | ppc64 stable wrt #346601 (diff) | |
| download | gentoo-2-2deb87fd6cedd10b637598f32a0cb449b847b558.tar.gz gentoo-2-2deb87fd6cedd10b637598f32a0cb449b847b558.tar.bz2 gentoo-2-2deb87fd6cedd10b637598f32a0cb449b847b558.zip | |
Include upstream patch.
(Portage version: 2.1.9.41/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/sunpinyin')
| -rw-r--r-- | app-i18n/sunpinyin/ChangeLog | 8 | ||||
| -rw-r--r-- | app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch | 30 | ||||
| -rw-r--r-- | app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild (renamed from app-i18n/sunpinyin/sunpinyin-2.0.3.ebuild) | 5 |
3 files changed, 40 insertions, 3 deletions
diff --git a/app-i18n/sunpinyin/ChangeLog b/app-i18n/sunpinyin/ChangeLog index ed15fbda9892..75997074e7cb 100644 --- a/app-i18n/sunpinyin/ChangeLog +++ b/app-i18n/sunpinyin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-i18n/sunpinyin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/ChangeLog,v 1.6 2011/02/20 13:22:37 qiaomuf Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/ChangeLog,v 1.7 2011/02/26 08:09:49 qiaomuf Exp $ + +*sunpinyin-2.0.3-r1 (26 Feb 2011) + + 26 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> -sunpinyin-2.0.3.ebuild, + +sunpinyin-2.0.3-r1.ebuild, +files/sunpinyin-2.0.3-force-switch.patch: + Include upstream patch. 20 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> sunpinyin-2.0.3.ebuild: Fix compilation for userpriv, thanks to Alphat-PC. diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch new file mode 100644 index 000000000000..f2f6b389ba09 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch @@ -0,0 +1,30 @@ +diff --git a/SConstruct b/SConstruct +index 68cd365..9bb6ebc 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -180,12 +180,6 @@ libdir = env['LIBDIR'] + libdatadir = env['LIBDATADIR'] + '/sunpinyin/data' + headersdir = env['PREFIX'] + '/include/sunpinyin-2.0' + +-if GetOS() != 'Darwin': +- env.Append(LINKFLAGS=['-Wl,-soname=libsunpinyin.so.%d' % abi_major]) +- +-if GetOption('rpath') is not None and GetOS() != 'Darwin': +- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath')) +- + # pass through environmental variables + envvar = [('CC', 'CC'), + ('CXX', 'CXX'), +@@ -202,6 +196,12 @@ extra_cflags=' -DHAVE_CONFIG_H -DSUNPINYIN_DATA_DIR=\'"%s"\'' % libdatadir + env.Append(CFLAGS=extra_cflags) + env.Append(CXXFLAGS=extra_cflags) + ++if GetOS() != 'Darwin': ++ env.Append(LINKFLAGS=' -Wl,-soname=libsunpinyin.so.%d' % abi_major) ++ ++if GetOption('rpath') is not None and GetOS() != 'Darwin': ++ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath')) ++ + # + #==============================configure================================ + # diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild index fe7fd7211bbd..542c37df0f82 100644 --- a/app-i18n/sunpinyin/sunpinyin-2.0.3.ebuild +++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.3.ebuild,v 1.3 2011/02/20 13:22:37 qiaomuf Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild,v 1.1 2011/02/26 08:09:49 qiaomuf Exp $ EAPI="1" -inherit scons-utils +inherit eutils scons-utils DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME" HOMEPAGE="http://sunpinyin.googlecode.com" @@ -24,6 +24,7 @@ src_unpack() { unpack "${P}.tar.gz" ln -s "${DISTDIR}/dict.utf8.tar.bz2" "${S}/raw/" || die "dict file not found" ln -s "${DISTDIR}/lm_sc.t3g.arpa.tar.bz2" "${S}/raw/" || die "dict file not found" + cd "${S}" && epatch "${FILESDIR}/${P}-force-switch.patch" } src_compile() { |