root
12 years ago
parent
d5e4c6f785
commit
9e314c1eba
@ -1,4 +1,2 @@
|
||||
DIST ibus-hangul-1.2.0.20100102.tar.gz 424000 RMD160 3d8bd1ae193bd3c647aeadb5dbda21e5416070a3 SHA1 7483377b7a2108115e9eb3d2c39100971b47b1bb SHA256 4f146655cf75fa978e939708bb9c2a3329480ffd38b39ec738e33bd19b2944db
|
||||
DIST ibus-hangul-1.3.1.tar.gz 431214 RMD160 996172fb00854ae2000b3197707269ebd8d6808e SHA1 e1fb0e0560d8987c3106992693638a298bd2ea1c SHA256 1e5530c1d7add8970f3a98a76a0a2feda06a08d65af56fbba5329a6645915afc
|
||||
DIST ibus-hangul-1.3.2.tar.gz 435057 RMD160 3b27f4f5cc3ea8496513a9d4bd932ebd6e20b9d2 SHA1 c1f5dd0e0f7755457afcaae738d63ebf4514cf54 SHA256 0f6793c61d64461badadb042f0cea184ae69348d8bbfefe976f1e4a63a37a5a3
|
||||
DIST ibus-hangul-1.4.0.tar.gz 439462 RMD160 07ac966ba9f878ead7e17d31a653bd5514098305 SHA1 421d7164a27eeedfea49d54b61e2a5edd4f7d3a7 SHA256 a955ec0c9ea90ecd8e8d0fd2de1596a5ba1186463862c387d74a418d1707ca0a
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.2.0.20100102.ebuild,v 1.6 2011/05/25 00:04:59 matsuu Exp $
|
||||
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
inherit python
|
||||
|
||||
DESCRIPTION="The Hangul engine for IBus input platform"
|
||||
HOMEPAGE="http://code.google.com/p/ibus/"
|
||||
SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="nls"
|
||||
|
||||
RDEPEND=">=dev-lang/python-2.5
|
||||
>=app-i18n/ibus-1.2
|
||||
!>=app-i18n/ibus-1.3.99
|
||||
>=app-i18n/libhangul-0.0.10
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig
|
||||
nls? ( >=sys-devel/gettext-0.17 )"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
mv py-compile py-compile.orig || die
|
||||
ln -s "$(type -P true)" py-compile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf $(use_enable nls) || die
|
||||
emake || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.3.2.ebuild,v 1.1 2012/01/21 03:06:54 matsuu Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
|
||||
inherit eutils python
|
||||
|
||||
DESCRIPTION="The Hangul engine for IBus input platform"
|
||||
HOMEPAGE="http://code.google.com/p/ibus/"
|
||||
SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="nls"
|
||||
|
||||
RDEPEND=">=app-i18n/ibus-1.2.99
|
||||
dev-python/pygobject
|
||||
dev-python/pygtk
|
||||
>=app-i18n/libhangul-0.1
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig
|
||||
nls? ( >=sys-devel/gettext-0.17 )"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# http://pkgs.fedoraproject.org/gitweb/?p=ibus-hangul.git
|
||||
epatch "${FILESDIR}/${PN}-ibus-1.4.patch" || die
|
||||
mv py-compile py-compile.orig || die
|
||||
ln -s "$(type -P true)" py-compile || die
|
||||
sed -i -e "s:python:$(PYTHON -2):" setup/ibus-setup-hangul.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable nls) || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize /usr/share/${PN}
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup /usr/share/${PN}
|
||||
}
|
||||
@ -1,6 +1 @@
|
||||
DIST mozc-1.0.558.102.tar.bz2 41540430 RMD160 46d00bdac42cfa56e4a1eebc79653a7bf5050caa SHA1 24fbb0d39d6d81953114d39e546edd85361cef3a SHA256 52849be12c77c2bebc1038a47366e36f5e86bcc1089c12ae0dc4901be4e2f548
|
||||
DIST mozc-1.1.773.102.tar.bz2 36818453 RMD160 9e8b24bbb551e3f3c252605f584af73dca774291 SHA1 8552b89d428571b034f757161a08995d725fc4aa SHA256 24f9f05111ac40a7f121bc3c460429c54a7308cd65a7536a69c41cfc6c6c7850
|
||||
DIST mozc-1.2.855.102.tar.bz2 40681117 RMD160 fb15df25a56be174c0bc18acad1dd3bd8d1a5bf1 SHA1 c078e9cbc00d3c216aa0d739ae4f4405a2259e94 SHA256 d9d0a0e7fe00ad28a4e99776616157bae05b3d3cea327eac41e8f6a020a28227
|
||||
DIST mozc-1.3.911.102.tar.bz2 39180652 RMD160 4cb286286107ee9ce4f3d6e37b0dad8742a8808b SHA1 d3b130001cebf560d2ce10e89eb55643fa056d93 SHA256 da27945d6732e4fc70c08534cc8d10cd23d6fba5ebc52e6b31cac5d04ba1588a
|
||||
DIST mozc-1.3.931.102.tar.bz2 55891776 RMD160 762263c0c49ae849d22ca06f0ff659e694aeb844 SHA1 41f349b9b4ea87dda19d42653d5f4b584da16c37 SHA256 f56a899e1e445e01d0f28fec45a7b3cc3dd9c68e0d6507bca00a8c01ef68c7a0
|
||||
DIST mozc-1.3.975.102.tar.bz2 55961505 RMD160 b52eddc64a79a7a9f1579648f3ee878837355971 SHA1 ef3f23083152fa564eba98235e83d72d14a06404 SHA256 1ee57425c159bc0066645f086472f72aa16567fe5be272f35339c41e9a52d27a
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- mozc.orig/build_mozc.py 2010-06-10 16:02:08.000000000 +0900
|
||||
+++ mozc/build_mozc.py 2010-06-10 19:59:26.000000000 +0900
|
||||
@@ -387,7 +387,7 @@
|
||||
(unused_gyp_file_name, target_name) = ParseTarget(target)
|
||||
target_names.append(target_name)
|
||||
|
||||
- make_command = os.getenv('BUILD_COMMAND', 'make')
|
||||
+ make_command = os.getenv('BUILD_COMMAND', 'emake')
|
||||
# flags for building in Chrome OS chroot environment
|
||||
envvars = [
|
||||
'CFLAGS',
|
||||
@@ -403,7 +403,7 @@
|
||||
if envvar in os.environ:
|
||||
os.environ[envvar] = os.getenv(envvar)
|
||||
|
||||
- build_args = ['-j%s' % options.jobs, 'BUILDTYPE=%s' % options.configuration]
|
||||
+ build_args = ['BUILDTYPE=%s' % options.configuration]
|
||||
if options.build_base:
|
||||
build_args.append('builddir_name=%s' % options.build_base)
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
diff -Naur mozc-1.1.717.102.orig/base/util.cc mozc-1.1.717.102/base/util.cc
|
||||
--- mozc-1.1.717.102.orig/base/util.cc 2011-05-20 17:17:00.000000000 +0900
|
||||
+++ mozc-1.1.717.102/base/util.cc 2011-05-31 19:14:38.129021596 +0900
|
||||
@@ -373,7 +373,6 @@
|
||||
while (*str == ' ' || *str == '\t') {
|
||||
++str;
|
||||
}
|
||||
- bool inquote = false;
|
||||
if (*str == '"') {
|
||||
start = ++str;
|
||||
end = start;
|
||||
@@ -385,7 +384,6 @@
|
||||
}
|
||||
*end++ = *str;
|
||||
}
|
||||
- inquote = true;
|
||||
str = find(str, eos, ',');
|
||||
} else {
|
||||
start = str;
|
||||
diff -Naur mozc-1.1.717.102.orig/rewriter/collocation_rewriter.cc mozc-1.1.717.102/rewriter/collocation_rewriter.cc
|
||||
--- mozc-1.1.717.102.orig/rewriter/collocation_rewriter.cc 2011-05-20 17:17:03.000000000 +0900
|
||||
+++ mozc-1.1.717.102/rewriter/collocation_rewriter.cc 2011-06-01 08:17:44.886890850 +0900
|
||||
@@ -575,7 +575,6 @@
|
||||
for (size_t i = segments->history_segments_size();
|
||||
i < segments->segments_size(); ++i) {
|
||||
bool rewrited_next = false;
|
||||
- bool rewrited_prev = false;
|
||||
|
||||
if (IsKeyUnknown(segments->segment(i))) {
|
||||
continue;
|
||||
@@ -596,7 +595,6 @@
|
||||
RewriteFromPrevSegment(segments->segment(i - 1).candidate(0),
|
||||
segments->mutable_segment(i))) {
|
||||
changed = true;
|
||||
- rewrited_prev =true;
|
||||
segs_changed[i - 1] = true;
|
||||
segs_changed[i] = true;
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
diff -Naur mozc-1.1.758.102.orig/build_mozc.py mozc-1.1.758.102/build_mozc.py
|
||||
--- mozc-1.1.758.102.orig/build_mozc.py 2011-07-03 08:07:57.594671843 +0900
|
||||
+++ mozc-1.1.758.102/build_mozc.py 2011-07-03 08:11:39.989572696 +0900
|
||||
@@ -727,9 +727,7 @@
|
||||
# set output directory
|
||||
os.environ['builddir_name'] = 'out_linux'
|
||||
|
||||
- build_args = ['-j%s' % options.jobs,
|
||||
- 'MAKE_JOBS=%s' % options.jobs,
|
||||
- 'BUILDTYPE=%s' % options.configuration]
|
||||
+ build_args = ['BUILDTYPE=%s' % options.configuration]
|
||||
if options.build_base:
|
||||
build_args.append('builddir_name=%s' % options.build_base)
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
http://bugs.gentoo.org/402397
|
||||
|
||||
--- unix/ibus/mozc_engine.cc
|
||||
+++ unix/ibus/mozc_engine.cc
|
||||
@@ -620,8 +620,15 @@
|
||||
|
||||
#ifndef OS_CHROMEOS
|
||||
if (prop_mozc_tool_) {
|
||||
+#if IBUS_CHECK_VERSION(1, 4, 0)
|
||||
+ while ((prop = ibus_prop_list_get(
|
||||
+ const_cast<IBusPropList*>(
|
||||
+ ibus_property_get_sub_props(prop_mozc_tool_)), i++))) {
|
||||
+ if (!g_strcmp0(property_name, ibus_property_get_key(prop))) {
|
||||
+#else
|
||||
while ((prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++))) {
|
||||
- if (!g_strcmp0(property_name, prop->key)) {
|
||||
+ if (!g_strcmp0(property_name, prop->key)) {
|
||||
+#endif
|
||||
const MozcEngineToolProperty *entry =
|
||||
reinterpret_cast<const MozcEngineToolProperty*>(
|
||||
g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
|
||||
@@ -640,8 +647,15 @@
|
||||
}
|
||||
|
||||
i = 0;
|
||||
+#if IBUS_CHECK_VERSION(1, 4, 0)
|
||||
+ while ((prop = ibus_prop_list_get(
|
||||
+ const_cast<IBusPropList*>(
|
||||
+ ibus_property_get_sub_props(prop_composition_mode_)), i++))) {
|
||||
+ if (!g_strcmp0(property_name, ibus_property_get_key(prop))) {
|
||||
+#else
|
||||
while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) {
|
||||
- if (!g_strcmp0(property_name, prop->key)) {
|
||||
+ if (!g_strcmp0(property_name, prop->key)) {
|
||||
+#endif
|
||||
const MozcEngineProperty *entry =
|
||||
reinterpret_cast<const MozcEngineProperty*>(
|
||||
g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
|
||||
@@ -1096,8 +1110,15 @@
|
||||
|
||||
size_t i = 0;
|
||||
IBusProperty *prop = NULL;
|
||||
+#if IBUS_CHECK_VERSION(1, 4, 0)
|
||||
+ while ((prop = ibus_prop_list_get(
|
||||
+ const_cast<IBusPropList*>(
|
||||
+ ibus_property_get_sub_props(prop_composition_mode_)), i++))) {
|
||||
+ if (!g_strcmp0(entry->key, ibus_property_get_key(prop))) {
|
||||
+#else
|
||||
while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) {
|
||||
if (!g_strcmp0(entry->key, prop->key)) {
|
||||
+#endif
|
||||
// Update the language panel.
|
||||
ibus_property_set_icon(prop_composition_mode_,
|
||||
GetIconPath(entry->icon).c_str());
|
||||
@ -1,121 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ibus-mozc-1.0.558.102.ebuild,v 1.5 2011/11/12 04:42:09 naota Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2"
|
||||
inherit elisp-common eutils multilib python toolchain-funcs
|
||||
|
||||
MY_P="${P/ibus-}"
|
||||
DESCRIPTION="The Mozc engine for IBus Framework"
|
||||
HOMEPAGE="http://code.google.com/p/mozc/"
|
||||
SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="emacs +ibus scim +qt4"
|
||||
|
||||
RDEPEND="dev-libs/glib:2
|
||||
dev-libs/protobuf
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
emacs? ( virtual/emacs )
|
||||
ibus? ( >=app-i18n/ibus-1.2 )
|
||||
scim? ( app-i18n/scim )
|
||||
qt4? ( x11-libs/qt-gui:4 )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-cpp/gtest
|
||||
dev-util/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
BUILDTYPE="${BUILDTYPE:-Release}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
|
||||
epatch "${FILESDIR}/${PN}-0.11.365.102-gentoo.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
"$(PYTHON)" build_mozc.py gyp || die "gyp failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC CXX AR AS RANLIB LD
|
||||
export QTDIR="${EPREFIX}/usr"
|
||||
|
||||
local mytarget="server/server.gyp:mozc_server"
|
||||
use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
|
||||
use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
|
||||
use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
|
||||
use qt4 && mytarget="${mytarget} gui/gui.gyp:mozc_tool"
|
||||
|
||||
"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
|
||||
"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile unix/emacs/*.el || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use emacs ; then
|
||||
dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
|
||||
elisp-install ${PN} unix/emacs/*.{el,elc} || die
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
|
||||
fi
|
||||
|
||||
if use ibus ; then
|
||||
exeinto /usr/libexec || die
|
||||
newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
|
||||
insinto /usr/share/ibus/component || die
|
||||
doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
|
||||
insinto /usr/share/ibus-mozc || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png product_icon.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-} || die
|
||||
done
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if use scim ; then
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
|
||||
insinto "$(pkg-config --variable=icondir scim)" || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png scim-mozc.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-/scim-mozc-} || die
|
||||
done
|
||||
)
|
||||
fi
|
||||
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_server" || die
|
||||
|
||||
if use qt4 ; then
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
|
||||
fi
|
||||
}
|
||||
@ -1,133 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ibus-mozc-1.1.773.102.ebuild,v 1.3 2011/11/12 04:42:09 naota Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2"
|
||||
inherit elisp-common eutils multilib python toolchain-funcs
|
||||
|
||||
MY_P="${P/ibus-}"
|
||||
DESCRIPTION="The Mozc engine for IBus Framework"
|
||||
HOMEPAGE="http://code.google.com/p/mozc/"
|
||||
SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="emacs +ibus scim +qt4"
|
||||
|
||||
RDEPEND="dev-libs/glib:2
|
||||
dev-libs/protobuf
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
emacs? ( virtual/emacs )
|
||||
ibus? ( >=app-i18n/ibus-1.2 )
|
||||
scim? ( app-i18n/scim )
|
||||
qt4? (
|
||||
x11-libs/qt-gui:4
|
||||
app-i18n/zinnia
|
||||
)"
|
||||
# chewing? ( dev-libs/libchewing )
|
||||
DEPEND="${RDEPEND}
|
||||
dev-cpp/gtest
|
||||
dev-util/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
BUILDTYPE="${BUILDTYPE:-Release}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
|
||||
epatch "${FILESDIR}/${PN}-1.1.758.102-gentoo.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
#use chewing && myconf="${myconf} --chewing"
|
||||
if ! use qt4 ; then
|
||||
myconf="${myconf} --noqt"
|
||||
export GYP_DEFINES="use_libzinnia=0"
|
||||
fi
|
||||
"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC CXX AR AS RANLIB LD
|
||||
|
||||
local mytarget="server/server.gyp:mozc_server"
|
||||
use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
|
||||
use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
|
||||
use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
|
||||
if use qt4 ; then
|
||||
export QTDIR="${EPREFIX}/usr"
|
||||
mytarget="${mytarget} gui/gui.gyp:mozc_tool"
|
||||
fi
|
||||
|
||||
"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
|
||||
"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile unix/emacs/*.el || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use emacs ; then
|
||||
dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
|
||||
elisp-install ${PN} unix/emacs/*.{el,elc} || die
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
|
||||
fi
|
||||
|
||||
if use ibus ; then
|
||||
exeinto /usr/libexec || die
|
||||
newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
|
||||
insinto /usr/share/ibus/component || die
|
||||
doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
|
||||
insinto /usr/share/ibus-mozc || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png product_icon.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-} || die
|
||||
done
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if use scim ; then
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
|
||||
insinto "$(pkg-config --variable=icondir scim)" || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png scim-mozc.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-/scim-mozc-} || die
|
||||
done
|
||||
)
|
||||
fi
|
||||
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_server" || die
|
||||
|
||||
if use qt4 ; then
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
|
||||
fi
|
||||
}
|
||||
@ -1,133 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ibus-mozc-1.2.855.102.ebuild,v 1.3 2011/11/12 04:42:09 naota Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2"
|
||||
inherit elisp-common eutils multilib python toolchain-funcs
|
||||
|
||||
MY_P="${P/ibus-}"
|
||||
DESCRIPTION="The Mozc engine for IBus Framework"
|
||||
HOMEPAGE="http://code.google.com/p/mozc/"
|
||||
SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="emacs +ibus scim +qt4"
|
||||
|
||||
RDEPEND="dev-libs/glib:2
|
||||
dev-libs/protobuf
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
emacs? ( virtual/emacs )
|
||||
ibus? ( >=app-i18n/ibus-1.2 )
|
||||
scim? ( app-i18n/scim )
|
||||
qt4? (
|
||||
x11-libs/qt-gui:4
|
||||
app-i18n/zinnia
|
||||
)"
|
||||
# chewing? ( dev-libs/libchewing )
|
||||
DEPEND="${RDEPEND}
|
||||
dev-cpp/gtest
|
||||
dev-util/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
BUILDTYPE="${BUILDTYPE:-Release}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
|
||||
epatch "${FILESDIR}/${PN}-1.2.809.102-gentoo.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
#use chewing && myconf="${myconf} --chewing"
|
||||
if ! use qt4 ; then
|
||||
myconf="${myconf} --noqt"
|
||||
export GYP_DEFINES="use_libzinnia=0"
|
||||
fi
|
||||
"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC CXX AR AS RANLIB LD
|
||||
|
||||
local mytarget="server/server.gyp:mozc_server"
|
||||
use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
|
||||
use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
|
||||
use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
|
||||
if use qt4 ; then
|
||||
export QTDIR="${EPREFIX}/usr"
|
||||
mytarget="${mytarget} gui/gui.gyp:mozc_tool"
|
||||
fi
|
||||
|
||||
"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
|
||||
"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile unix/emacs/*.el || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use emacs ; then
|
||||
dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
|
||||
elisp-install ${PN} unix/emacs/*.{el,elc} || die
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
|
||||
fi
|
||||
|
||||
if use ibus ; then
|
||||
exeinto /usr/libexec || die
|
||||
newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
|
||||
insinto /usr/share/ibus/component || die
|
||||
doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
|
||||
insinto /usr/share/ibus-mozc || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png product_icon.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-} || die
|
||||
done
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if use scim ; then
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
|
||||
insinto "$(pkg-config --variable=icondir scim)" || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png scim-mozc.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-/scim-mozc-} || die
|
||||
done
|
||||
)
|
||||
fi
|
||||
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_server" || die
|
||||
|
||||
if use qt4 ; then
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
|
||||
fi
|
||||
}
|
||||
@ -1,133 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ibus-mozc-1.3.911.102.ebuild,v 1.1 2011/12/04 00:43:05 matsuu Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2"
|
||||
inherit elisp-common eutils multilib python toolchain-funcs
|
||||
|
||||
MY_P="${P/ibus-}"
|
||||
DESCRIPTION="The Mozc engine for IBus Framework"
|
||||
HOMEPAGE="http://code.google.com/p/mozc/"
|
||||
SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="emacs +ibus scim +qt4"
|
||||
|
||||
RDEPEND="dev-libs/glib:2
|
||||
dev-libs/protobuf
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
emacs? ( virtual/emacs )
|
||||
ibus? ( >=app-i18n/ibus-1.2 )
|
||||
scim? ( app-i18n/scim )
|
||||
qt4? (
|
||||
x11-libs/qt-gui:4
|
||||
app-i18n/zinnia
|
||||
)"
|
||||
# chewing? ( dev-libs/libchewing )
|
||||
DEPEND="${RDEPEND}
|
||||
dev-cpp/gtest
|
||||
dev-util/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
BUILDTYPE="${BUILDTYPE:-Release}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
|
||||
epatch "${FILESDIR}/${PN}-1.2.809.102-gentoo.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
#use chewing && myconf="${myconf} --chewing"
|
||||
if ! use qt4 ; then
|
||||
myconf="${myconf} --noqt"
|
||||
export GYP_DEFINES="use_libzinnia=0"
|
||||
fi
|
||||
"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC CXX AR AS RANLIB LD
|
||||
|
||||
local mytarget="server/server.gyp:mozc_server"
|
||||
use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
|
||||
use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
|
||||
use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
|
||||
if use qt4 ; then
|
||||
export QTDIR="${EPREFIX}/usr"
|
||||
mytarget="${mytarget} gui/gui.gyp:mozc_tool"
|
||||
fi
|
||||
|
||||
"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
|
||||
"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile unix/emacs/*.el || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use emacs ; then
|
||||
dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
|
||||
elisp-install ${PN} unix/emacs/*.{el,elc} || die
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
|
||||
fi
|
||||
|
||||
if use ibus ; then
|
||||
exeinto /usr/libexec || die
|
||||
newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
|
||||
insinto /usr/share/ibus/component || die
|
||||
doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
|
||||
insinto /usr/share/ibus-mozc || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png product_icon.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-} || die
|
||||
done
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if use scim ; then
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
|
||||
insinto "$(pkg-config --variable=icondir scim)" || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png scim-mozc.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-/scim-mozc-} || die
|
||||
done
|
||||
)
|
||||
fi
|
||||
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_server" || die
|
||||
|
||||
if use qt4 ; then
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
|
||||
fi
|
||||
}
|
||||
@ -1,135 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-mozc/ibus-mozc-1.3.931.102.ebuild,v 1.1 2011/12/23 04:03:47 matsuu Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2"
|
||||
inherit elisp-common eutils multilib python toolchain-funcs
|
||||
|
||||
MY_P="${P/ibus-}"
|
||||
DESCRIPTION="The Mozc engine for IBus Framework"
|
||||
HOMEPAGE="http://code.google.com/p/mozc/"
|
||||
SRC_URI="http://mozc.googlecode.com/files/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
#IUSE="emacs +ibus scim skk +qt4"
|
||||
IUSE="emacs +ibus scim +qt4"
|
||||
|
||||
RDEPEND="dev-libs/glib:2
|
||||
dev-libs/protobuf
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
emacs? ( virtual/emacs )
|
||||
ibus? ( >=app-i18n/ibus-1.2 )
|
||||
scim? ( app-i18n/scim )
|
||||
qt4? (
|
||||
x11-libs/qt-gui:4
|
||||
app-i18n/zinnia
|
||||
)"
|
||||
# chewing? ( dev-libs/libchewing )
|
||||
DEPEND="${RDEPEND}
|
||||
dev-cpp/gtest
|
||||
dev-util/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
BUILDTYPE="${BUILDTYPE:-Release}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
|
||||
epatch "${FILESDIR}/${PN}-1.2.809.102-gentoo.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--channel_dev=0"
|
||||
#use chewing && myconf="${myconf} --chewing"
|
||||
if ! use qt4 ; then
|
||||
myconf="${myconf} --noqt"
|
||||
export GYP_DEFINES="use_libzinnia=0"
|
||||
fi
|
||||
"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC CXX AR AS RANLIB LD
|
||||
|
||||
local mytarget="server/server.gyp:mozc_server"
|
||||
use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
|
||||
use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
|
||||
use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
|
||||
#use skk && mytarget="${mytarget} chrome/skk/skk.gyp:skk"
|
||||
if use qt4 ; then
|
||||
export QTDIR="${EPREFIX}/usr"
|
||||
mytarget="${mytarget} gui/gui.gyp:mozc_tool"
|
||||
fi
|
||||
|
||||
"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
|
||||
"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile unix/emacs/*.el || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use emacs ; then
|
||||
dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
|
||||
elisp-install ${PN} unix/emacs/*.{el,elc} || die
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
|
||||
fi
|
||||
|
||||
if use ibus ; then
|
||||
exeinto /usr/libexec || die
|
||||
newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
|
||||
insinto /usr/share/ibus/component || die
|
||||
doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
|
||||
insinto /usr/share/ibus-mozc || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png product_icon.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-} || die
|
||||
done
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
if use scim ; then
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
|
||||
exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
|
||||
newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
|
||||
insinto "$(pkg-config --variable=icondir scim)" || die
|
||||
(
|
||||
cd data/images/unix
|
||||
newins ime_product_icon_opensource-32.png scim-mozc.png || die
|
||||
for f in ui-*
|
||||
do
|
||||
newins ${f} ${f/ui-/scim-mozc-} || die
|
||||
done
|
||||
)
|
||||
fi
|
||||
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_server" || die
|
||||
|
||||
if use qt4 ; then
|
||||
exeinto "/usr/$(get_libdir)/mozc" || die
|
||||
doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST ibus-skk-0.0.4.tar.gz 384329 RMD160 dc754c1b5286be68630368e917c67da254fd705e SHA1 3c873b97b7b0ffdb19992250f6eef666cf9ddc7e SHA256 8acc152d072a9fbabb3a6414e39f308538c0f7d0cf40a58c95e1e12f5a295634
|
||||
DIST ibus-skk-1.3.8.tar.gz 459822 RMD160 4bc5672cf600a11fd569aab5bfc4e02a156b7a09 SHA1 26b2337a8e3d9645df7fa783f6ccc332b5c0ff65 SHA256 67b2574cff2f0c4d7a74a7e80164974600875683d3c909c039c3fedece9144c7
|
||||
DIST ibus-skk-1.3.9.tar.gz 459987 RMD160 bda76e1444b5d40e112e6129a5e882c161fe4e6e SHA1 ca47b55648115c034a46ff23a9653a7d5ec53a7a SHA256 67c615f6e070673e312da50e1125f2f0637b40e0eca4f6ea34325f41322b4ba6
|
||||
DIST ibus-skk-1.4.0.tar.gz 478964 RMD160 ac896ac166d414c5cc4a7558ef0f86e589f2dd07 SHA1 e78cb83e6329123a2acb675aba0514bcc8072963 SHA256 bbf4309215802dddc41bdb7dc0efad91da99957e07f9216193345b149e43b4d9
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-skk/ibus-skk-0.0.4.ebuild,v 1.4 2011/04/16 22:19:27 arfrever Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit python
|
||||
|
||||
DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
|
||||
HOMEPAGE="http://github.com/ueno/ibus-skk"
|
||||
SRC_URI="http://cloud.github.com/downloads/ueno/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="nls"
|
||||
|
||||
RDEPEND="app-i18n/ibus
|
||||
>=dev-lang/python-2.5
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( >=sys-devel/gettext-0.16.1 )"
|
||||
RDEPEND="${RDEPEND}
|
||||
app-i18n/skk-jisyo"
|
||||
|
||||
src_prepare() {
|
||||
mv py-compile py-compile.orig || die
|
||||
ln -s "$(type -P true)" py-compile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable nls)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize /usr/share/${PN}
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup /usr/share/${PN}
|
||||
}
|
||||
@ -1,4 +1 @@
|
||||
DIST ibus-unikey-0.5.1.tar.gz 496451 RMD160 8176ccf1bff44450e48def487ab4196f806a42ae SHA1 01f34cf6d32d7bffc862e9c6d3531113eccd7b3c SHA256 c76cdb6e5eb789723f2f6036b72d78b62ae26c405bc567845accccc6f50fb19e
|
||||
DIST ibus-unikey-0.5.tar.gz 494304 RMD160 baf583141f01af7836a4c30d47041cdb66cc92bd SHA1 525e8b8c8c0beb41f16d771c502098cf2d1fba9b SHA256 5c6a36ffcc7ea8a4dbfba0a96632bf860e9d524d818e553e1bf8d18702ba1910
|
||||
DIST ibus-unikey-0.6.0.tar.gz 509952 RMD160 d766792ee1165a97883b25d51640d920a789f5df SHA1 9cacf527273eb4f45f904e6b8fd3cc5f48a3e41a SHA256 007d5ee50dc6f31d4cac61235868063bc9ecf74fef942c0d5091b23dc5360303
|
||||
DIST ibus-unikey-0.6.1.tar.gz 516250 RMD160 e5af96ac4aac09a22dbafca2f53c882b34b23b42 SHA1 f5787348a357d502af5ce6509f86823bcad7a21c SHA256 989bbea706d2d8d7b86630b1f2b4f63d8ed5167a1cc2b8fafd7f2198ec78d734
|
||||
|
||||
@ -1,258 +0,0 @@
|
||||
diff -ru ibus-unikey-0.5.1.orig/src/engine.cpp ibus-unikey-0.5.1/src/engine.cpp
|
||||
--- ibus-unikey-0.5.1.orig/src/engine.cpp 2010-09-11 20:56:49.000000000 +0900
|
||||
+++ ibus-unikey-0.5.1/src/engine.cpp 2011-02-21 10:29:28.751755007 +0900
|
||||
@@ -138,9 +138,8 @@
|
||||
|
||||
static void ibus_unikey_engine_init(IBusUnikeyEngine* unikey)
|
||||
{
|
||||
- GValue v = {0};
|
||||
+ GVariant *v = NULL;
|
||||
gchar* str;
|
||||
- gboolean succ;
|
||||
guint i;
|
||||
|
||||
unikey->preeditstr = new std::string();
|
||||
@@ -160,10 +159,10 @@
|
||||
|
||||
// read config value
|
||||
// read Input Method
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey", "InputMethod", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey", "InputMethod");
|
||||
+ if (v)
|
||||
{
|
||||
- str = (gchar*)g_value_get_string(&v);
|
||||
+ str = (gchar*)g_variant_get_string(v, NULL);
|
||||
for (i = 0; i < NUM_INPUTMETHOD; i++)
|
||||
{
|
||||
if (strcasecmp(str, Unikey_IMNames[i]) == 0)
|
||||
@@ -171,14 +170,14 @@
|
||||
unikey->im = Unikey_IM[i];
|
||||
}
|
||||
}
|
||||
- g_value_unset(&v);
|
||||
+ g_variant_unref(v);
|
||||
} // end read Input Method
|
||||
|
||||
// read Output Charset
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey", "OutputCharset", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey", "OutputCharset");
|
||||
+ if (v)
|
||||
{
|
||||
- str = (gchar*)g_value_get_string(&v);
|
||||
+ str = (gchar*)g_variant_get_string(v, NULL);
|
||||
for (i = 0; i < NUM_OUTPUTCHARSET; i++)
|
||||
{
|
||||
if (strcasecmp(str, Unikey_OCNames[i]) == 0)
|
||||
@@ -186,64 +185,64 @@
|
||||
unikey->oc = Unikey_OC[i];
|
||||
}
|
||||
}
|
||||
- g_value_unset(&v);
|
||||
+ g_variant_unref(v);
|
||||
} // end read Output Charset
|
||||
|
||||
// read Unikey Option
|
||||
// freemarking
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey/Options", "FreeMarking", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey/Options", "FreeMarking");
|
||||
+ if (v)
|
||||
{
|
||||
- unikey->ukopt.freeMarking = g_value_get_boolean(&v);
|
||||
- g_value_unset(&v);
|
||||
+ unikey->ukopt.freeMarking = g_variant_get_boolean(v);
|
||||
+ g_variant_unref(v);
|
||||
}
|
||||
|
||||
// modernstyle
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey/Options", "ModernStyle", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey/Options", "ModernStyle");
|
||||
+ if (v)
|
||||
{
|
||||
- unikey->ukopt.modernStyle = g_value_get_boolean(&v);
|
||||
- g_value_unset(&v);
|
||||
+ unikey->ukopt.modernStyle = g_variant_get_boolean(v);
|
||||
+ g_variant_unref(v);
|
||||
}
|
||||
|
||||
// macroEnabled
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey/Options", "MacroEnabled", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey/Options", "MacroEnabled");
|
||||
+ if (v)
|
||||
{
|
||||
- unikey->ukopt.macroEnabled = g_value_get_boolean(&v);
|
||||
- g_value_unset(&v);
|
||||
+ unikey->ukopt.macroEnabled = g_variant_get_boolean(v);
|
||||
+ g_variant_unref(v);
|
||||
}
|
||||
|
||||
// spellCheckEnabled
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey/Options", "SpellCheckEnabled", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey/Options", "SpellCheckEnabled");
|
||||
+ if (v)
|
||||
{
|
||||
- unikey->ukopt.spellCheckEnabled = g_value_get_boolean(&v);
|
||||
- g_value_unset(&v);
|
||||
+ unikey->ukopt.spellCheckEnabled = g_variant_get_boolean(v);
|
||||
+ g_variant_unref(v);
|
||||
}
|
||||
|
||||
// autoNonVnRestore
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey/Options", "AutoNonVnRestore", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey/Options", "AutoNonVnRestore");
|
||||
+ if (v)
|
||||
{
|
||||
- unikey->ukopt.autoNonVnRestore = g_value_get_boolean(&v);
|
||||
- g_value_unset(&v);
|
||||
+ unikey->ukopt.autoNonVnRestore = g_variant_get_boolean(v);
|
||||
+ g_variant_unref(v);
|
||||
}
|
||||
|
||||
// ProcessWAtBegin
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey/Options", "ProcessWAtBegin", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey/Options", "ProcessWAtBegin");
|
||||
+ if (v)
|
||||
{
|
||||
- unikey->process_w_at_begin = g_value_get_boolean(&v);
|
||||
- g_value_unset(&v);
|
||||
+ unikey->process_w_at_begin = g_variant_get_boolean(v);
|
||||
+ g_variant_unref(v);
|
||||
}
|
||||
|
||||
// MouseCapture
|
||||
- succ = ibus_config_get_value(config, "engine/Unikey/Options", "MouseCapture", &v);
|
||||
- if (succ)
|
||||
+ v = ibus_config_get_value(config, "engine/Unikey/Options", "MouseCapture");
|
||||
+ if (v)
|
||||
{
|
||||
- unikey->mouse_capture = g_value_get_boolean(&v);
|
||||
- g_value_unset(&v);
|
||||
+ unikey->mouse_capture = g_variant_get_boolean(v);
|
||||
+ g_variant_unref(v);
|
||||
}
|
||||
// end read Unikey Option
|
||||
// end read config value
|
||||
@@ -331,7 +330,7 @@
|
||||
{
|
||||
IBusProperty* prop;
|
||||
IBusText* label;
|
||||
- GValue v = {0};
|
||||
+ GVariant *v;
|
||||
guint i, j;
|
||||
|
||||
unikey = (IBusUnikeyEngine*)engine;
|
||||
@@ -346,9 +345,8 @@
|
||||
{
|
||||
unikey->im = Unikey_IM[i];
|
||||
|
||||
- g_value_init(&v, G_TYPE_STRING);
|
||||
- g_value_set_string(&v, Unikey_IMNames[i]);
|
||||
- ibus_config_set_value(config, "engine/Unikey", "InputMethod", &v);
|
||||
+ v = g_variant_new_string(Unikey_IMNames[i]);
|
||||
+ ibus_config_set_value(config, "engine/Unikey", "InputMethod", v);
|
||||
|
||||
// update label
|
||||
for (j=0; j<unikey->prop_list->properties->len; j++)
|
||||
@@ -391,9 +389,8 @@
|
||||
{
|
||||
unikey->oc = Unikey_OC[i];
|
||||
|
||||
- g_value_init(&v, G_TYPE_STRING);
|
||||
- g_value_set_string(&v, Unikey_OCNames[i]);
|
||||
- ibus_config_set_value(config, "engine/Unikey", "OutputCharset", &v);
|
||||
+ v = g_variant_new_string(Unikey_OCNames[i]);
|
||||
+ ibus_config_set_value(config, "engine/Unikey", "OutputCharset", v);
|
||||
|
||||
// update label
|
||||
for (j=0; j<unikey->prop_list->properties->len; j++)
|
||||
@@ -431,9 +428,8 @@
|
||||
{
|
||||
unikey->ukopt.spellCheckEnabled = !unikey->ukopt.spellCheckEnabled;
|
||||
|
||||
- g_value_init(&v, G_TYPE_BOOLEAN);
|
||||
- g_value_set_boolean(&v, unikey->ukopt.spellCheckEnabled);
|
||||
- ibus_config_set_value(config, "engine/Unikey/Options", "SpellCheckEnabled", &v);
|
||||
+ v = g_variant_new_boolean (unikey->ukopt.spellCheckEnabled);
|
||||
+ ibus_config_set_value(config, "engine/Unikey/Options", "SpellCheckEnabled", v);
|
||||
|
||||
// update state of state
|
||||
for (j = 0; j < unikey->menu_opt->properties->len ; j++)
|
||||
@@ -456,9 +452,8 @@
|
||||
{
|
||||
unikey->ukopt.macroEnabled = !unikey->ukopt.macroEnabled;
|
||||
|
||||
- g_value_init(&v, G_TYPE_BOOLEAN);
|
||||
- g_value_set_boolean(&v, unikey->ukopt.macroEnabled);
|
||||
- ibus_config_set_value(config, "engine/Unikey/Options", "MacroEnabled", &v);
|
||||
+ v = g_variant_new_boolean(unikey->ukopt.macroEnabled);
|
||||
+ ibus_config_set_value(config, "engine/Unikey/Options", "MacroEnabled", v);
|
||||
|
||||
// update state of state
|
||||
for (j = 0; j < unikey->menu_opt->properties->len ; j++)
|
||||
@@ -481,9 +476,8 @@
|
||||
{
|
||||
unikey->mouse_capture = !unikey->mouse_capture;
|
||||
|
||||
- g_value_init(&v, G_TYPE_BOOLEAN);
|
||||
- g_value_set_boolean(&v, unikey->mouse_capture);
|
||||
- ibus_config_set_value(config, "engine/Unikey/Options", "MouseCapture", &v);
|
||||
+ v = g_variant_new_boolean(unikey->mouse_capture);
|
||||
+ ibus_config_set_value(config, "engine/Unikey/Options", "MouseCapture", v);
|
||||
|
||||
// update state of state
|
||||
for (j = 0; j < unikey->menu_opt->properties->len ; j++)
|
||||
diff -ru ibus-unikey-0.5.1.orig/src/main.cpp ibus-unikey-0.5.1/src/main.cpp
|
||||
--- ibus-unikey-0.5.1.orig/src/main.cpp 2010-09-12 16:17:47.000000000 +0900
|
||||
+++ ibus-unikey-0.5.1/src/main.cpp 2011-02-21 09:48:48.188754964 +0900
|
||||
@@ -58,7 +58,7 @@
|
||||
for (p = engines; p != NULL; p = p->next)
|
||||
{
|
||||
IBusEngineDesc* engine = (IBusEngineDesc*)p->data;
|
||||
- ibus_factory_add_engine(factory, engine->name, IBUS_TYPE_UNIKEY_ENGINE);
|
||||
+ ibus_factory_add_engine(factory, ibus_engine_desc_get_name(engine), IBUS_TYPE_UNIKEY_ENGINE);
|
||||
}
|
||||
|
||||
if (ibus)
|
||||
Only in ibus-unikey-0.5.1.orig/src: unikey.xml.in
|
||||
diff -ru ibus-unikey-0.5.1.orig/src/utils.cpp ibus-unikey-0.5.1/src/utils.cpp
|
||||
--- ibus-unikey-0.5.1.orig/src/utils.cpp 2010-06-12 01:43:48.000000000 +0900
|
||||
+++ ibus-unikey-0.5.1/src/utils.cpp 2011-02-21 10:04:31.003755036 +0900
|
||||
@@ -35,20 +35,20 @@
|
||||
"",
|
||||
PACKAGE_NAME);
|
||||
|
||||
- engine = ibus_engine_desc_new
|
||||
+ engine = ibus_engine_desc_new_varargs
|
||||
(
|
||||
- "Unikey",
|
||||
- "Unikey",
|
||||
- IU_DESC,
|
||||
- "vi",
|
||||
- "GPLv2",
|
||||
- "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>",
|
||||
- PKGDATADIR"/icons/ibus-unikey.png",
|
||||
- "us"
|
||||
+ "name", "Unikey",
|
||||
+ "longname", "Unikey",
|
||||
+ "description", IU_DESC,
|
||||
+ "language", "vi",
|
||||
+ "license", "GPLv2",
|
||||
+ "author", "Lê Quốc Tuấn <mr.lequoctuan@gmail.com>",
|
||||
+ "icon", PKGDATADIR"/icons/ibus-unikey.png",
|
||||
+ "layout", "us",
|
||||
+ "rank", 99,
|
||||
+ NULL
|
||||
);
|
||||
|
||||
- engine->rank = 99;
|
||||
-
|
||||
ibus_component_add_engine(component, engine);
|
||||
|
||||
return component;
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.5.1-r1.ebuild,v 1.1 2011/05/28 01:56:00 matsuu Exp $
|
||||
|
||||
EAPI="3"
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME"
|
||||
HOMEPAGE="http://code.google.com/p/ibus-unikey/"
|
||||
SRC_URI="http://ibus-unikey.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=app-i18n/ibus-1.3.99
|
||||
gnome-base/gconf:2
|
||||
>=x11-libs/gtk+-2.12:2
|
||||
x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
# http://pkgs.fedoraproject.org/gitweb/?p=ibus-unikey.git
|
||||
epatch "${FILESDIR}/${PN}-ibus-1.4.patch"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README || die
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.5.1.ebuild,v 1.1 2011/05/28 01:56:00 matsuu Exp $
|
||||
|
||||
EAPI="3"
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME"
|
||||
HOMEPAGE="http://code.google.com/p/ibus-unikey/"
|
||||
SRC_URI="http://ibus-unikey.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=app-i18n/ibus-1.2
|
||||
!>=app-i18n/ibus-1.3.99
|
||||
gnome-base/gconf:2
|
||||
>=x11-libs/gtk+-2.12:2
|
||||
x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig"
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README || die
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild,v 1.2 2011/05/28 01:56:00 matsuu Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME"
|
||||
HOMEPAGE="http://code.google.com/p/ibus-unikey/"
|
||||
SRC_URI="http://ibus-unikey.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=app-i18n/ibus-1.2
|
||||
!>=app-i18n/ibus-1.3.99
|
||||
gnome-base/gconf:2
|
||||
>=x11-libs/gtk+-2.12:2
|
||||
x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig"
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README || die
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.6.0.ebuild,v 1.2 2012/03/06 08:15:59 naota Exp $
|
||||
|
||||
EAPI="4"
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME"
|
||||
HOMEPAGE="http://code.google.com/p/ibus-unikey/"
|
||||
SRC_URI="http://ibus-unikey.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="gtk3"
|
||||
|
||||
RDEPEND="gtk3? ( >app-i18n/ibus-1.3.9[gtk3]
|
||||
x11-libs/gtk+:3 )
|
||||
!gtk3? ( app-i18n/ibus
|
||||
>=x11-libs/gtk+-2.12:2 )
|
||||
<app-i18n/ibus-1.4.0
|
||||
x11-libs/libX11"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig
|
||||
dev-util/intltool
|
||||
>=sys-devel/gettext-0.17"
|
||||
|
||||
src_configure() {
|
||||
use gtk3 && myconf="--with-gtk-version=3" || myconf=""
|
||||
econf ${myconf}
|
||||
}
|
||||
@ -1,4 +1 @@
|
||||
DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
|
||||
DIST ibus-1.3.9.tar.gz 1380081 RMD160 8cf8712d29369bb1934c0d9d66ce5f15953a60d0 SHA1 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 SHA256 b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
|
||||
DIST ibus-1.4.0.tar.gz 1452055 RMD160 0583a9690ee5a7bb44ce1cebc189c3a644501ca3 SHA1 c46ea0be728ffd4e431d4a18c6bd1e51ceaf045e SHA256 9e5a17d910eae932dd0cd185d0a102b56ad4a2bf79d54b1e53f70174cd2c2a3f
|
||||
DIST ibus-1.4.1.tar.gz 1479412 RMD160 4003fc9392c59ce35048689aa50a941cfd151cff SHA1 4cc045553885d35a118ec4b44c2694910209509e SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/work/ibus-1.3.9/bus/Makefile.am b/work/ibus-1.3.9/bus/Makefile.am
|
||||
index 764edc7..e6887da 100644
|
||||
--- a/work/ibus-1.3.9/bus/Makefile.am
|
||||
+++ b/work/ibus-1.3.9/bus/Makefile.am
|
||||
@@ -45,10 +45,7 @@ AM_LDADD = \
|
||||
$(libibus) \
|
||||
$(NULL)
|
||||
|
||||
-TESTS = \
|
||||
- test-matchrule \
|
||||
- test-stress \
|
||||
- $(NULL)
|
||||
+TESTS = $(NULL)
|
||||
xdgautostart_DATA = \
|
||||
ibus.desktop \
|
||||
$(NULL)
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
|
||||
index 4fa77a1..75e3815 100644
|
||||
--- a/docs/reference/ibus/Makefile.am
|
||||
+++ b/docs/reference/ibus/Makefile.am
|
||||
@@ -117,7 +117,7 @@ trim-build.stamp: scan-build.stamp
|
||||
$(AM_V_GEN) \
|
||||
$(SED) -f $(srcdir)/trim.sed -i.bak \
|
||||
$(builddir)/$(DOC_MODULE)-sections.txt && \
|
||||
- $(RM) $(buildir)/$(DOC_MODULE)-sections.txt.bak && \
|
||||
+ $(RM) $(builddir)/$(DOC_MODULE)-sections.txt.bak && \
|
||||
touch trim-build.stamp
|
||||
|
||||
tmpl-build.stamp: trim-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-overrides.txt
|
||||
@ -0,0 +1,49 @@
|
||||
http://bugs.gentoo.org/395239
|
||||
|
||||
--- m4/gconf-2.m4
|
||||
+++ m4/gconf-2.m4
|
||||
@@ -0,0 +1,44 @@
|
||||
+dnl AM_GCONF_SOURCE_2
|
||||
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
|
||||
+dnl (i.e. pass to gconftool-2
|
||||
+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
|
||||
+dnl you should install foo.schemas files
|
||||
+dnl
|
||||
+
|
||||
+AC_DEFUN([AM_GCONF_SOURCE_2],
|
||||
+[
|
||||
+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
|
||||
+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
+ else
|
||||
+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
|
||||
+ fi
|
||||
+
|
||||
+ AC_ARG_WITH([gconf-source],
|
||||
+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
|
||||
+ [Config database for installing schema files.]),
|
||||
+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
|
||||
+
|
||||
+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
|
||||
+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
|
||||
+
|
||||
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
|
||||
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
|
||||
+ fi
|
||||
+
|
||||
+ AC_ARG_WITH([gconf-schema-file-dir],
|
||||
+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
|
||||
+ [Directory for installing schema files.]),
|
||||
+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
|
||||
+
|
||||
+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
|
||||
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
|
||||
+
|
||||
+ AC_ARG_ENABLE(schemas-install,
|
||||
+ AC_HELP_STRING([--disable-schemas-install],
|
||||
+ [Disable the schemas installation]),
|
||||
+ [case ${enableval} in
|
||||
+ yes|no) ;;
|
||||
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
|
||||
+ esac])
|
||||
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
|
||||
+])
|
||||
@ -1,100 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.13 2012/02/05 01:38:23 floppym Exp $
|
||||
|
||||
EAPI="3"
|
||||
inherit confutils eutils gnome2-utils multilib python
|
||||
|
||||
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
|
||||
HOMEPAGE="http://code.google.com/p/ibus/"
|
||||
SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
|
||||
IUSE="doc nls"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.18:2
|
||||
x11-libs/gtk+:2
|
||||
>=gnome-base/gconf-2.12:2
|
||||
gnome-base/librsvg:2
|
||||
sys-apps/dbus
|
||||
app-text/iso-codes
|
||||
x11-libs/libX11
|
||||
>=dev-lang/python-2.5
|
||||
>=dev-python/pygobject-2.14:2
|
||||
dev-python/notify-python
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-lang/perl-5.8.1
|
||||
dev-perl/XML-Parser
|
||||
dev-util/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.9 )
|
||||
nls? ( >=sys-devel/gettext-0.16.1 )"
|
||||
RDEPEND="${RDEPEND}
|
||||
dev-python/pygtk
|
||||
>=dev-python/dbus-python-0.83
|
||||
dev-python/pyxdg"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
# An arch specific config directory is used on multilib systems
|
||||
has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
|
||||
GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
mv py-compile py-compile.orig || die
|
||||
ln -s "$(type -P true)" py-compile || die
|
||||
echo "ibus/_config.py" >> po/POTFILES.skip || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable nls)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
# bug 289547
|
||||
keepdir /usr/share/ibus/{engine,icons}
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
||||
elog "To use ibus, you should:"
|
||||
elog "1. Get input engines from sunrise overlay."
|
||||
elog " Run \"emerge -s ibus-\" in your favorite terminal"
|
||||
elog " for a list of packages we already have."
|
||||
elog
|
||||
elog "2. Setup ibus:"
|
||||
elog
|
||||
elog " $ ibus-setup"
|
||||
elog
|
||||
elog "3. Set the following in your user startup scripts"
|
||||
elog " such as .xinitrc, .xsession or .xprofile:"
|
||||
elog
|
||||
elog " export XMODIFIERS=\"@im=ibus\""
|
||||
elog " export GTK_IM_MODULE=\"ibus\""
|
||||
elog " export QT_IM_MODULE=\"xim\""
|
||||
elog " ibus-daemon -d -x"
|
||||
|
||||
[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \
|
||||
gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
|
||||
|
||||
python_mod_optimize /usr/share/${PN}
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \
|
||||
gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
|
||||
|
||||
python_mod_cleanup /usr/share/${PN}
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,154 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9-r2.ebuild,v 1.6 2012/03/06 08:11:03 naota Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="python? 2:2.5"
|
||||
inherit confutils eutils gnome2-utils multilib python autotools
|
||||
|
||||
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
|
||||
HOMEPAGE="http://code.google.com/p/ibus/"
|
||||
SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
IUSE="doc +gconf gtk gtk3 introspection nls +python vala X"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.18:2
|
||||
gconf? ( >=gnome-base/gconf-2.12:2 )
|
||||
gnome-base/librsvg:2
|
||||
sys-apps/dbus
|
||||
app-text/iso-codes
|
||||
gtk? ( x11-libs/gtk+:2 )
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
X? (
|
||||
sys-apps/dbus[X]
|
||||
x11-libs/libX11
|
||||
x11-libs/gtk+:2
|
||||
)
|
||||
introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
|
||||
python? (
|
||||
dev-python/notify-python
|
||||
>=dev-python/dbus-python-0.83
|
||||
)
|
||||
nls? ( virtual/libintl )"
|
||||
# X? ( x11-libs/libX11 )
|
||||
# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
|
||||
# vala? ( dev-lang/vala )
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-lang/perl-5.8.1
|
||||
dev-perl/XML-Parser
|
||||
dev-util/intltool
|
||||
dev-util/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.9 )
|
||||
nls? ( >=sys-devel/gettext-0.16.1 )"
|
||||
RDEPEND="${RDEPEND}
|
||||
python? (
|
||||
dev-python/pygtk
|
||||
dev-python/pyxdg
|
||||
)"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
update_gtk_immodules() {
|
||||
local GTK2_CONFDIR="/etc/gtk-2.0"
|
||||
# bug #366889
|
||||
if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
|
||||
GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
|
||||
fi
|
||||
mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
|
||||
|
||||
if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
|
||||
"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
|
||||
fi
|
||||
}
|
||||
|
||||
update_gtk3_immodules() {
|
||||
if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
|
||||
"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# bug #342903
|
||||
confutils_require_any X gtk gtk3
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
> py-compile # 397497
|
||||
echo "ibus/_config.py" >> po/POTFILES.skip || die
|
||||
sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
|
||||
epatch "${FILESDIR}"/${P}-remove-unused-build.patch #367653
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable doc gtk-doc-html) \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable gconf) \
|
||||
$(use_enable gtk gtk2) \
|
||||
$(use_enable gtk xim) \
|
||||
$(use_enable gtk3) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable python) \
|
||||
$(use_enable vala) \
|
||||
$(use_enable X xim)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
find "${ED}" -name '*.la' -exec rm {} + || die
|
||||
|
||||
insinto /etc/X11/xinit/xinput.d
|
||||
newins xinput-ibus ibus.conf || die
|
||||
|
||||
# bug 289547
|
||||
keepdir /usr/share/ibus/{engine,icons} || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
use gconf && gnome2_gconf_savelist
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use gconf && gnome2_gconf_install
|
||||
use gtk && update_gtk_immodules
|
||||
use gtk3 && update_gtk3_immodules
|
||||
use python && python_mod_optimize /usr/share/${PN}
|
||||
gnome2_icon_cache_update
|
||||
|
||||
elog "To use ibus, you should:"
|
||||
elog "1. Get input engines from sunrise overlay."
|
||||
elog " Run \"emerge -s ibus-\" in your favorite terminal"
|
||||
elog " for a list of packages we already have."
|
||||
elog
|
||||
elog "2. Setup ibus:"
|
||||
elog
|
||||
elog " $ ibus-setup"
|
||||
elog
|
||||
elog "3. Set the following in your user startup scripts"
|
||||
elog " such as .xinitrc, .xsession or .xprofile:"
|
||||
elog
|
||||
elog " export XMODIFIERS=\"@im=ibus\""
|
||||
elog " export GTK_IM_MODULE=\"ibus\""
|
||||
elog " export QT_IM_MODULE=\"xim\""
|
||||
elog " ibus-daemon -d -x"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use gtk && update_gtk_immodules
|
||||
use gtk3 && update_gtk3_immodules
|
||||
use python && python_mod_cleanup /usr/share/${PN}
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,136 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9.ebuild,v 1.14 2012/02/05 01:38:23 floppym Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="python? 2:2.5"
|
||||
inherit confutils eutils gnome2-utils multilib python
|
||||
|
||||
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
|
||||
HOMEPAGE="http://code.google.com/p/ibus/"
|
||||
SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
|
||||
IUSE="doc +gconf gtk introspection nls +python vala X"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.18:2
|
||||
gconf? ( >=gnome-base/gconf-2.12:2 )
|
||||
gnome-base/librsvg:2
|
||||
sys-apps/dbus
|
||||
app-text/iso-codes
|
||||
gtk? (
|
||||
x11-libs/gtk+:2
|
||||
)
|
||||
X? (
|
||||
sys-apps/dbus[X]
|
||||
x11-libs/libX11
|
||||
x11-libs/gtk+:2
|
||||
)
|
||||
introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
|
||||
python? (
|
||||
dev-python/notify-python
|
||||
>=dev-python/dbus-python-0.83
|
||||
)
|
||||
nls? ( virtual/libintl )"
|
||||
# X? ( x11-libs/libX11 )
|
||||
# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
|
||||
# vala? ( dev-lang/vala )
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-lang/perl-5.8.1
|
||||
dev-perl/XML-Parser
|
||||
dev-util/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.9 )
|
||||
nls? ( >=sys-devel/gettext-0.16.1 )"
|
||||
RDEPEND="${RDEPEND}
|
||||
python? (
|
||||
dev-python/pygtk
|
||||
dev-python/pyxdg
|
||||
)"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
update_gtk_immodules() {
|
||||
if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
|
||||
GTK2_CONFDIR="/etc/gtk-2.0"
|
||||
# An arch specific config directory is used on multilib systems
|
||||
if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
|
||||
GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
|
||||
fi
|
||||
mkdir -p "${ROOT}${GTK2_CONFDIR}"
|
||||
gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# bug #342903
|
||||
confutils_require_any X gtk
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
mv py-compile py-compile.orig || die
|
||||
ln -s "$(type -P true)" py-compile || die
|
||||
echo "ibus/_config.py" >> po/POTFILES.skip || die
|
||||
sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable doc gtk-doc-html) \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable gconf) \
|
||||
$(use_enable gtk gtk2) \
|
||||
$(use_enable gtk xim) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable python) \
|
||||
$(use_enable vala) \
|
||||
$(use_enable X xim)
|
||||
#$(use_enable gtk gtk3) \
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
# bug 289547
|
||||
keepdir /usr/share/ibus/{engine,icons} || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
||||
elog "To use ibus, you should:"
|
||||
elog "1. Get input engines from sunrise overlay."
|
||||
elog " Run \"emerge -s ibus-\" in your favorite terminal"
|
||||
elog " for a list of packages we already have."
|
||||
elog
|
||||
elog "2. Setup ibus:"
|
||||
elog
|
||||
elog " $ ibus-setup"
|
||||
elog
|
||||
elog "3. Set the following in your user startup scripts"
|
||||
elog " such as .xinitrc, .xsession or .xprofile:"
|
||||
elog
|
||||
elog " export XMODIFIERS=\"@im=ibus\""
|
||||
elog " export GTK_IM_MODULE=\"ibus\""
|
||||
elog " export QT_IM_MODULE=\"xim\""
|
||||
elog " ibus-daemon -d -x"
|
||||
|
||||
use gtk && update_gtk_immodules
|
||||
|
||||
use python && python_mod_optimize /usr/share/${PN}
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use gtk && update_gtk_immodules
|
||||
|
||||
use python && python_mod_cleanup /usr/share/${PN}
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,158 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.0-r1.ebuild,v 1.2 2012/01/03 15:18:37 ssuominen Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="python? 2:2.5"
|
||||
inherit confutils eutils gnome2-utils multilib python autotools
|
||||
|
||||
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
|
||||
HOMEPAGE="http://code.google.com/p/ibus/"
|
||||
SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.26:2
|
||||
dconf? ( >=gnome-base/dconf-0.7.5 )
|
||||
gconf? ( >=gnome-base/gconf-2.12:2 )
|
||||
gnome-base/librsvg:2
|
||||
sys-apps/dbus[X?]
|
||||
app-text/iso-codes
|
||||
gtk? ( x11-libs/gtk+:2 )
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/gtk+:2
|
||||
)
|
||||
introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
|
||||
python? (
|
||||
dev-python/notify-python
|
||||
>=dev-python/dbus-python-0.83
|
||||
)
|
||||
nls? ( virtual/libintl )"
|
||||
# X? ( x11-libs/libX11 )
|
||||
# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
|
||||
# vala? ( dev-lang/vala )
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-lang/perl-5.8.1
|
||||
dev-perl/XML-Parser
|
||||
dev-util/pkgconfig
|
||||
doc? ( >=dev-util/gtk-doc-1.9 )
|
||||
nls? ( >=sys-devel/gettext-0.16.1 )"
|
||||
RDEPEND="${RDEPEND}
|
||||
python? (
|
||||
dev-python/pygtk
|
||||
dev-python/pyxdg
|
||||
)"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
update_gtk_immodules() {
|
||||
local GTK2_CONFDIR="/etc/gtk-2.0"
|
||||
# bug #366889
|
||||
if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
|
||||
GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
|
||||
fi
|
||||
mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
|
||||
|
||||
if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
|
||||
"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
|
||||
fi
|
||||
}
|
||||
|
||||
update_gtk3_immodules() {
|
||||
if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
|
||||
"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
# bug #342903
|
||||
confutils_require_any X gtk gtk3
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
>py-compile #397497
|
||||
echo "ibus/_config.py" >> po/POTFILES.skip || die
|
||||
sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
|
||||
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-doc-typo.patch \
|
||||
"${FILESDIR}"/${P}-machine-id-fallback.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable dconf) \
|
||||
$(use_enable doc gtk-doc) \
|
||||
$(use_enable doc gtk-doc-html) \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable gconf) \
|
||||
$(use_enable gtk gtk2) \
|
||||
$(use_enable gtk xim) \
|
||||
$(use_enable gtk3) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable python) \
|
||||
$(use_enable vala) \
|
||||
$(use_enable X xim) || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
|
||||
find "${ED}" -name '*.la' -type f -delete || die
|
||||
|
||||
insinto /etc/X11/xinit/xinput.d
|
||||
newins xinput-ibus ibus.conf || die
|
||||
|
||||
# bug 289547
|
||||
keepdir /usr/share/ibus/{engine,icons} || die
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
use gconf && gnome2_gconf_savelist
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use gconf && gnome2_gconf_install
|
||||
use gtk && update_gtk_immodules
|
||||
use gtk3 && update_gtk3_immodules
|
||||
use python && python_mod_optimize /usr/share/${PN}
|
||||
gnome2_icon_cache_update
|
||||
|
||||
elog "To use ibus, you should:"
|
||||
elog "1. Get input engines from sunrise overlay."
|
||||
elog " Run \"emerge -s ibus-\" in your favorite terminal"
|
||||
elog " for a list of packages we already have."
|
||||
elog
|
||||
elog "2. Setup ibus:"
|
||||
elog
|
||||
elog " $ ibus-setup"
|
||||
elog
|
||||
elog "3. Set the following in your user startup scripts"
|
||||
elog " such as .xinitrc, .xsession or .xprofile:"
|
||||
elog
|
||||
elog " export XMODIFIERS=\"@im=ibus\""
|
||||
elog " export GTK_IM_MODULE=\"ibus\""
|
||||
elog " export QT_IM_MODULE=\"xim\""
|
||||
elog " ibus-daemon -d -x"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use gtk && update_gtk_immodules
|
||||
use gtk3 && update_gtk3_immodules
|
||||
use python && python_mod_cleanup /usr/share/${PN}
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/haddock.cabal b/haddock.cabal
|
||||
index 4a00ce1..5323628 100644
|
||||
--- a/haddock.cabal
|
||||
+++ b/haddock.cabal
|
||||
@@ -71,7 +71,7 @@ executable haddock
|
||||
pretty,
|
||||
containers,
|
||||
array,
|
||||
- Cabal >= 1.5,
|
||||
+ Cabal >= 1.5 && <1.10,
|
||||
ghc >= 6.12 && < 6.14
|
||||
|
||||
if flag(in-ghc-tree)
|
||||
@ -1,9 +1,9 @@
|
||||
DIST mercury-11.01-gentoo-patchset-1.tar.gz 7129 RMD160 cfb89fa798724744ea7f1912b0015affdb1ea63c SHA1 d23e615b81cfd259e369cfcd1c5cd9965780f946 SHA256 43dbcb63add22b24da7515b7d42d8b4ad119d9923f80dbb29767d756436d0fa4
|
||||
DIST mercury-11.07-gentoo-patchset-0.tar.gz 6889 RMD160 38152c3e6e10524fdc3c6911adda90ad384ad8c4 SHA1 e2f95ce3384ea8618ce86f65512b79154640f1cf SHA256 2fce2c95b6cb8b5819fb576de8ce184293a926c52f120027e3195d14f0552d78
|
||||
DIST mercury-11.07_beta1-gentoo-patchset-1.tar.gz 7157 RMD160 c82f9937fb1fce9a76a402fded8abfc254cfaf5a SHA1 37d4861d991962d37c2e25c4da2dc9834491511c SHA256 9e07bd3232463eb6bb679a86202bae0edb41385551b9dc5d01eac054880263f5
|
||||
DIST mercury-11.07.1-gentoo-patchset-0.tar.gz 6916 RMD160 c1d024685386fd58d53ba670eac3c06f99441b3d SHA1 c20a69ef1ba4226a23bf683a6e4153dd5ac360fa SHA256 27ca405aef5111cba8db0f0bedf2b08d0222bc9a91683d0fa32778148dfde711
|
||||
DIST mercury-compiler-11.01.tar.gz 25122699 RMD160 bee82b6037fa1f14f27b43d6f7d751d232941bc7 SHA1 508f9fbebdf061f706a44db5c77868cb4e769066 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0
|
||||
DIST mercury-compiler-11.07-beta-2011-06-28-unstable.tar.gz 25281973 RMD160 87a7ce5d4840521c033de59330756eb2a30e388e SHA1 14e494716717a21989e17219c540a14c79d7a415 SHA256 54e2327f247f6ae795d9963622ffd8ca00e8e3e85519eb7896ac39f1000c3793
|
||||
DIST mercury-compiler-11.07.1.tar.gz 25308185 RMD160 10593ad6decefffdd8225d0c29fdb731d1470ca9 SHA1 717daf9bf74ae22e759b78f4e1f101dba951f89b SHA256 f3f1d4f0fb34567a69aaa9fb6f4ecff52b97a66ab6c8a868c4e284eb61d3dc11
|
||||
DIST mercury-compiler-11.07.tar.gz 25298643 RMD160 1573be5c26415c6fac96f85ff9558db736890b83 SHA1 d27541f5fcd5ec6b8ca2fc39f72ed74c833f243a SHA256 77940d03834a3967e4505c4a92253c19aaea0fed4650ee94e772078abd6be6a2
|
||||
DIST mercury-tests-11.01.tar.gz 1351134 RMD160 4568a0b1044a116ab59b2f0d98002e20c6819461 SHA1 180741461386f7a2b0fd526e0d4c761cd7b0c3ff SHA256 862b70a589eb2d36c9fd82dbd2e0490dc4556f6edff604a54dfd6fc0ad6cccad
|
||||
DIST mercury-tests-11.07-beta-2011-06-28-unstable.tar.gz 1641484 RMD160 4a6db1128b13b24042626a99b4f89c21759605fd SHA1 da86df499f0ea46ec430a3233055396e0b8eec71 SHA256 6ee6131fb20e8b0fa6ad2a8947f234d768f95a3e0dc71ebdcff4583d99833bee
|
||||
DIST mercury-tests-11.07.1.tar.gz 1648437 RMD160 929364e2ca22db8b3a7bcb80fa146b70584ac95d SHA1 8c3fb4381817dc79cab56eb5859b117aa1d168be SHA256 01558a6ddd28d2f832d88da8bbf38fec542d091fc53b5adf92fac5e2564c2057
|
||||
DIST mercury-tests-11.07.tar.gz 1647435 RMD160 146fd0a87a6e70d817c39e15fda660f747330a5d SHA1 2e41846f2e0020e3f9a27caf5b30d8217fa787b2 SHA256 9206c7ffaace2357367bb6f8c3efe9aeb05ccac6a02946f6579c6001f953501b
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
|
||||
--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+mpfr_unlikely
|
||||
diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
|
||||
--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.0
|
||||
+3.1.0-p1
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
|
||||
--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000
|
||||
@@ -988,10 +988,11 @@
|
||||
******************************************************/
|
||||
|
||||
/* Theses macros help the compiler to determine if a test is
|
||||
- * likely or unlikely. */
|
||||
+ likely or unlikely. The !! is necessary in case x is larger
|
||||
+ than a long. */
|
||||
#if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
|
||||
# define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
|
||||
-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
|
||||
+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
|
||||
#else
|
||||
# define MPFR_LIKELY(x) (x)
|
||||
# define MPFR_UNLIKELY(x) (x)
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
|
||||
--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 0
|
||||
-#define MPFR_VERSION_STRING "3.1.0"
|
||||
+#define MPFR_VERSION_STRING "3.1.0-p1"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
|
||||
--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.0";
|
||||
+ return "3.1.0-p1";
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
|
||||
--- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+lib-search-path
|
||||
diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
|
||||
--- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.0-p1
|
||||
+3.1.0-p2
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
|
||||
--- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 0
|
||||
-#define MPFR_VERSION_STRING "3.1.0-p1"
|
||||
+#define MPFR_VERSION_STRING "3.1.0-p2"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
|
||||
--- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.0-p1";
|
||||
+ return "3.1.0-p2";
|
||||
}
|
||||
diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
|
||||
--- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000
|
||||
@@ -65,8 +65,24 @@
|
||||
TESTS = $(check_PROGRAMS)
|
||||
TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
|
||||
|
||||
-# Option to prevent libtool from generating wrapper scripts for the tests.
|
||||
+# The -no-install option prevents libtool from generating wrapper scripts
|
||||
+# for the tests.
|
||||
# This is useful to easily run the test scripts under valgrind or gdb.
|
||||
# See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
|
||||
# http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
|
||||
-AM_LDFLAGS = -no-install
|
||||
+#
|
||||
+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
|
||||
+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
|
||||
+# library is already installed in the corresponding lib directory: its
|
||||
+# purpose is to make sure that the local .libs comes first in the library
|
||||
+# search path (otherwise the tests are linked against the old MPFR library
|
||||
+# by the LINK command -- see the generated Makefile). See:
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
|
||||
+# and
|
||||
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
|
||||
+#
|
||||
+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
|
||||
diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
|
||||
--- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000
|
||||
@@ -1124,11 +1124,27 @@
|
||||
TESTS = $(check_PROGRAMS)
|
||||
TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
|
||||
|
||||
-# Option to prevent libtool from generating wrapper scripts for the tests.
|
||||
+# The -no-install option prevents libtool from generating wrapper scripts
|
||||
+# for the tests.
|
||||
# This is useful to easily run the test scripts under valgrind or gdb.
|
||||
# See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
|
||||
# http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
|
||||
-AM_LDFLAGS = -no-install
|
||||
+#
|
||||
+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
|
||||
+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
|
||||
+# library is already installed in the corresponding lib directory: its
|
||||
+# purpose is to make sure that the local .libs comes first in the library
|
||||
+# search path (otherwise the tests are linked against the old MPFR library
|
||||
+# by the LINK command -- see the generated Makefile). See:
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
|
||||
+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
|
||||
+# and
|
||||
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
|
||||
+#
|
||||
+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -0,0 +1,247 @@
|
||||
diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
|
||||
--- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+vasprintf
|
||||
diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
|
||||
--- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.0-p2
|
||||
+3.1.0-p3
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
|
||||
--- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 0
|
||||
-#define MPFR_VERSION_STRING "3.1.0-p2"
|
||||
+#define MPFR_VERSION_STRING "3.1.0-p3"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
|
||||
--- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000
|
||||
@@ -1178,7 +1178,7 @@
|
||||
mpfr_exp_t exp;
|
||||
char * str;
|
||||
const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
|
||||
- const int keep_trailing_zeros = spec_g && spec.alt;
|
||||
+ const int keep_trailing_zeros = !spec_g || spec.alt;
|
||||
|
||||
/* WARNING: an empty precision field is forbidden (it means precision = 6
|
||||
and it should have been changed to 6 before the function call) */
|
||||
@@ -1356,7 +1356,7 @@
|
||||
else
|
||||
/* 1 <= |p| */
|
||||
{
|
||||
- size_t nsd; /* Number of significant digits */
|
||||
+ size_t str_len;
|
||||
|
||||
/* Determine the position of the most significant decimal digit. */
|
||||
exp = floor_log10 (p);
|
||||
@@ -1365,12 +1365,10 @@
|
||||
/* P is too large to print all its integral part digits */
|
||||
return -1;
|
||||
|
||||
- np->ip_size = exp + 1;
|
||||
-
|
||||
- nsd = spec.prec + np->ip_size;
|
||||
if (dec_info == NULL)
|
||||
- {
|
||||
- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
|
||||
+ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
|
||||
+ str =
|
||||
+ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
|
||||
register_string (np->sl, str);
|
||||
}
|
||||
else
|
||||
@@ -1379,81 +1377,60 @@
|
||||
str = dec_info->str;
|
||||
}
|
||||
np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
|
||||
+ str_len = strlen (str);
|
||||
+
|
||||
+ /* integral part */
|
||||
+ if (exp > str_len)
|
||||
+ /* mpfr_get_str gives no trailing zero when p is rounded up to the next
|
||||
+ power of 10 (p integer, so no fractional part) */
|
||||
+ {
|
||||
+ np->ip_trailing_zeros = exp - str_len;
|
||||
+ np->ip_size = str_len;
|
||||
+ }
|
||||
+ else
|
||||
+ np->ip_size = exp;
|
||||
|
||||
if (spec.group)
|
||||
/* thousands separator in integral part */
|
||||
np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
|
||||
|
||||
- if (nsd == 0 || (spec_g && !spec.alt))
|
||||
- /* compute how much non-zero digits in integral and fractional
|
||||
- parts */
|
||||
+ /* fractional part */
|
||||
+ str += np->ip_size;
|
||||
+ str_len -= np->ip_size;
|
||||
+ if (!keep_trailing_zeros)
|
||||
+ /* remove trailing zeros, if any */
|
||||
{
|
||||
- size_t str_len;
|
||||
- str_len = strlen (str); /* note: the sign has been skipped */
|
||||
-
|
||||
- if (exp > str_len)
|
||||
- /* mpfr_get_str doesn't give the trailing zeros when p is a
|
||||
- multiple of 10 (p integer, so no fractional part) */
|
||||
- {
|
||||
- np->ip_trailing_zeros = exp - str_len;
|
||||
- np->ip_size = str_len;
|
||||
- if (spec.alt)
|
||||
- np->point = MPFR_DECIMAL_POINT;
|
||||
- }
|
||||
- else
|
||||
- /* str may contain some digits which are in fractional part */
|
||||
+ char *ptr = str + str_len - 1; /* pointer to the last digit of
|
||||
+ str */
|
||||
+ while ((*ptr == '0') && (str_len != 0))
|
||||
{
|
||||
- char *ptr;
|
||||
-
|
||||
- ptr = str + str_len - 1; /* points to the end of str */
|
||||
- str_len -= np->ip_size; /* number of digits in fractional
|
||||
- part */
|
||||
-
|
||||
- if (!keep_trailing_zeros)
|
||||
- /* remove trailing zeros, if any */
|
||||
- {
|
||||
- while ((*ptr == '0') && (str_len != 0))
|
||||
- {
|
||||
- --ptr;
|
||||
- --str_len;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (str_len > INT_MAX)
|
||||
- /* too many digits in fractional part */
|
||||
- return -1;
|
||||
-
|
||||
- if (str_len != 0)
|
||||
- /* some digits in fractional part */
|
||||
- {
|
||||
- np->point = MPFR_DECIMAL_POINT;
|
||||
- np->fp_ptr = str + np->ip_size;
|
||||
- np->fp_size = str_len;
|
||||
- }
|
||||
+ --ptr;
|
||||
+ --str_len;
|
||||
}
|
||||
}
|
||||
- else
|
||||
- /* spec.prec digits in fractional part */
|
||||
+
|
||||
+ if (str_len > 0)
|
||||
+ /* some nonzero digits in fractional part */
|
||||
{
|
||||
- if (np->ip_size == exp - 1)
|
||||
- /* the absolute value of the number has been rounded up to a power
|
||||
- of ten.
|
||||
- Insert an additional zero in integral part and put the rest of
|
||||
- them in fractional part. */
|
||||
- np->ip_trailing_zeros = 1;
|
||||
+ if (str_len > INT_MAX)
|
||||
+ /* too many digits in fractional part */
|
||||
+ return -1;
|
||||
|
||||
- if (spec.prec != 0)
|
||||
- {
|
||||
- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
|
||||
- MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
|
||||
+ np->point = MPFR_DECIMAL_POINT;
|
||||
+ np->fp_ptr = str;
|
||||
+ np->fp_size = str_len;
|
||||
+ }
|
||||
|
||||
- np->point = MPFR_DECIMAL_POINT;
|
||||
- np->fp_ptr = str + np->ip_size;
|
||||
- np->fp_size = spec.prec;
|
||||
- }
|
||||
- else if (spec.alt)
|
||||
- np->point = MPFR_DECIMAL_POINT;
|
||||
+ if (keep_trailing_zeros && str_len < spec.prec)
|
||||
+ /* add missing trailing zeros */
|
||||
+ {
|
||||
+ np->point = MPFR_DECIMAL_POINT;
|
||||
+ np->fp_trailing_zeros = spec.prec - np->fp_size;
|
||||
}
|
||||
+
|
||||
+ if (spec.alt)
|
||||
+ /* add decimal point even if no digits follow it */
|
||||
+ np->point = MPFR_DECIMAL_POINT;
|
||||
}
|
||||
|
||||
return 0;
|
||||
diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
|
||||
--- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.0-p2";
|
||||
+ return "3.1.0-p3";
|
||||
}
|
||||
diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
|
||||
--- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000
|
||||
@@ -475,6 +475,18 @@
|
||||
check_sprintf ("-1.", "%- #0.1RG", x);
|
||||
|
||||
/* precision zero */
|
||||
+ mpfr_set_d (x, 9.5, MPFR_RNDN);
|
||||
+ check_sprintf ("9", "%.0RDf", x);
|
||||
+ check_sprintf ("10", "%.0RUf", x);
|
||||
+
|
||||
+ mpfr_set_d (x, 19.5, MPFR_RNDN);
|
||||
+ check_sprintf ("19", "%.0RDf", x);
|
||||
+ check_sprintf ("20", "%.0RUf", x);
|
||||
+
|
||||
+ mpfr_set_d (x, 99.5, MPFR_RNDN);
|
||||
+ check_sprintf ("99", "%.0RDf", x);
|
||||
+ check_sprintf ("100", "%.0RUf", x);
|
||||
+
|
||||
mpfr_set_d (x, -9.5, MPFR_RNDN);
|
||||
check_sprintf ("-10", "%.0RDf", x);
|
||||
check_sprintf ("-10", "%.0RYf", x);
|
||||
@@ -1078,6 +1090,23 @@
|
||||
mpfr_clear (x);
|
||||
}
|
||||
|
||||
+static void
|
||||
+bug20111102 (void)
|
||||
+{
|
||||
+ mpfr_t t;
|
||||
+ char s[100];
|
||||
+
|
||||
+ mpfr_init2 (t, 84);
|
||||
+ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
|
||||
+ mpfr_sprintf (s, "%.20RNg", t);
|
||||
+ if (strcmp (s, "1000") != 0)
|
||||
+ {
|
||||
+ printf ("Error in bug20111102, expected 1000, got %s\n", s);
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ mpfr_clear (t);
|
||||
+}
|
||||
+
|
||||
/* In particular, the following test makes sure that the rounding
|
||||
* for %Ra and %Rb is not done on the MPFR number itself (as it
|
||||
* would overflow). Note: it has been reported on comp.std.c that
|
||||
@@ -1161,6 +1190,7 @@
|
||||
locale = setlocale (LC_ALL, "C");
|
||||
#endif
|
||||
|
||||
+ bug20111102 ();
|
||||
native_types ();
|
||||
hexadecimal ();
|
||||
binary ();
|
||||
@ -0,0 +1,69 @@
|
||||
diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
|
||||
--- mpfr-3.1.0-a/PATCHES 2012-02-24 12:44:49.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/PATCHES 2012-02-24 12:44:49.000000000 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+logging-freeze
|
||||
diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
|
||||
--- mpfr-3.1.0-a/VERSION 2011-11-28 12:22:52.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/VERSION 2012-02-24 12:44:49.000000000 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.0-p4
|
||||
+3.1.0-p5
|
||||
diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
|
||||
--- mpfr-3.1.0-a/src/add_d.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/add_d.c 2012-02-24 12:44:49.000000000 +0000
|
||||
@@ -34,7 +34,7 @@
|
||||
(("b[%Pu]=%.*Rg c=%.20g rnd=%d",
|
||||
mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
|
||||
("a[%Pu]=%.*Rg inexact=%d",
|
||||
- mpfr_get_prec (a), mpfr_get_prec, a, inexact));
|
||||
+ mpfr_get_prec (a), mpfr_log_prec, a, inexact));
|
||||
|
||||
MPFR_SAVE_EXPO_MARK (expo);
|
||||
|
||||
diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
|
||||
--- mpfr-3.1.0-a/src/add_ui.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/add_ui.c 2012-02-24 12:44:49.000000000 +0000
|
||||
@@ -29,7 +29,7 @@
|
||||
MPFR_LOG_FUNC
|
||||
(("x[%Pu]=%.*Rg u=%d rnd=%d",
|
||||
mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
|
||||
- ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
|
||||
+ ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
|
||||
|
||||
if (MPFR_LIKELY(u != 0) ) /* if u=0, do nothing */
|
||||
{
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
|
||||
--- mpfr-3.1.0-a/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 0
|
||||
-#define MPFR_VERSION_STRING "3.1.0-p4"
|
||||
+#define MPFR_VERSION_STRING "3.1.0-p5"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c
|
||||
--- mpfr-3.1.0-a/src/mul_d.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mul_d.c 2012-02-24 12:44:49.000000000 +0000
|
||||
@@ -34,7 +34,7 @@
|
||||
(("b[%Pu]=%.*Rg c=%.20g rnd=%d",
|
||||
mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
|
||||
("a[%Pu]=%.*Rg inexact=%d",
|
||||
- mpfr_get_prec (a), mpfr_get_prec, a, inexact));
|
||||
+ mpfr_get_prec (a), mpfr_log_prec, a, inexact));
|
||||
|
||||
MPFR_SAVE_EXPO_MARK (expo);
|
||||
|
||||
diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
|
||||
--- mpfr-3.1.0-a/src/version.c 2011-11-28 12:22:52.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/version.c 2012-02-24 12:44:49.000000000 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.0-p4";
|
||||
+ return "3.1.0-p5";
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
|
||||
--- mpfr-3.1.0-a/PATCHES 2012-02-24 13:50:05.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/PATCHES 2012-02-24 13:50:05.000000000 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+logging-varfmt
|
||||
diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
|
||||
--- mpfr-3.1.0-a/VERSION 2012-02-24 12:44:49.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/VERSION 2012-02-24 13:50:05.000000000 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.0-p5
|
||||
+3.1.0-p6
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
|
||||
--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000
|
||||
@@ -1592,7 +1592,7 @@
|
||||
do \
|
||||
if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) && \
|
||||
(mpfr_log_current <= mpfr_log_level)) \
|
||||
- LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__, \
|
||||
+ LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__, \
|
||||
#x, mpfr_get_prec (x), mpfr_log_prec, x); \
|
||||
while (0)
|
||||
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
|
||||
--- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 0
|
||||
-#define MPFR_VERSION_STRING "3.1.0-p5"
|
||||
+#define MPFR_VERSION_STRING "3.1.0-p6"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
|
||||
--- mpfr-3.1.0-a/src/version.c 2012-02-24 12:44:49.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/version.c 2012-02-24 13:50:05.000000000 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.0-p5";
|
||||
+ return "3.1.0-p6";
|
||||
}
|
||||
@ -0,0 +1,591 @@
|
||||
diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
|
||||
--- mpfr-3.1.0-a/PATCHES 2012-03-08 15:17:03.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/PATCHES 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+large-prec
|
||||
diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
|
||||
--- mpfr-3.1.0-a/VERSION 2012-02-24 13:50:05.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/VERSION 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.0-p6
|
||||
+3.1.0-p7
|
||||
diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c
|
||||
--- mpfr-3.1.0-a/src/add1.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/add1.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -44,12 +44,12 @@
|
||||
bq = MPFR_PREC(b);
|
||||
cq = MPFR_PREC(c);
|
||||
|
||||
- an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */
|
||||
+ an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */
|
||||
aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS;
|
||||
sh = aq2 - aq; /* non-significant bits in low limb */
|
||||
|
||||
- bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */
|
||||
- cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */
|
||||
+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
|
||||
+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
|
||||
|
||||
ap = MPFR_MANT(a);
|
||||
bp = MPFR_MANT(b);
|
||||
@@ -124,7 +124,7 @@
|
||||
dif = aq2 - diff_exp;
|
||||
/* dif is the number of bits of c which overlap with a' */
|
||||
|
||||
- difn = (dif-1)/GMP_NUMB_BITS + 1;
|
||||
+ difn = MPFR_PREC2LIMBS (dif);
|
||||
/* only the highest difn limbs from c have to be considered */
|
||||
if (MPFR_UNLIKELY(difn > cn))
|
||||
{
|
||||
diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c
|
||||
--- mpfr-3.1.0-a/src/add1sp.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/add1sp.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -107,7 +107,7 @@
|
||||
|
||||
/* Read prec and num of limbs */
|
||||
p = MPFR_PREC(b);
|
||||
- n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS;
|
||||
+ n = MPFR_PREC2LIMBS (p);
|
||||
MPFR_UNSIGNED_MINUS_MODULO(sh, p);
|
||||
bx = MPFR_GET_EXP(b);
|
||||
d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c));
|
||||
diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c
|
||||
--- mpfr-3.1.0-a/src/agm.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/agm.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -91,7 +91,7 @@
|
||||
q = MPFR_PREC(r);
|
||||
p = q + MPFR_INT_CEIL_LOG2(q) + 15;
|
||||
MPFR_ASSERTD (p >= 7); /* see algorithms.tex */
|
||||
- s = (p - 1) / GMP_NUMB_BITS + 1;
|
||||
+ s = MPFR_PREC2LIMBS (p);
|
||||
|
||||
/* b (op2) and a (op1) are the 2 operands but we want b >= a */
|
||||
compare = mpfr_cmp (op1, op2);
|
||||
@@ -285,7 +285,7 @@
|
||||
|
||||
/* Next iteration */
|
||||
MPFR_ZIV_NEXT (loop, p);
|
||||
- s = (p - 1) / GMP_NUMB_BITS + 1;
|
||||
+ s = MPFR_PREC2LIMBS (p);
|
||||
}
|
||||
MPFR_ZIV_FREE (loop);
|
||||
|
||||
diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c
|
||||
--- mpfr-3.1.0-a/src/eq.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/eq.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -56,8 +56,8 @@
|
||||
if (uexp != vexp)
|
||||
return 0; /* no bit agree */
|
||||
|
||||
- usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1;
|
||||
- vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1;
|
||||
+ usize = MPFR_LIMB_SIZE (u);
|
||||
+ vsize = MPFR_LIMB_SIZE (v);
|
||||
|
||||
if (vsize > usize) /* exchange u and v */
|
||||
{
|
||||
diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c
|
||||
--- mpfr-3.1.0-a/src/exp.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/exp.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -133,7 +133,7 @@
|
||||
mp_size_t yn;
|
||||
int sh;
|
||||
|
||||
- yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
|
||||
+ yn = MPFR_LIMB_SIZE (y);
|
||||
sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y);
|
||||
MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh;
|
||||
inexact = 1;
|
||||
diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c
|
||||
--- mpfr-3.1.0-a/src/get_d.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/get_d.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -100,7 +100,7 @@
|
||||
nbits += (1021 + e);
|
||||
MPFR_ASSERTD (nbits >= 1);
|
||||
}
|
||||
- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
|
||||
+ np = MPFR_PREC2LIMBS (nbits);
|
||||
MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE );
|
||||
carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
|
||||
nbits, rnd_mode);
|
||||
diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c
|
||||
--- mpfr-3.1.0-a/src/get_flt.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/get_flt.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -92,7 +92,7 @@
|
||||
nbits += (125 + e);
|
||||
MPFR_ASSERTD (nbits >= 1);
|
||||
}
|
||||
- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
|
||||
+ np = MPFR_PREC2LIMBS (nbits);
|
||||
MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT);
|
||||
carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
|
||||
nbits, rnd_mode);
|
||||
diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c
|
||||
--- mpfr-3.1.0-a/src/get_str.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/get_str.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -2351,7 +2351,7 @@
|
||||
|
||||
/* the first digit will contain only r bits */
|
||||
prec = (m - 1) * pow2 + r; /* total number of bits */
|
||||
- n = (prec - 1) / GMP_NUMB_BITS + 1;
|
||||
+ n = MPFR_PREC2LIMBS (prec);
|
||||
|
||||
MPFR_TMP_MARK (marker);
|
||||
x1 = MPFR_TMP_LIMBS_ALLOC (n + 1);
|
||||
@@ -2417,12 +2417,12 @@
|
||||
exact = 1;
|
||||
|
||||
/* number of limbs */
|
||||
- n = 1 + (prec - 1) / GMP_NUMB_BITS;
|
||||
+ n = MPFR_PREC2LIMBS (prec);
|
||||
|
||||
/* a will contain the approximation of the mantissa */
|
||||
a = MPFR_TMP_LIMBS_ALLOC (n);
|
||||
|
||||
- nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
|
||||
+ nx = MPFR_LIMB_SIZE (x);
|
||||
|
||||
if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or
|
||||
division to perform */
|
||||
diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c
|
||||
--- mpfr-3.1.0-a/src/init2.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/init2.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -51,7 +51,7 @@
|
||||
which both have an odd mantissa */
|
||||
MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
|
||||
|
||||
- xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1;
|
||||
+ xsize = MPFR_PREC2LIMBS (p);
|
||||
tmp = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize));
|
||||
|
||||
MPFR_PREC(x) = p; /* Set prec */
|
||||
diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
|
||||
--- mpfr-3.1.0-a/src/lngamma.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
/* Now, the unit bit is represented. */
|
||||
|
||||
- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
|
||||
+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
|
||||
/* number of represented fractional bits (including the trailing 0's) */
|
||||
|
||||
x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS);
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
|
||||
--- mpfr-3.1.0-a/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-03-09 12:06:26.000000000 +0000
|
||||
@@ -646,10 +646,24 @@
|
||||
**************** mpfr_t properties *******************
|
||||
******************************************************/
|
||||
|
||||
+/* In the following macro, p is usually a mpfr_prec_t, but this macro
|
||||
+ works with other integer types (without integer overflow). Checking
|
||||
+ that p >= 1 in debug mode is useful here because this macro can be
|
||||
+ used on a computed precision (in particular, this formula does not
|
||||
+ work for a degenerate case p = 0, and could give different results
|
||||
+ on different platforms). But let us not use an assertion checking
|
||||
+ in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid
|
||||
+ too much expansion for assertions (in practice, this should be a
|
||||
+ problem just when testing MPFR with the --enable-assert configure
|
||||
+ option and the -ansi -pedantic-errors gcc compiler flags). */
|
||||
+#define MPFR_PREC2LIMBS(p) \
|
||||
+ (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1)
|
||||
+
|
||||
#define MPFR_PREC(x) ((x)->_mpfr_prec)
|
||||
#define MPFR_EXP(x) ((x)->_mpfr_exp)
|
||||
#define MPFR_MANT(x) ((x)->_mpfr_d)
|
||||
-#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1)
|
||||
+#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS)
|
||||
+#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1)
|
||||
|
||||
|
||||
/******************************************************
|
||||
@@ -749,7 +763,8 @@
|
||||
#define MPFR_IS_FP(x) (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x))
|
||||
#define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF)
|
||||
#define MPFR_IS_PURE_FP(x) (!MPFR_IS_SINGULAR(x) && \
|
||||
- (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1))
|
||||
+ (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)] \
|
||||
+ & MPFR_LIMB_HIGHBIT) != 0), 1))
|
||||
|
||||
#define MPFR_ARE_SINGULAR(x,y) \
|
||||
(MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y)))
|
||||
@@ -1061,7 +1076,7 @@
|
||||
/* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */
|
||||
#define MPFR_SET_ONE(x) \
|
||||
do { \
|
||||
- mp_size_t _size = MPFR_LIMB_SIZE(x) - 1; \
|
||||
+ mp_size_t _size = MPFR_LAST_LIMB(x); \
|
||||
MPFR_SET_POS(x); \
|
||||
MPFR_EXP(x) = 1; \
|
||||
MPN_ZERO ( MPFR_MANT(x), _size); \
|
||||
@@ -1213,8 +1228,8 @@
|
||||
_destp = MPFR_MANT (dest); \
|
||||
if (MPFR_UNLIKELY (_destprec >= _srcprec)) \
|
||||
{ \
|
||||
- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \
|
||||
- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs; \
|
||||
+ _srcs = MPFR_PREC2LIMBS (_srcprec); \
|
||||
+ _dests = MPFR_PREC2LIMBS (_destprec) - _srcs; \
|
||||
MPN_COPY (_destp + _dests, srcp, _srcs); \
|
||||
MPN_ZERO (_destp, _dests); \
|
||||
inexact = 0; \
|
||||
@@ -1227,8 +1242,8 @@
|
||||
mp_limb_t _rb, _sb, _ulp; \
|
||||
\
|
||||
/* Compute Position and shift */ \
|
||||
- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \
|
||||
- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \
|
||||
+ _srcs = MPFR_PREC2LIMBS (_srcprec); \
|
||||
+ _dests = MPFR_PREC2LIMBS (_destprec); \
|
||||
MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec); \
|
||||
_sp = (srcp) + _srcs - _dests; \
|
||||
\
|
||||
@@ -1372,7 +1387,7 @@
|
||||
if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src))) \
|
||||
{ \
|
||||
MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src), \
|
||||
- (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \
|
||||
+ MPFR_LIMB_SIZE (src)); \
|
||||
inexact = 0; \
|
||||
} \
|
||||
else \
|
||||
@@ -1682,7 +1697,7 @@
|
||||
MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \
|
||||
if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \
|
||||
mpfr_abort_prec_max (); \
|
||||
- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \
|
||||
+ _size = MPFR_PREC2LIMBS (_prec); \
|
||||
if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE)) \
|
||||
{ \
|
||||
(g).alloc = (num) * _size * sizeof (mp_limb_t); \
|
||||
@@ -1733,7 +1748,7 @@
|
||||
MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \
|
||||
if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \
|
||||
mpfr_abort_prec_max (); \
|
||||
- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \
|
||||
+ _size = MPFR_PREC2LIMBS (_prec); \
|
||||
(g).alloc = (num) * _size * sizeof (mp_limb_t); \
|
||||
if (MPFR_LIKELY (_oalloc == 0)) \
|
||||
(g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc); \
|
||||
@@ -1886,7 +1901,7 @@
|
||||
MPFR_NORETURN_ATTR;
|
||||
|
||||
__MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t,
|
||||
- unsigned long));
|
||||
+ mpfr_prec_t));
|
||||
|
||||
__MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*,
|
||||
unsigned long));
|
||||
diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
|
||||
--- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mpfr.h 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 0
|
||||
-#define MPFR_VERSION_STRING "3.1.0-p6"
|
||||
+#define MPFR_VERSION_STRING "3.1.0-p7"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c
|
||||
--- mpfr-3.1.0-a/src/mul.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/mul.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -93,15 +93,15 @@
|
||||
|
||||
ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c);
|
||||
|
||||
- bq = MPFR_PREC(b);
|
||||
- cq = MPFR_PREC(c);
|
||||
+ bq = MPFR_PREC (b);
|
||||
+ cq = MPFR_PREC (c);
|
||||
|
||||
- MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
|
||||
+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
|
||||
|
||||
- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
|
||||
- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
|
||||
+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
|
||||
+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
|
||||
k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
|
||||
- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
|
||||
+ tn = MPFR_PREC2LIMBS (bq + cq);
|
||||
/* <= k, thus no int overflow */
|
||||
MPFR_ASSERTD(tn <= k);
|
||||
|
||||
@@ -292,12 +292,12 @@
|
||||
bq = MPFR_PREC (b);
|
||||
cq = MPFR_PREC (c);
|
||||
|
||||
- MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
|
||||
+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
|
||||
|
||||
- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
|
||||
- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
|
||||
+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
|
||||
+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
|
||||
k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
|
||||
- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
|
||||
+ tn = MPFR_PREC2LIMBS (bq + cq);
|
||||
MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
|
||||
|
||||
/* Check for no size_t overflow*/
|
||||
diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c
|
||||
--- mpfr-3.1.0-a/src/pow.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/pow.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -136,7 +136,7 @@
|
||||
(b) all the 'z' bits are zero
|
||||
*/
|
||||
|
||||
- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
|
||||
+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
|
||||
/* number of z+0 bits */
|
||||
|
||||
yn = prec / GMP_NUMB_BITS;
|
||||
diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c
|
||||
--- mpfr-3.1.0-a/src/print_raw.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/print_raw.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -84,7 +84,7 @@
|
||||
int i;
|
||||
mpfr_prec_t count = 0;
|
||||
char c;
|
||||
- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
|
||||
+ mp_size_t n = MPFR_PREC2LIMBS (r);
|
||||
|
||||
printf("%s ", str);
|
||||
for(n-- ; n>=0 ; n--)
|
||||
@@ -109,7 +109,7 @@
|
||||
int i;
|
||||
mpfr_prec_t count = 0;
|
||||
char c;
|
||||
- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
|
||||
+ mp_size_t n = MPFR_PREC2LIMBS (r);
|
||||
|
||||
for(n-- ; n>=0 ; n--)
|
||||
{
|
||||
diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c
|
||||
--- mpfr-3.1.0-a/src/round_prec.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/round_prec.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -55,12 +55,12 @@
|
||||
|
||||
MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX);
|
||||
|
||||
- nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */
|
||||
+ nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */
|
||||
|
||||
/* check if x has enough allocated space for the significand */
|
||||
/* Get the number of limbs from the precision.
|
||||
(Compatible with all allocation methods) */
|
||||
- ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
|
||||
+ ow = MPFR_LIMB_SIZE (x);
|
||||
if (nw > ow)
|
||||
{
|
||||
/* FIXME: Variable can't be created using custom allocation,
|
||||
diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c
|
||||
--- mpfr-3.1.0-a/src/round_raw_generic.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/round_raw_generic.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -80,7 +80,7 @@
|
||||
(xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg)))
|
||||
return 0;
|
||||
|
||||
- xsize = (xprec-1)/GMP_NUMB_BITS + 1;
|
||||
+ xsize = MPFR_PREC2LIMBS (xprec);
|
||||
nw = yprec / GMP_NUMB_BITS;
|
||||
rw = yprec & (GMP_NUMB_BITS - 1);
|
||||
|
||||
diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c
|
||||
--- mpfr-3.1.0-a/src/set.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/set.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -48,8 +48,7 @@
|
||||
/* Same precision and b is not singular:
|
||||
* just copy the mantissa, and set the exponent and the sign
|
||||
* The result is exact. */
|
||||
- MPN_COPY (MPFR_MANT (a), MPFR_MANT (b),
|
||||
- (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS);
|
||||
+ MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b));
|
||||
MPFR_RET (0);
|
||||
}
|
||||
else
|
||||
diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c
|
||||
--- mpfr-3.1.0-a/src/set_f.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/set_f.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -43,7 +43,7 @@
|
||||
if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0)
|
||||
MPFR_CHANGE_SIGN (y);
|
||||
|
||||
- sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
|
||||
+ sy = MPFR_LIMB_SIZE (y);
|
||||
my = MPFR_MANT(y);
|
||||
mx = PTR(x);
|
||||
|
||||
diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c
|
||||
--- mpfr-3.1.0-a/src/set_prec.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/set_prec.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -32,7 +32,7 @@
|
||||
MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
|
||||
|
||||
/* Calculate the new number of limbs */
|
||||
- xsize = (p - 1) / GMP_NUMB_BITS + 1;
|
||||
+ xsize = MPFR_PREC2LIMBS (p);
|
||||
|
||||
/* Realloc only if the new size is greater than the old */
|
||||
xoldsize = MPFR_GET_ALLOC_SIZE (x);
|
||||
diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c
|
||||
--- mpfr-3.1.0-a/src/setmax.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/setmax.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -32,7 +32,7 @@
|
||||
mp_limb_t *xp;
|
||||
|
||||
MPFR_SET_EXP (x, e);
|
||||
- xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
|
||||
+ xn = MPFR_LIMB_SIZE (x);
|
||||
sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x);
|
||||
xp = MPFR_MANT(x);
|
||||
xp[0] = MP_LIMB_T_MAX << sh;
|
||||
diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c
|
||||
--- mpfr-3.1.0-a/src/sqr.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/sqr.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -56,11 +56,11 @@
|
||||
ax = 2 * MPFR_GET_EXP (b);
|
||||
bq = MPFR_PREC(b);
|
||||
|
||||
- MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */
|
||||
+ MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX);
|
||||
|
||||
- bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */
|
||||
- tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square,
|
||||
- 2*bn or 2*bn-1 */
|
||||
+ bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */
|
||||
+ tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square,
|
||||
+ 2*bn or 2*bn-1 */
|
||||
|
||||
if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD))
|
||||
return mpfr_mul (a, b, b, rnd_mode);
|
||||
diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c
|
||||
--- mpfr-3.1.0-a/src/stack_interface.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/stack_interface.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
size_t
|
||||
mpfr_custom_get_size (mpfr_prec_t prec)
|
||||
{
|
||||
- return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB;
|
||||
+ return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
|
||||
}
|
||||
|
||||
#undef mpfr_custom_init
|
||||
diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c
|
||||
--- mpfr-3.1.0-a/src/strtofr.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/strtofr.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -467,7 +467,7 @@
|
||||
/* Set y to the value of the ~prec most significant bits of pstr->mant
|
||||
(as long as we guarantee correct rounding, we don't need to get
|
||||
exactly prec bits). */
|
||||
- ysize = (prec - 1) / GMP_NUMB_BITS + 1;
|
||||
+ ysize = MPFR_PREC2LIMBS (prec);
|
||||
/* prec bits corresponds to ysize limbs */
|
||||
ysize_bits = ysize * GMP_NUMB_BITS;
|
||||
/* and to ysize_bits >= prec > MPFR_PREC (x) bits */
|
||||
diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c
|
||||
--- mpfr-3.1.0-a/src/sub1sp.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/sub1sp.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -155,8 +155,8 @@
|
||||
MPFR_ASSERTD(MPFR_IS_PURE_FP(c));
|
||||
|
||||
/* Read prec and num of limbs */
|
||||
- p = MPFR_PREC(b);
|
||||
- n = (p-1)/GMP_NUMB_BITS+1;
|
||||
+ p = MPFR_PREC (b);
|
||||
+ n = MPFR_PREC2LIMBS (p);
|
||||
|
||||
/* Fast cmp of |b| and |c|*/
|
||||
bx = MPFR_GET_EXP (b);
|
||||
diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c
|
||||
--- mpfr-3.1.0-a/src/urandomb.c 2011-10-03 08:17:09.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/urandomb.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -31,13 +31,20 @@
|
||||
a sufficient number of limbs */
|
||||
void
|
||||
mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate,
|
||||
- unsigned long int nbits)
|
||||
+ mpfr_prec_t nbits)
|
||||
{
|
||||
mpz_t z;
|
||||
|
||||
+ MPFR_ASSERTN (nbits >= 1);
|
||||
/* To be sure to avoid the potential allocation of mpz_urandomb */
|
||||
- ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1;
|
||||
+ ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits);
|
||||
PTR(z) = mp;
|
||||
+#if __MPFR_GMP(5,0,0)
|
||||
+ /* Check for integer overflow (unless mp_bitcnt_t is signed,
|
||||
+ but according to the GMP manual, this shouldn't happen).
|
||||
+ Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */
|
||||
+ MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1);
|
||||
+#endif
|
||||
mpz_urandomb (z, rstate, nbits);
|
||||
}
|
||||
|
||||
diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
|
||||
--- mpfr-3.1.0-a/src/version.c 2012-02-24 13:50:05.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/src/version.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.0-p6";
|
||||
+ return "3.1.0-p7";
|
||||
}
|
||||
diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c
|
||||
--- mpfr-3.1.0-a/tests/tinits.c 2011-10-03 08:17:14.000000000 +0000
|
||||
+++ mpfr-3.1.0-b/tests/tinits.c 2012-03-08 15:17:03.000000000 +0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears.
|
||||
+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears.
|
||||
|
||||
Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
Contributed by the Arenaire and Caramel projects, INRIA.
|
||||
@@ -20,18 +20,43 @@
|
||||
http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
|
||||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
|
||||
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
#include "mpfr-test.h"
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
mpfr_t a, b, c;
|
||||
+ long large_prec;
|
||||
|
||||
tests_start_mpfr ();
|
||||
+
|
||||
mpfr_inits (a, b, c, (mpfr_ptr) 0);
|
||||
mpfr_clears (a, b, c, (mpfr_ptr) 0);
|
||||
mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0);
|
||||
mpfr_clears (a, b, c, (mpfr_ptr) 0);
|
||||
+
|
||||
+ /* test for precision 2^31-1, see
|
||||
+ https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */
|
||||
+ large_prec = 2147483647;
|
||||
+ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
|
||||
+ {
|
||||
+ /* We assume that the precision won't be increased internally. */
|
||||
+ if (large_prec > MPFR_PREC_MAX)
|
||||
+ large_prec = MPFR_PREC_MAX;
|
||||
+ mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0);
|
||||
+ mpfr_set_ui (a, 17, MPFR_RNDN);
|
||||
+ mpfr_set (b, a, MPFR_RNDN);
|
||||
+ if (mpfr_get_ui (a, MPFR_RNDN) != 17)
|
||||
+ {
|
||||
+ printf ("Error in mpfr_init2 with precision 2^31-1\n");
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ mpfr_clears (a, b, (mpfr_ptr) 0);
|
||||
+ }
|
||||
+
|
||||
tests_end_mpfr ();
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.1.0_p7.ebuild,v 1.1 2012/03/09 19:57:25 vapier Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
|
||||
inherit eutils multilib
|
||||
|
||||
MY_PV=${PV/_p*}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
PLEVEL=${PV/*p}
|
||||
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
|
||||
HOMEPAGE="http://www.mpfr.org/"
|
||||
SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
[[ -d ${FILESDIR}/${PV} ]] && epatch "${FILESDIR}"/${PV}/*.patch
|
||||
[[ ${PLEVEL} == ${PV} ]] && return 0
|
||||
for ((i=1; i<=PLEVEL; ++i)) ; do
|
||||
patch=patch$(printf '%02d' ${i})
|
||||
if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
|
||||
epatch "${FILESDIR}"/${MY_PV}/${patch}
|
||||
elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
|
||||
epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
|
||||
else
|
||||
ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
|
||||
die "patch ${i} missing - please report to bugs.gentoo.org"
|
||||
fi
|
||||
done
|
||||
sed -i '/if test/s:==:=:' configure #261016
|
||||
find . -type f -print0 | xargs -0 touch -r configure
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die
|
||||
use static-libs || rm -f "${D}"/usr/$(get_libdir)/libmpfr.la
|
||||
|
||||
# clean up html/license install
|
||||
pushd "${D}"/usr/share/doc/${PF} >/dev/null
|
||||
dohtml *.html && rm COPYING* *.html || die
|
||||
popd >/dev/null
|
||||
# some, but not all, are already installed
|
||||
dodoc AUTHORS BUGS ChangeLog NEWS README TODO
|
||||
prepalldocs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST symfony-1.4.11.tgz 3185380 RMD160 a53a765b837769e4908b852a8c1bd178f8dffdc9 SHA1 a4b5baa8f8397aacf48d1fbe9bbab74b110a55a8 SHA256 6550788fd9d5636fe9b9fb49a954d10e9af3ec9bf58e1df43705ee836f563e81
|
||||
DIST symfony-1.4.12.tgz 3185884 RMD160 38d5de557682723f2ae1b57808151ba0f6305090 SHA1 083779db344805099f3ed20cdd69f9b8d6b125d0 SHA256 2b7686d7d4d9dc74890280a2a878be9d03c80ba677125f3709874e5924c99b85
|
||||
DIST symfony-1.4.16.tgz 3187518 RMD160 be67d310a319dc316cbdb50fbd4a260cdf8f360f SHA1 3e7f3874f138208ad44923ef90eeedf854b78740 SHA256 032ee5f94a0cdf5dfd57961fb7d3c871c648b63ebc96f4d6b6d0a869354411e5
|
||||
DIST symfony-1.4.17.tgz 3187861 RMD160 94216410eb6caee61516ae34ff4860bbcfef26f3 SHA1 ce6969fb54c75c76836befeef656a8baaffe53ee SHA256 7c7aec9f77ab313cacefe42af88bb68107269221ee481beb9fff3daf096e0e52
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-php/symfony/symfony-1.4.17.ebuild,v 1.1 2012/03/09 22:13:43 mabi Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit php-pear-lib-r1
|
||||
|
||||
DESCRIPTION="Open-source PHP5 professional web framework"
|
||||
HOMEPAGE="http://www.symfony-project.com/"
|
||||
SRC_URI="http://pear.symfony-project.com/get/${P}.tgz"
|
||||
|
||||
LICENSE="MIT LGPL-2.1 BSD BSD-2 FDL-1.2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-lang/php[cli,ctype,session,simplexml,tokenizer,xml]
|
||||
dev-php/pear"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
if has_version '=dev-lang/php-5*[-posix]';then
|
||||
einfo ""
|
||||
einfo "To enable color output on the symfony command line"
|
||||
einfo "add USE=\"posix\" to dev-lang/php"
|
||||
einfo ""
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST freedroidrpg-0.14.1.tar.gz 161715770 RMD160 fc85e688097d1700014f62f6f16629f0418095f0 SHA1 8e254098584d394d474ed81dd48bf3c028b9c56b SHA256 f5a862dda68147e5d3899a781a144e8adb1bd604f40f0edb8ba2f4602bd77ae0
|
||||
DIST freedroidrpg-0.15.tar.gz 209412185 RMD160 f21ff6b86360613e6ee0f5ffd8076c6a7a4eae09 SHA1 97f74a6b1f3c7cf447e8cc7fc850aee18c2860ed SHA256 4481a96c9cd6bfbb91ec65dbd260a4c729b82569c977b364a7f5580760af4c2f
|
||||
|
||||
@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.15.ebuild,v 1.1 2012/03/10 05:27:36 mr_bones_ Exp $
|
||||
|
||||
EAPI=2
|
||||
PYTHON_DEPEND="2"
|
||||
inherit autotools eutils python games
|
||||
|
||||
DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
|
||||
HOMEPAGE="http://freedroid.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="opengl vorbis"
|
||||
|
||||
RDEPEND="media-libs/libsdl[opengl?,video]
|
||||
dev-lang/lua
|
||||
virtual/jpeg
|
||||
media-libs/libpng
|
||||
media-libs/sdl-image[jpeg,png]
|
||||
media-libs/sdl-mixer[vorbis?]
|
||||
>=media-libs/sdl-gfx-2.0.21
|
||||
vorbis? ( media-libs/libogg media-libs/libvorbis )
|
||||
x11-libs/libX11
|
||||
opengl? ( virtual/opengl )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/python"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
games_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
python_convert_shebangs -r 2 .
|
||||
|
||||
# No need for executable game resources
|
||||
find sound graphics -type f -exec chmod -c a-x '{}' +
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
egamesconf \
|
||||
--disable-dependency-tracking \
|
||||
--disable-fastmath \
|
||||
$(use_enable opengl) \
|
||||
$(use_enable vorbis)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
rm -f "${D}/${GAMES_BINDIR}/"{croppy,pngtoico,*glue*,explode*,make_atlas}
|
||||
newicon win32/w32icon2_64x64.png ${PN}.png
|
||||
make_desktop_entry freedroidRPG "Freedroid RPG"
|
||||
prepgamesdirs
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.3.5-r1.ebuild,v 1.1 2012/03/10 00:08:36 gregkh Exp $
|
||||
|
||||
inherit eutils
|
||||
|
||||
MY_P="Argyll_V${PV}"
|
||||
DESCRIPTION="Open source, ICC compatible color management system"
|
||||
HOMEPAGE="http://www.argyllcms.com/"
|
||||
SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND="media-libs/tiff
|
||||
virtual/jpeg
|
||||
sys-libs/zlib
|
||||
x11-libs/libX11
|
||||
x11-libs/libXau
|
||||
x11-libs/libXdmcp
|
||||
x11-libs/libXext
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXxf86vm
|
||||
x11-libs/libXScrnSaver"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
dev-util/ftjam"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}/0001-Add-an-experimental-ColorHug-sensor-driver.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Make it respect LDFLAGS
|
||||
echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
|
||||
|
||||
# Evil hack to get --as-needed working. The build system unfortunately lists all
|
||||
# the shared libraries by default on the command line _before_ the object to be built...
|
||||
echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff ;" >> Jamtop
|
||||
|
||||
local jobnumber=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
|
||||
[ ${jobnumber} ] || jobnumber=-j1
|
||||
|
||||
jam -q -fJambase ${jobnumber} || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
jam -q -fJambase install || die
|
||||
|
||||
rm bin/License.txt || die
|
||||
|
||||
cd bin || die
|
||||
local binname
|
||||
for binname in * ; do
|
||||
newbin ${binname} argyll-${binname} || die
|
||||
done
|
||||
cd .. || die
|
||||
|
||||
if use doc; then
|
||||
dohtml doc/* || die
|
||||
fi
|
||||
|
||||
dodoc log.txt Readme.txt ttbd.txt notes.txt || die
|
||||
|
||||
insinto /usr/share/${PN}/ref
|
||||
doins ref/* || die
|
||||
|
||||
insinto /etc/udev/rules.d
|
||||
doins libusb/55-Argyll.rules || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "To avoid file collisions, all binary names have been prefixed"
|
||||
elog "with \"argyll-\". E.g., the \"refine\" program is now called"
|
||||
elog "\"argyll-refine\"."
|
||||
elog
|
||||
elog "If you have a Spyder2 you need to extract the firmware"
|
||||
elog "from the CVSpyder.dll of the windows driver package"
|
||||
elog "and store it as /usr/share/color/spyd2PLD.bin"
|
||||
elog
|
||||
elog "For further info on setting up instrument access read"
|
||||
elog "http://www.argyllcms.com/doc/Installing_Linux.html"
|
||||
elog
|
||||
}
|
||||
@ -0,0 +1,991 @@
|
||||
From abd5019264a92f329860bce22abf1c96b6b18ff6 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Hughes <richard@hughsie.com>
|
||||
Date: Wed, 30 Nov 2011 15:28:57 +0000
|
||||
Subject: [PATCH] Add an experimental ColorHug sensor driver
|
||||
|
||||
---
|
||||
libusb1/55-Argyll.rules | 3 +
|
||||
spectro/Jamfile | 2 +-
|
||||
spectro/afiles | 2 +
|
||||
spectro/colorhug.c | 752 +++++++++++++++++++++++++++++++++++++++++++++
|
||||
spectro/colorhug.h | 85 +++++
|
||||
spectro/inst.c | 2 +
|
||||
spectro/insttypes.c | 11 +
|
||||
spectro/insttypes.h | 1 +
|
||||
24 files changed, 858 insertions(+), 2 deletions(-)
|
||||
create mode 100644 spectro/colorhug.c
|
||||
create mode 100644 spectro/colorhug.h
|
||||
|
||||
diff --git a/libusb1/55-Argyll.rules b/libusb1/55-Argyll.rules
|
||||
index a3b3cd4..a047d26 100644
|
||||
--- a/libusb1/55-Argyll.rules
|
||||
+++ b/libusb1/55-Argyll.rules
|
||||
@@ -46,6 +46,9 @@ ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0300", ENV{COLOR_MEASUREMENT_DEVICE}
|
||||
# Huey
|
||||
ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2005", ENV{COLOR_MEASUREMENT_DEVICE}="1"
|
||||
|
||||
+# ColorHug
|
||||
+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f8dA", ENV{COLOR_MEASUREMENT_DEVICE}="1"
|
||||
+
|
||||
# Let udev-acl and ConsoleKit manage these devices, if applicable
|
||||
TEST=="/lib/udev/udev-acl", TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1"
|
||||
|
||||
diff --git a/spectro/Jamfile b/spectro/Jamfile
|
||||
index a58ae5a..bed42cf 100644
|
||||
--- a/spectro/Jamfile
|
||||
+++ b/spectro/Jamfile
|
||||
@@ -69,7 +69,7 @@ HDRS = ../h ../numlib ../icc ../cgats ../rspl ../xicc ../gamut ../spectro
|
||||
../plot $(LIBUSBHDRS) $(CMMHDRS) ;
|
||||
|
||||
# Instrument access library library
|
||||
-Library libinst : inst.c insttypes.c dtp20.c dtp22.c dtp41.c dtp51.c dtp92.c i1disp.c i1d3.c i1pro.c i1pro_imp.c munki.c munki_imp.c ss.c ss_imp.c hcfr.c spyd2.c huey.c $(IOFILE) usbio.c hidio.c ;
|
||||
+Library libinst : inst.c insttypes.c dtp20.c dtp22.c dtp41.c dtp51.c dtp92.c i1disp.c i1d3.c i1pro.c i1pro_imp.c munki.c munki_imp.c ss.c ss_imp.c hcfr.c spyd2.c huey.c colorhug.c $(IOFILE) usbio.c hidio.c ;
|
||||
|
||||
# Display access library
|
||||
Library libdisp : dispsup.c dispwin.c : : : $(LibWinH) ;
|
||||
diff --git a/spectro/afiles b/spectro/afiles
|
||||
index 32bbcf1..668409c 100644
|
||||
--- a/spectro/afiles
|
||||
+++ b/spectro/afiles
|
||||
@@ -60,6 +60,8 @@ LzmaDec.h
|
||||
LzmaDec.c
|
||||
huey.c
|
||||
huey.h
|
||||
+colorhug.c
|
||||
+colorhug.h
|
||||
spec2cie.c
|
||||
average.c
|
||||
conv.h
|
||||
diff --git a/spectro/colorhug.c b/spectro/colorhug.c
|
||||
new file mode 100644
|
||||
index 0000000..90f1b7e
|
||||
--- /dev/null
|
||||
+++ b/spectro/colorhug.c
|
||||
@@ -0,0 +1,752 @@
|
||||
+/*
|
||||
+ * Argyll Color Correction System
|
||||
+ *
|
||||
+ * Hughski ColorHug related functions
|
||||
+ *
|
||||
+ * Author: Richard Hughes
|
||||
+ * Date: 30/11/2011
|
||||
+ *
|
||||
+ * Copyright 2006 - 2007, Graeme W. Gill
|
||||
+ * Copyright 2011, Richard Hughes
|
||||
+ * All rights reserved.
|
||||
+ *
|
||||
+ * (Based on huey.c)
|
||||
+ *
|
||||
+ * This material is licenced under the GNU GENERAL PUBLIC LICENSE Version 2 or later :-
|
||||
+ * see the License2.txt file for licencing details.
|
||||
+ */
|
||||
+
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <ctype.h>
|
||||
+#include <string.h>
|
||||
+#include <time.h>
|
||||
+#include <stdarg.h>
|
||||
+#include <math.h>
|
||||
+#ifndef SALONEINSTLIB
|
||||
+#include "copyright.h"
|
||||
+#include "aconfig.h"
|
||||
+#include "numlib.h"
|
||||
+#else /* SALONEINSTLIB */
|
||||
+#include "sa_config.h"
|
||||
+#include "numsup.h"
|
||||
+#endif /* SALONEINSTLIB */
|
||||
+#include "xspect.h"
|
||||
+#include "insttypes.h"
|
||||
+#include "icoms.h"
|
||||
+#include "conv.h"
|
||||
+#include "colorhug.h"
|
||||
+
|
||||
+static inst_code colorhug_interp_code(inst *pp, int ec);
|
||||
+
|
||||
+/* Interpret an icoms error into a ColorHug error */
|
||||
+static int icoms2colorhug_err(int se) {
|
||||
+ if (se & ICOM_USERM) {
|
||||
+ se &= ICOM_USERM;
|
||||
+ if (se == ICOM_USER)
|
||||
+ return COLORHUG_USER_ABORT;
|
||||
+ if (se == ICOM_TERM)
|
||||
+ return COLORHUG_USER_TERM;
|
||||
+ if (se == ICOM_TRIG)
|
||||
+ return COLORHUG_USER_TRIG;
|
||||
+ if (se == ICOM_CMND)
|
||||
+ return COLORHUG_USER_CMND;
|
||||
+ }
|
||||
+ if (se != ICOM_OK)
|
||||
+ return COLORHUG_COMS_FAIL;
|
||||
+ return COLORHUG_OK;
|
||||
+}
|
||||
+
|
||||
+/* ColorHug commands that we care about */
|
||||
+typedef enum {
|
||||
+ ch_set_mult = 0x04, /* Set multiplier value */
|
||||
+ ch_set_integral = 0x06, /* Set integral time */
|
||||
+ ch_get_serial = 0x0b, /* Gets the serial number */
|
||||
+ ch_set_leds = 0x0e, /* Sets the LEDs */
|
||||
+ ch_take_reading = 0x23 /* Takes an XYZ reading */
|
||||
+} ColorHugCmd;
|
||||
+
|
||||
+/* Diagnostic - return a description given the instruction code */
|
||||
+static char *inst_desc(int cc) {
|
||||
+ static char buf[40];
|
||||
+ switch(cc) {
|
||||
+ case 0x04:
|
||||
+ return "SetMultiplier";
|
||||
+ case 0x06:
|
||||
+ return "SetIntegral";
|
||||
+ case 0x0b:
|
||||
+ return "GetSerial";
|
||||
+ case 0x0e:
|
||||
+ return "SetLeds";
|
||||
+ case 0x23:
|
||||
+ return "TakeReadingXYZ";
|
||||
+ }
|
||||
+ sprintf(buf,"Unknown %02x",cc);
|
||||
+ return buf;
|
||||
+}
|
||||
+
|
||||
+/* Error codes interpretation */
|
||||
+static char *
|
||||
+colorhug_interp_error(inst *pp, int ec) {
|
||||
+ ec &= inst_imask;
|
||||
+ switch (ec) {
|
||||
+ case COLORHUG_INTERNAL_ERROR:
|
||||
+ return "Internal software error";
|
||||
+ case COLORHUG_COMS_FAIL:
|
||||
+ return "Communications failure";
|
||||
+ case COLORHUG_UNKNOWN_MODEL:
|
||||
+ return "Not a known ColorHug Model";
|
||||
+ case COLORHUG_USER_ABORT:
|
||||
+ return "User hit Abort key";
|
||||
+ case COLORHUG_USER_TERM:
|
||||
+ return "User hit Terminate key";
|
||||
+ case COLORHUG_USER_TRIG:
|
||||
+ return "User hit Trigger key";
|
||||
+ case COLORHUG_USER_CMND:
|
||||
+ return "User hit a Command key";
|
||||
+
|
||||
+ case COLORHUG_OK:
|
||||
+ return "OK";
|
||||
+ case COLORHUG_UNKNOWN_CMD:
|
||||
+ return "Unknown connamd";
|
||||
+ case COLORHUG_WRONG_UNLOCK_CODE:
|
||||
+ return "Wrong unlock code";
|
||||
+ case COLORHUG_NOT_IMPLEMENTED:
|
||||
+ return "Not implemented";
|
||||
+ case COLORHUG_UNDERFLOW_SENSOR:
|
||||
+ return "Sensor underflow";
|
||||
+ case COLORHUG_NO_SERIAL:
|
||||
+ return "No serial";
|
||||
+ case COLORHUG_WATCHDOG:
|
||||
+ return "Watchdog";
|
||||
+ case COLORHUG_INVALID_ADDRESS:
|
||||
+ return "Invalid address";
|
||||
+ case COLORHUG_INVALID_LENGTH:
|
||||
+ return "Invalid length";
|
||||
+ case COLORHUG_INVALID_CHECKSUM:
|
||||
+ return "Invlid checksum";
|
||||
+ case COLORHUG_INVALID_VALUE:
|
||||
+ return "Invalid value";
|
||||
+ case COLORHUG_UNKNOWN_CMD_FOR_BOOTLOADER:
|
||||
+ return "Unknown command for bootloader";
|
||||
+ case COLORHUG_NO_CALIBRATION:
|
||||
+ return "No calibration";
|
||||
+ case COLORHUG_OVERFLOW_MULTIPLY:
|
||||
+ return "Multiply overflow";
|
||||
+ case COLORHUG_OVERFLOW_ADDITION:
|
||||
+ return "Addition overflow";
|
||||
+ case COLORHUG_OVERFLOW_SENSOR:
|
||||
+ return "Sensor overflow";
|
||||
+ case COLORHUG_OVERFLOW_STACK:
|
||||
+ return "Stack overflow";
|
||||
+
|
||||
+ /* Internal errors */
|
||||
+ case COLORHUG_NO_COMS:
|
||||
+ return "Communications hasn't been established";
|
||||
+ case COLORHUG_NOT_INITED:
|
||||
+ return "Insrument hasn't been initialised";
|
||||
+ default:
|
||||
+ return "Unknown error code";
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+/* Do a command/response exchange with the colorhug */
|
||||
+static inst_code
|
||||
+colorhug_command(colorhug *p,
|
||||
+ ColorHugCmd cmd,
|
||||
+ unsigned char *in, uint in_size,
|
||||
+ unsigned char *out, uint out_size,
|
||||
+ double timeout)
|
||||
+{
|
||||
+ int i;
|
||||
+ unsigned char buf[64];
|
||||
+ int wbytes;
|
||||
+ int rbytes;
|
||||
+ int se, ua = 0, rv = inst_ok;
|
||||
+ int isdeb = 0;
|
||||
+
|
||||
+ /* Turn off low level debug messages, and sumarise them here */
|
||||
+ isdeb = p->icom->debug;
|
||||
+ if (isdeb <= 2)
|
||||
+ p->icom->debug = 0;
|
||||
+
|
||||
+ if (isdeb) {
|
||||
+ fprintf(stderr,"colorhug: Sending cmd '%s' args '%s'\n",
|
||||
+ inst_desc(cmd), icoms_tohex(in, in_size));
|
||||
+ }
|
||||
+
|
||||
+ /* Send the command with any specified data */
|
||||
+ buf[0] = cmd;
|
||||
+ if (in != NULL)
|
||||
+ memcpy(buf + 1, in, in_size);
|
||||
+ if (p->icom->is_hid) {
|
||||
+ se = p->icom->hid_write(p->icom, buf, in_size + 1, &wbytes, timeout);
|
||||
+ } else {
|
||||
+ se = p->icom->usb_write(p->icom, 0x01, buf, in_size + 1, &wbytes, timeout);
|
||||
+ }
|
||||
+ if (se != 0) {
|
||||
+ if (se & ICOM_USERM) {
|
||||
+ ua = (se & ICOM_USERM);
|
||||
+ }
|
||||
+ if (se & ~ICOM_USERM) {
|
||||
+ if (isdeb)
|
||||
+ fprintf(stderr,"colorhug: Command send failed with ICOM err 0x%x\n", se);
|
||||
+ p->icom->debug = isdeb;
|
||||
+ return colorhug_interp_code((inst *)p, COLORHUG_COMS_FAIL);
|
||||
+ }
|
||||
+ }
|
||||
+ rv = colorhug_interp_code((inst *)p, icoms2colorhug_err(ua));
|
||||
+ if (isdeb)
|
||||
+ fprintf(stderr,"colorhug: ICOM err 0x%x\n",ua);
|
||||
+ if (wbytes != in_size + 1)
|
||||
+ rv = colorhug_interp_code((inst *)p, COLORHUG_BAD_WR_LENGTH);
|
||||
+ if (rv != inst_ok) {
|
||||
+ p->icom->debug = isdeb;
|
||||
+ return rv;
|
||||
+ }
|
||||
+
|
||||
+ /* Now fetch the response */
|
||||
+ if (isdeb)
|
||||
+ fprintf(stderr,"colorhug: Reading response\n");
|
||||
+
|
||||
+ if (p->icom->is_hid) {
|
||||
+ se = p->icom->hid_read(p->icom, buf, out_size + 2, &rbytes, timeout);
|
||||
+ } else {
|
||||
+ se = p->icom->usb_read(p->icom, 0x81, buf, out_size + 2, &rbytes, timeout);
|
||||
+ }
|
||||
+
|
||||
+ if (isdeb && rbytes >= 2) {
|
||||
+ fprintf(stderr,"Recieved cmd '%s' error '%s' args '%s'\n",
|
||||
+ inst_desc(buf[1]),
|
||||
+ colorhug_interp_error((inst *) p, buf[0]),
|
||||
+ icoms_tohex(buf, rbytes - 2));
|
||||
+ }
|
||||
+
|
||||
+ if (se != 0) {
|
||||
+
|
||||
+ /* deal with command error */
|
||||
+ if (rbytes == 2 && buf[0] != COLORHUG_OK) {
|
||||
+ rv = colorhug_interp_code((inst *)p, buf[0]);
|
||||
+ return rv;
|
||||
+ }
|
||||
+
|
||||
+ /* deal with underrun or overrun */
|
||||
+ if (rbytes != out_size + 2) {
|
||||
+ rv = colorhug_interp_code((inst *)p, COLORHUG_BAD_RD_LENGTH);
|
||||
+ return rv;
|
||||
+ }
|
||||
+
|
||||
+ /* there's another reason it failed */
|
||||
+ if (se & ICOM_USERM) {
|
||||
+ ua = (se & ICOM_USERM);
|
||||
+ }
|
||||
+ if (se & ~ICOM_USERM) {
|
||||
+ if (isdeb)
|
||||
+ fprintf(stderr,"colorhug: Response read failed with ICOM err 0x%x\n",se);
|
||||
+ p->icom->debug = isdeb;
|
||||
+ return colorhug_interp_code((inst *)p, COLORHUG_COMS_FAIL);
|
||||
+ }
|
||||
+ }
|
||||
+ rv = colorhug_interp_code((inst *)p, icoms2colorhug_err(ua));
|
||||
+ if (rv != inst_ok)
|
||||
+ return rv;
|
||||
+
|
||||
+ /* check the command was the same */
|
||||
+ if (buf[1] != cmd) {
|
||||
+ rv = colorhug_interp_code((inst *)p, COLORHUG_BAD_RET_CMD);
|
||||
+ return rv;
|
||||
+ }
|
||||
+ if (out != NULL) {
|
||||
+ memcpy(out, buf + 2, out_size);
|
||||
+ }
|
||||
+ if (isdeb) {
|
||||
+ fprintf(stderr,"colorhug: '%s' ICOM err 0x%x\n",
|
||||
+ icoms_tohex(buf + 2, out_size),ua);
|
||||
+ }
|
||||
+ p->icom->debug = isdeb;
|
||||
+ return rv;
|
||||
+}
|
||||
+
|
||||
+/* Take a short, and convert it into a byte buffer */
|
||||
+static void short2buf(unsigned char *buf, int inv)
|
||||
+{
|
||||
+ buf[0] = (inv >> 0) & 0xff;
|
||||
+ buf[1] = (inv >> 8) & 0xff;
|
||||
+}
|
||||
+
|
||||
+/* Converts a packed float to a double */
|
||||
+static double packed_float_to_double (int32_t pf)
|
||||
+{
|
||||
+ return (double) pf / (double) 0x10000;
|
||||
+}
|
||||
+
|
||||
+/* Set the device LED state */
|
||||
+static inst_code
|
||||
+colorhug_set_LEDs(colorhug *p, int mask)
|
||||
+{
|
||||
+ int i;
|
||||
+ unsigned char ibuf[4];
|
||||
+ inst_code ev;
|
||||
+
|
||||
+ mask &= 0x3;
|
||||
+ p->led_state = mask;
|
||||
+
|
||||
+ ibuf[0] = mask;
|
||||
+ ibuf[1] = 0; /* repeat */
|
||||
+ ibuf[2] = 0; /* on */
|
||||
+ ibuf[3] = 0; /* off */
|
||||
+
|
||||
+ /* Do command */
|
||||
+ ev = colorhug_command(p, ch_set_leds,
|
||||
+ ibuf, sizeof (ibuf), /* input */
|
||||
+ NULL, 0, /* output */
|
||||
+ 1.0);
|
||||
+ return ev;
|
||||
+}
|
||||
+
|
||||
+/* Take a XYZ measurement from the device */
|
||||
+static inst_code
|
||||
+colorhug_take_XYZ_measurement(colorhug *p, double XYZ[3])
|
||||
+{
|
||||
+ inst_code ev;
|
||||
+ int i;
|
||||
+ uint8_t ibuf[2];
|
||||
+ uint32_t obuf[3];
|
||||
+
|
||||
+ if (!p->inited)
|
||||
+ return colorhug_interp_code((inst *)p, COLORHUG_NOT_INITED);
|
||||
+
|
||||
+ /* Choose the calibration matrix */
|
||||
+ short2buf(ibuf + 0, p->crt ? 65 : 64);
|
||||
+
|
||||
+ /* Do the measurement, and return the values */
|
||||
+ ev = colorhug_command(p, ch_take_reading,
|
||||
+ ibuf, sizeof (ibuf),
|
||||
+ (unsigned char *) obuf, sizeof (obuf),
|
||||
+ 5.0);
|
||||
+ if (ev != inst_ok)
|
||||
+ return ev;
|
||||
+
|
||||
+ /* Convert to doubles */
|
||||
+ for (i = 0; i < 3; i++)
|
||||
+ XYZ[i] = packed_float_to_double (obuf[i]);
|
||||
+
|
||||
+ /* Apply the colorimeter correction matrix */
|
||||
+ icmMulBy3x3(XYZ, p->ccmat, XYZ);
|
||||
+
|
||||
+ if (p->debug) {
|
||||
+ fprintf(stderr,"colorhug: returning XYZ = %f %f %f\n",
|
||||
+ XYZ[0],XYZ[1],XYZ[2]);
|
||||
+ }
|
||||
+ return inst_ok;
|
||||
+}
|
||||
+
|
||||
+/* Establish communications with a ColorHug */
|
||||
+static inst_code
|
||||
+colorhug_init_coms(inst *pp, int port, baud_rate br, flow_control fc, double tout) {
|
||||
+ colorhug *p = (colorhug *) pp;
|
||||
+
|
||||
+ if (p->debug) {
|
||||
+ p->icom->debug = p->debug; /* Turn on debugging */
|
||||
+ fprintf(stderr,"colorhug: About to init coms\n");
|
||||
+ }
|
||||
+
|
||||
+ /* Open as an HID if available */
|
||||
+ if (p->icom->is_hid_portno(p->icom, port) != instUnknown) {
|
||||
+
|
||||
+ if (p->debug)
|
||||
+ fprintf(stderr,"colorhug: About to init HID\n");
|
||||
+
|
||||
+ /* Set config, interface */
|
||||
+ p->icom->set_hid_port(p->icom, port, icomuf_none, 0, NULL);
|
||||
+
|
||||
+ } else if (p->icom->is_usb_portno(p->icom, port) != instUnknown) {
|
||||
+
|
||||
+ if (p->debug)
|
||||
+ fprintf(stderr,"colorhug: About to init USB\n");
|
||||
+
|
||||
+ /* Set config, interface, write end point, read end point */
|
||||
+ p->icom->set_usb_port(p->icom, port, 1, 0x00, 0x00, icomuf_detach, 0, NULL);
|
||||
+
|
||||
+ } else {
|
||||
+ if (p->debug)
|
||||
+ fprintf(stderr,"colorhug: init_coms called to wrong device!\n");
|
||||
+ return colorhug_interp_code((inst *)p, COLORHUG_UNKNOWN_MODEL);
|
||||
+ }
|
||||
+
|
||||
+ if (p->debug)
|
||||
+ fprintf(stderr,"colorhug: init coms has suceeded\n");
|
||||
+
|
||||
+ p->gotcoms = 1;
|
||||
+ return inst_ok;
|
||||
+}
|
||||
+
|
||||
+/* Set the device multiplier */
|
||||
+static inst_code
|
||||
+colorhug_set_multiplier (colorhug *p, int multiplier)
|
||||
+{
|
||||
+ inst_code ev;
|
||||
+ unsigned char ibuf[1];
|
||||
+
|
||||
+ /* Set the desired multiplier */
|
||||
+ ibuf[0] = multiplier;
|
||||
+ ev = colorhug_command(p, ch_set_mult,
|
||||
+ ibuf, sizeof (ibuf),
|
||||
+ NULL, 0,
|
||||
+ 1.0);
|
||||
+ return ev;
|
||||
+}
|
||||
+
|
||||
+/* Set the device integral time */
|
||||
+static inst_code
|
||||
+colorhug_set_integral (colorhug *p, int integral)
|
||||
+{
|
||||
+ inst_code ev;
|
||||
+ unsigned char ibuf[2];
|
||||
+
|
||||
+ /* Set the desired integral time */
|
||||
+ short2buf(ibuf + 0, integral);
|
||||
+ ev = colorhug_command(p, ch_set_integral,
|
||||
+ ibuf, sizeof (ibuf),
|
||||
+ NULL, 0,
|
||||
+ 1.0);
|
||||
+ return ev;
|
||||
+}
|
||||
+
|
||||
+/* Initialise the ColorHug */
|
||||
+static inst_code
|
||||
+colorhug_init_inst(inst *pp)
|
||||
+{
|
||||
+ colorhug *p = (colorhug *)pp;
|
||||
+ inst_code ev;
|
||||
+
|
||||
+ if (p->debug)
|
||||
+ fprintf(stderr,"colorhug: About to init instrument\n");
|
||||
+
|
||||
+ /* Must establish coms first */
|
||||
+ if (p->gotcoms == 0)
|
||||
+ return colorhug_interp_code((inst *)p, COLORHUG_NO_COMS);
|
||||
+
|
||||
+ /* Turn the LEDs off */
|
||||
+ ev = colorhug_set_LEDs(p, 0x0);
|
||||
+ if (ev != inst_ok)
|
||||
+ return ev;
|
||||
+
|
||||
+ /* Turn the sensor on */
|
||||
+ ev = colorhug_set_multiplier(p, 0x03);
|
||||
+ if (ev != inst_ok)
|
||||
+ return ev;
|
||||
+
|
||||
+ /* Set the integral time to maximum precision */
|
||||
+ ev = colorhug_set_integral(p, 0xffff);
|
||||
+ if (ev != inst_ok)
|
||||
+ return ev;
|
||||
+
|
||||
+ p->itype = instColorHug;
|
||||
+ p->trig = inst_opt_trig_keyb;
|
||||
+ p->inited = 1;
|
||||
+ if (p->debug)
|
||||
+ fprintf(stderr,"colorhug: instrument inited OK\n");
|
||||
+
|
||||
+ /* Flash the LEDs */
|
||||
+ ev = colorhug_set_LEDs(p, 0x1);
|
||||
+ if (ev != inst_ok)
|
||||
+ return ev;
|
||||
+ msec_sleep(50);
|
||||
+ ev = colorhug_set_LEDs(p, 0x2);
|
||||
+ if (ev != inst_ok)
|
||||
+ return ev;
|
||||
+ msec_sleep(50);
|
||||
+ ev = colorhug_set_LEDs(p, 0x1);
|
||||
+ if (ev != inst_ok)
|
||||
+ return ev;
|
||||
+ msec_sleep(50);
|
||||
+ ev = colorhug_set_LEDs(p, 0x0);
|
||||
+ if (ev != inst_ok)
|
||||
+ return ev;
|
||||
+
|
||||
+ return ev;
|
||||
+}
|
||||
+
|
||||
+/* Read a single sample */
|
||||
+static inst_code
|
||||
+colorhug_read_sample(
|
||||
+inst *pp,
|
||||
+char *name, /* Strip name (7 chars) */
|
||||
+ipatch *val) { /* Pointer to instrument patch value */
|
||||
+ colorhug *p = (colorhug *)pp;
|
||||
+ int user_trig = 0;
|
||||
+ int rv = inst_protocol_error;
|
||||
+
|
||||
+ if (p->trig == inst_opt_trig_keyb) {
|
||||
+ int se;
|
||||
+ if ((se = icoms_poll_user(p->icom, 1)) != ICOM_TRIG) {
|
||||
+ /* Abort, term or command */
|
||||
+ return colorhug_interp_code((inst *)p, icoms2colorhug_err(se));
|
||||
+ }
|
||||
+ user_trig = 1;
|
||||
+ if (p->trig_return)
|
||||
+ printf("\n");
|
||||
+ }
|
||||
+
|
||||
+ /* Read the XYZ value */
|
||||
+ if ((rv = colorhug_take_XYZ_measurement(p, val->aXYZ)) != inst_ok) {
|
||||
+ return rv;
|
||||
+ }
|
||||
+
|
||||
+ val->XYZ_v = 0;
|
||||
+ val->aXYZ_v = 1; /* These are absolute XYZ readings ? */
|
||||
+ val->Lab_v = 0;
|
||||
+ val->sp.spec_n = 0;
|
||||
+ val->duration = 0.0;
|
||||
+
|
||||
+ if (user_trig)
|
||||
+ return inst_user_trig;
|
||||
+ return rv;
|
||||
+}
|
||||
+
|
||||
+/* Insert a colorimetric correction matrix */
|
||||
+inst_code colorhug_col_cor_mat(
|
||||
+inst *pp,
|
||||
+double mtx[3][3]
|
||||
+) {
|
||||
+ colorhug *p = (colorhug *)pp;
|
||||
+
|
||||
+ if (mtx == NULL)
|
||||
+ icmSetUnity3x3(p->ccmat);
|
||||
+ else
|
||||
+ icmCpy3x3(p->ccmat, mtx);
|
||||
+
|
||||
+ return inst_ok;
|
||||
+}
|
||||
+
|
||||
+/* Determine if a calibration is needed */
|
||||
+inst_cal_type colorhug_needs_calibration(inst *pp) {
|
||||
+ return inst_ok;
|
||||
+}
|
||||
+
|
||||
+/* Request an instrument calibration */
|
||||
+inst_code colorhug_calibrate(
|
||||
+inst *pp,
|
||||
+inst_cal_type calt, /* Calibration type. inst_calt_all for all neeeded */
|
||||
+inst_cal_cond *calc, /* Current condition/desired condition */
|
||||
+char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */
|
||||
+) {
|
||||
+ id[0] = '\000';
|
||||
+ return inst_unsupported;
|
||||
+}
|
||||
+
|
||||
+/* Convert a machine specific error code into an abstract dtp code */
|
||||
+static inst_code
|
||||
+colorhug_interp_code(inst *pp, int ec) {
|
||||
+ ec &= inst_imask;
|
||||
+ switch (ec) {
|
||||
+
|
||||
+ case COLORHUG_OK:
|
||||
+ return inst_ok;
|
||||
+
|
||||
+ case COLORHUG_INTERNAL_ERROR:
|
||||
+ case COLORHUG_NO_COMS:
|
||||
+ case COLORHUG_NOT_INITED:
|
||||
+ return inst_internal_error | ec;
|
||||
+
|
||||
+ case COLORHUG_COMS_FAIL:
|
||||
+ return inst_coms_fail | ec;
|
||||
+
|
||||
+ case COLORHUG_UNKNOWN_MODEL:
|
||||
+ return inst_unknown_model | ec;
|
||||
+
|
||||
+ case COLORHUG_UNKNOWN_CMD:
|
||||
+ case COLORHUG_WRONG_UNLOCK_CODE:
|
||||
+ case COLORHUG_NOT_IMPLEMENTED:
|
||||
+ case COLORHUG_UNDERFLOW_SENSOR:
|
||||
+ case COLORHUG_NO_SERIAL:
|
||||
+ case COLORHUG_WATCHDOG:
|
||||
+ case COLORHUG_INVALID_ADDRESS:
|
||||
+ case COLORHUG_INVALID_LENGTH:
|
||||
+ case COLORHUG_INVALID_CHECKSUM:
|
||||
+ case COLORHUG_INVALID_VALUE:
|
||||
+ case COLORHUG_UNKNOWN_CMD_FOR_BOOTLOADER:
|
||||
+ case COLORHUG_NO_CALIBRATION:
|
||||
+ case COLORHUG_OVERFLOW_MULTIPLY:
|
||||
+ case COLORHUG_OVERFLOW_ADDITION:
|
||||
+ case COLORHUG_OVERFLOW_SENSOR:
|
||||
+ case COLORHUG_OVERFLOW_STACK:
|
||||
+ case COLORHUG_BAD_WR_LENGTH:
|
||||
+ case COLORHUG_BAD_RD_LENGTH:
|
||||
+ case COLORHUG_BAD_RET_CMD:
|
||||
+ case COLORHUG_BAD_RET_STAT:
|
||||
+ return inst_protocol_error | ec;
|
||||
+
|
||||
+ case COLORHUG_USER_ABORT:
|
||||
+ return inst_user_abort | ec;
|
||||
+ case COLORHUG_USER_TERM:
|
||||
+ return inst_user_term | ec;
|
||||
+ case COLORHUG_USER_TRIG:
|
||||
+ return inst_user_trig | ec;
|
||||
+ case COLORHUG_USER_CMND:
|
||||
+ return inst_user_cmnd | ec;
|
||||
+ }
|
||||
+ return inst_other_error | ec;
|
||||
+}
|
||||
+
|
||||
+/* Destroy ourselves */
|
||||
+static void
|
||||
+colorhug_del(inst *pp) {
|
||||
+ colorhug *p = (colorhug *)pp;
|
||||
+ if (p->icom != NULL)
|
||||
+ p->icom->del(p->icom);
|
||||
+ free(p);
|
||||
+}
|
||||
+
|
||||
+/* Return the instrument capabilities */
|
||||
+inst_capability colorhug_capabilities(inst *pp) {
|
||||
+ colorhug *p = (colorhug *)pp;
|
||||
+ inst_capability rv;
|
||||
+
|
||||
+ rv = inst_emis_spot
|
||||
+ | inst_emis_disp
|
||||
+ | inst_emis_disp_lcd
|
||||
+ | inst_colorimeter
|
||||
+ | inst_ccmx
|
||||
+ ;
|
||||
+
|
||||
+ return rv;
|
||||
+}
|
||||
+
|
||||
+/* Return the instrument capabilities 2 */
|
||||
+inst2_capability colorhug_capabilities2(inst *pp) {
|
||||
+ colorhug *p = (colorhug *)pp;
|
||||
+ inst2_capability rv = 0;
|
||||
+
|
||||
+ rv |= inst2_prog_trig;
|
||||
+ rv |= inst2_keyb_trig;
|
||||
+ rv |= inst2_has_leds;
|
||||
+
|
||||
+ return rv;
|
||||
+}
|
||||
+
|
||||
+/* Set device measurement mode */
|
||||
+inst_code colorhug_set_mode(inst *pp, inst_mode m)
|
||||
+{
|
||||
+ colorhug *p = (colorhug *)pp;
|
||||
+ inst_mode mm; /* Measurement mode */
|
||||
+
|
||||
+ /* The measurement mode portion of the mode */
|
||||
+ mm = m & inst_mode_measurement_mask;
|
||||
+
|
||||
+ /* only display emission mode and ambient supported */
|
||||
+ if (mm != inst_mode_emis_spot
|
||||
+ && mm != inst_mode_emis_disp
|
||||
+ && mm != inst_mode_emis_ambient) {
|
||||
+ return inst_unsupported;
|
||||
+ }
|
||||
+
|
||||
+ /* Spectral mode is not supported */
|
||||
+ if (m & inst_mode_spectral)
|
||||
+ return inst_unsupported;
|
||||
+
|
||||
+ p->mode = m;
|
||||
+ return inst_ok;
|
||||
+}
|
||||
+
|
||||
+/* Set or reset an optional mode */
|
||||
+static inst_code
|
||||
+colorhug_set_opt_mode(inst *pp, inst_opt_mode m, ...)
|
||||
+{
|
||||
+ colorhug *p = (colorhug *)pp;
|
||||
+ inst_code ev = inst_ok;
|
||||
+
|
||||
+ /* Select CRT/LCD */
|
||||
+ if (m == inst_opt_disp_crt) {
|
||||
+ if (p->crt == 0)
|
||||
+ p->crt = 1;
|
||||
+ return inst_ok;
|
||||
+ } else if (m == inst_opt_disp_lcd) {
|
||||
+ if (p->crt != 0)
|
||||
+ p->crt = 0;
|
||||
+ return inst_ok;
|
||||
+
|
||||
+ }
|
||||
+ /* Record the trigger mode */
|
||||
+ if (m == inst_opt_trig_prog
|
||||
+ || m == inst_opt_trig_keyb) {
|
||||
+ p->trig = m;
|
||||
+ return inst_ok;
|
||||
+ }
|
||||
+ if (m == inst_opt_trig_return) {
|
||||
+ p->trig_return = 1;
|
||||
+ return inst_ok;
|
||||
+ } else if (m == inst_opt_trig_no_return) {
|
||||
+ p->trig_return = 0;
|
||||
+ return inst_ok;
|
||||
+ }
|
||||
+
|
||||
+ /* Operate the LEDs */
|
||||
+ if (m == inst_opt_get_gen_ledmask) {
|
||||
+ va_list args;
|
||||
+ int *mask = NULL;
|
||||
+
|
||||
+ va_start(args, m);
|
||||
+ mask = va_arg(args, int *);
|
||||
+ va_end(args);
|
||||
+ *mask = 0x3; /* Two general LEDs */
|
||||
+ return inst_ok;
|
||||
+ } else if (m == inst_opt_get_led_state) {
|
||||
+ va_list args;
|
||||
+ int *mask = NULL;
|
||||
+
|
||||
+ va_start(args, m);
|
||||
+ mask = va_arg(args, int *);
|
||||
+ va_end(args);
|
||||
+ *mask = p->led_state;
|
||||
+ return inst_ok;
|
||||
+ } else if (m == inst_opt_set_led_state) {
|
||||
+ va_list args;
|
||||
+ int mask = 0;
|
||||
+
|
||||
+ va_start(args, m);
|
||||
+ mask = va_arg(args, int);
|
||||
+ va_end(args);
|
||||
+ return colorhug_set_LEDs(p, mask);
|
||||
+ }
|
||||
+
|
||||
+ return inst_unsupported;
|
||||
+}
|
||||
+
|
||||
+/* Constructor */
|
||||
+extern colorhug *new_colorhug(icoms *icom, int debug, int verb)
|
||||
+{
|
||||
+ colorhug *p;
|
||||
+ if ((p = (colorhug *)calloc(sizeof(colorhug),1)) == NULL)
|
||||
+ error("colorhug: malloc failed!");
|
||||
+
|
||||
+ if (icom == NULL)
|
||||
+ p->icom = new_icoms();
|
||||
+ else
|
||||
+ p->icom = icom;
|
||||
+
|
||||
+ p->debug = debug;
|
||||
+ p->verb = verb;
|
||||
+
|
||||
+ /* Set the colorimeter correction matrix to do nothing */
|
||||
+ icmSetUnity3x3(p->ccmat);
|
||||
+
|
||||
+ p->init_coms = colorhug_init_coms;
|
||||
+ p->init_inst = colorhug_init_inst;
|
||||
+ p->capabilities = colorhug_capabilities;
|
||||
+ p->capabilities2 = colorhug_capabilities2;
|
||||
+ p->set_mode = colorhug_set_mode;
|
||||
+ p->set_opt_mode = colorhug_set_opt_mode;
|
||||
+ p->read_sample = colorhug_read_sample;
|
||||
+ p->needs_calibration = colorhug_needs_calibration;
|
||||
+ p->col_cor_mat = colorhug_col_cor_mat;
|
||||
+ p->calibrate = colorhug_calibrate;
|
||||
+ p->interp_error = colorhug_interp_error;
|
||||
+ p->del = colorhug_del;
|
||||
+
|
||||
+ /* Until initalisation */
|
||||
+ p->itype = instUnknown;
|
||||
+
|
||||
+ return p;
|
||||
+}
|
||||
diff --git a/spectro/colorhug.h b/spectro/colorhug.h
|
||||
new file mode 100644
|
||||
index 0000000..6c0a485
|
||||
--- /dev/null
|
||||
+++ b/spectro/colorhug.h
|
||||
@@ -0,0 +1,85 @@
|
||||
+/*
|
||||
+ * Argyll Color Correction System
|
||||
+ *
|
||||
+ * Hughski ColorHug related defines
|
||||
+ *
|
||||
+ * Author: Richard Hughes
|
||||
+ * Date: 30/11/2011
|
||||
+ *
|
||||
+ * Copyright 2006 - 2007, Graeme W. Gill
|
||||
+ * Copyright 2011, Richard Hughes
|
||||
+ * All rights reserved.
|
||||
+ *
|
||||
+ * (Based on huey.h)
|
||||
+ *
|
||||
+ * This material is licenced under the GNU GENERAL PUBLIC LICENSE Version 2 or later :-
|
||||
+ * see the License2.txt file for licencing details.
|
||||
+ */
|
||||
+
|
||||
+#ifndef COLORHUG_H
|
||||
+
|
||||
+#include "inst.h"
|
||||
+
|
||||
+/* Note: update colorhug_interp_error() and colorhug_interp_code() in colorhug.c */
|
||||
+/* if anything of these #defines are added or subtracted */
|
||||
+
|
||||
+/* Fake Error codes */
|
||||
+#define COLORHUG_INTERNAL_ERROR 0x61 /* Internal software error */
|
||||
+#define COLORHUG_COMS_FAIL 0x62 /* Communication failure */
|
||||
+#define COLORHUG_UNKNOWN_MODEL 0x63 /* Not an colorhug */
|
||||
+#define COLORHUG_DATA_PARSE_ERROR 0x64 /* Read data parsing error */
|
||||
+#define COLORHUG_USER_ABORT 0x65 /* User hit abort */
|
||||
+#define COLORHUG_USER_TERM 0x66 /* User hit terminate */
|
||||
+#define COLORHUG_USER_TRIG 0x67 /* User hit trigger */
|
||||
+#define COLORHUG_USER_CMND 0x68 /* User hit command */
|
||||
+
|
||||
+/* Real error codes */
|
||||
+#define COLORHUG_OK 0x00
|
||||
+#define COLORHUG_UNKNOWN_CMD 0x01
|
||||
+#define COLORHUG_WRONG_UNLOCK_CODE 0x02
|
||||
+#define COLORHUG_NOT_IMPLEMENTED 0x03
|
||||
+#define COLORHUG_UNDERFLOW_SENSOR 0x04
|
||||
+#define COLORHUG_NO_SERIAL 0x05
|
||||
+#define COLORHUG_WATCHDOG 0x06
|
||||
+#define COLORHUG_INVALID_ADDRESS 0x07
|
||||
+#define COLORHUG_INVALID_LENGTH 0x08
|
||||
+#define COLORHUG_INVALID_CHECKSUM 0x09
|
||||
+#define COLORHUG_INVALID_VALUE 0x0a
|
||||
+#define COLORHUG_UNKNOWN_CMD_FOR_BOOTLOADER 0x0b
|
||||
+#define COLORHUG_NO_CALIBRATION 0x0c
|
||||
+#define COLORHUG_OVERFLOW_MULTIPLY 0x0d
|
||||
+#define COLORHUG_OVERFLOW_ADDITION 0x0e
|
||||
+#define COLORHUG_OVERFLOW_SENSOR 0x0f
|
||||
+#define COLORHUG_OVERFLOW_STACK 0x10
|
||||
+
|
||||
+/* Internal errors */
|
||||
+#define COLORHUG_NO_COMS 0x22
|
||||
+#define COLORHUG_NOT_INITED 0x23
|
||||
+#define COLORHUG_BAD_WR_LENGTH 0x25
|
||||
+#define COLORHUG_BAD_RD_LENGTH 0x26
|
||||
+#define COLORHUG_BAD_RET_CMD 0x27
|
||||
+#define COLORHUG_BAD_RET_STAT 0x28
|
||||
+
|
||||
+
|
||||
+/* COLORHUG communication object */
|
||||
+struct _colorhug {
|
||||
+ INST_OBJ_BASE
|
||||
+
|
||||
+ inst_mode mode; /* Currently selected mode */
|
||||
+
|
||||
+ inst_opt_mode trig; /* Reading trigger mode */
|
||||
+ int trig_return; /* Emit "\n" after trigger */
|
||||
+
|
||||
+ int ser_no; /* Serial number */
|
||||
+ int crt; /* NZ if set to CRT */
|
||||
+ double ccmat[3][3]; /* Colorimeter correction matrix */
|
||||
+ int led_state; /* Current LED state */
|
||||
+
|
||||
+}; typedef struct _colorhug colorhug;
|
||||
+
|
||||
+/* Constructor */
|
||||
+extern colorhug *new_colorhug(icoms *icom, int debug, int verb);
|
||||
+
|
||||
+
|
||||
+#define COLORHUG_H
|
||||
+#endif /* COLORHUG_H */
|
||||
diff --git a/spectro/inst.c b/spectro/inst.c
|
||||
index b73ff6c..cbcda9e 100644
|
||||
--- a/spectro/inst.c
|
||||
+++ b/spectro/inst.c
|
||||
@@ -476,6 +476,8 @@ int verb /* Verbosity flag */
|
||||
p = (inst *)new_spyd2(icom, debug, verb);
|
||||
else if (itype == instHuey)
|
||||
p = (inst *)new_huey(icom, debug, verb);
|
||||
+ else if (itype == instColorHug)
|
||||
+ p = (inst *)new_colorhug(icom, debug, verb);
|
||||
else {
|
||||
return NULL;
|
||||
}
|
||||
diff --git a/spectro/instlib.ksh b/spectro/instlib.ksh
|
||||
index 0d2a7d2..d8e47dc 100644
|
||||
--- a/spectro/instlib.ksh
|
||||
+++ b/spectro/instlib.ksh
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
echo "Making standalone GPLv2 instrument archive instlib.zip "
|
||||
|
||||
-FILES="License2.txt Makefile.OSX Makefile.UNIX Makefile.WNT pollem.h pollem.c conv.h conv.c hidio.h hidio.c icoms.h inst.h inst.c insttypes.c insttypes.h insttypeinst.h dtp20.c dtp20.h dtp22.c dtp22.h dtp41.c dtp41.h dtp51.c dtp51.h dtp92.c dtp92.h ss.h ss.c ss_imp.h ss_imp.c i1disp.c i1disp.h i1d3.h i1d3.c i1pro.h i1pro.c i1pro_imp.h i1pro_imp.c munki.h munki.c munki_imp.h munki_imp.c hcfr.c hcfr.h huey.c huey.h spyd2.c spyd2.h spyd2setup.h spyd2PLD.h spyd2en.c i1d3ccss.c vinflate.c inflate.c LzmaDec.c LzmaDec.h LzmaTypes.h ntio.c unixio.c usbio.h usbio.c xdg_bds.c xdg_bds.h ../xicc/xspect.h ../xicc/xspect.c ../xicc/ccss.h ../xicc/ccss.c ../rspl/rspl1.h ../rspl/rspl1.c ../h/sort.h ../numlib/numsup.h ../numlib/numsup.c ../cgats/pars.h ../cgats/pars.c ../cgats/parsstd.c ../cgats/cgats.h ../cgats/cgats.c ../cgats/cgatsstd.c spotread.c"
|
||||
+FILES="License2.txt Makefile.OSX Makefile.UNIX Makefile.WNT pollem.h pollem.c conv.h conv.c hidio.h hidio.c icoms.h inst.h inst.c insttypes.c insttypes.h insttypeinst.h dtp20.c dtp20.h dtp22.c dtp22.h dtp41.c dtp41.h dtp51.c dtp51.h dtp92.c dtp92.h ss.h ss.c ss_imp.h ss_imp.c i1disp.c i1disp.h i1d3.h i1d3.c i1pro.h i1pro.c i1pro_imp.h i1pro_imp.c munki.h munki.c munki_imp.h munki_imp.c hcfr.c hcfr.h huey.c huey.h colorhug.c colorhug.h spyd2.c spyd2.h spyd2setup.h spyd2PLD.h spyd2en.c i1d3ccss.c vinflate.c inflate.c LzmaDec.c LzmaDec.h LzmaTypes.h ntio.c unixio.c usbio.h usbio.c xdg_bds.c xdg_bds.h ../xicc/xspect.h ../xicc/xspect.c ../xicc/ccss.h ../xicc/ccss.c ../rspl/rspl1.h ../rspl/rspl1.c ../h/sort.h ../numlib/numsup.h ../numlib/numsup.c ../cgats/pars.h ../cgats/pars.c ../cgats/parsstd.c ../cgats/cgats.h ../cgats/cgats.c ../cgats/cgatsstd.c spotread.c"
|
||||
|
||||
rm -f instlib.zip
|
||||
rm -rf _zipdir
|
||||
diff --git a/spectro/insttypes.c b/spectro/insttypes.c
|
||||
index a11f299..ed0170e 100644
|
||||
--- a/spectro/insttypes.c
|
||||
+++ b/spectro/insttypes.c
|
||||
@@ -73,6 +73,8 @@ char *inst_name(instType itype) {
|
||||
return "Datacolor Spyder3";
|
||||
case instHuey:
|
||||
return "GretagMacbeth Huey";
|
||||
+ case instColorHug:
|
||||
+ return "Hughski ColorHug";
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -124,6 +126,8 @@ instType inst_enum(char *name) {
|
||||
return instSpyder3;
|
||||
else if (strcmp(name, "GretagMacbeth Huey") == 0)
|
||||
return instHuey;
|
||||
+ else if (strcmp(name, "Hughski ColorHug") == 0)
|
||||
+ return instColorHug;
|
||||
|
||||
return instUnknown;
|
||||
}
|
||||
@@ -183,6 +187,11 @@ unsigned short idProduct) {
|
||||
return instSpyder3;
|
||||
}
|
||||
|
||||
+ if (idVendor == 0x04d8) { /* Microchip */
|
||||
+ if (idProduct == 0xf8da) /* Hughski ColorHug */
|
||||
+ return instColorHug;
|
||||
+ }
|
||||
+
|
||||
/* Add other instruments here */
|
||||
|
||||
return instUnknown;
|
||||
@@ -260,6 +269,8 @@ int inst_illuminant(xspect *sp, instType itype) {
|
||||
case instHuey:
|
||||
return 1; /* Not applicable */
|
||||
|
||||
+ case instColorHug:
|
||||
+ return 1; /* Not applicable */
|
||||
|
||||
default:
|
||||
break;
|
||||
diff --git a/spectro/insttypes.h b/spectro/insttypes.h
|
||||
index 6155cf0..15c6545 100644
|
||||
--- a/spectro/insttypes.h
|
||||
+++ b/spectro/insttypes.h
|
||||
@@ -44,6 +44,7 @@ typedef enum {
|
||||
instSpyder2, /* Datacolor/ColorVision Spyder2 */
|
||||
instSpyder3, /* Datacolor Spyder3 */
|
||||
instHuey, /* GretagMacbeth Huey */
|
||||
+ instColorHug, /* Hughski ColorHug */
|
||||
|
||||
} instType;
|
||||
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,4 +1 @@
|
||||
DIST gif2png-2.5.4.tar.gz 125731 RMD160 372a56e260957a7f8895322904f3691df7e56d7e SHA1 40a33457e5d2beb0f001c14fabf0e92533c38450 SHA256 0d78eb568198b568f7c1f535b9ec74fc6546864de11f57924c8e8db510423fef
|
||||
DIST gif2png-2.5.5.tar.gz 126884 RMD160 1c1e68553d508bd34a37e0dafc061e39efc42228 SHA1 df38c056ab8441fff3735316fb0fc2c3953f6c93 SHA256 ebaa853fd585b80fd77cccb069e3734acabab668a33aad86cb107b1eac414904
|
||||
DIST gif2png-2.5.6.tar.gz 127073 RMD160 7494c392ff275e3466af58e079ccb6bdc36df14a SHA1 1aaa35ebe419e1a10a5acb23cceeba0c44b773e7 SHA256 9e3be951e1dcf9b75647c00bc527a25d65418e38f1b5f2022414160dafd868c4
|
||||
DIST gif2png-2.5.8.tar.gz 128373 RMD160 51f974d157c06da514a9abd5e2c9e25ecdbe66bb SHA1 69fabf807490ee3f91abed68dcb49a7355c83b3b SHA256 f962c6d1a76d6ec376cd380112235901dc0c130cc134db5e65a3408b4904ff18
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
Fixes cmdline buffer overflow described in
|
||||
|
||||
http://lists.grok.org.uk/pipermail/full-disclosure/2009-December/072002.html
|
||||
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550978
|
||||
|
||||
Index: gif2png-2.5.3/gif2png.c
|
||||
===================================================================
|
||||
--- gif2png-2.5.3.orig/gif2png.c
|
||||
+++ gif2png-2.5.3/gif2png.c
|
||||
@@ -675,7 +675,10 @@ int processfile(char *fname, FILE *fp)
|
||||
|
||||
strcpy(outname, fname);
|
||||
|
||||
- file_ext = outname+strlen(outname)-4;
|
||||
+ file_ext = outname+strlen(outname);
|
||||
+ if (file_ext >= outname + 4)
|
||||
+ file_ext -= 4;
|
||||
+
|
||||
if (strcmp(file_ext, ".gif") != 0 && strcmp(file_ext, ".GIF") != 0 &&
|
||||
strcmp(file_ext, "_gif") != 0 && strcmp(file_ext, "_GIF") != 0) {
|
||||
/* try to derive basename */
|
||||
@@ -863,6 +866,14 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
} else {
|
||||
for (i = ac;i<argc; i++) {
|
||||
+ /* make sure that there is enough space for a '.p<NUM>' suffix;
|
||||
+ this check catches also the '.gif' case below. */
|
||||
+ if (strlen(argv[i]) >= sizeof name - sizeof ".p" - 3 * sizeof(int)) {
|
||||
+ fprintf(stderr, "%s: name too long\n", argv[i]);
|
||||
+ errors = 1;
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
strcpy(name, argv[i]);
|
||||
if ((fp = fopen(name, "rb")) == NULL) {
|
||||
/* retry with .gif appended */
|
||||
@ -1,43 +0,0 @@
|
||||
ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa
|
||||
|
||||
--- gif2png.c
|
||||
+++ gif2png.c
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h> /* for isatty() */
|
||||
+#include <zlib.h>
|
||||
|
||||
#if !defined(TRUE)
|
||||
#define FALSE 0
|
||||
@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc
|
||||
int colors_used = 0;
|
||||
byte remap[MAXCMSIZE];
|
||||
int low_prec;
|
||||
- png_struct *png_ptr = xalloc(sizeof (png_struct));
|
||||
- png_info *info_ptr = xalloc(sizeof (png_info));
|
||||
+ png_struct *png_ptr;
|
||||
+ png_info *info_ptr;
|
||||
int p;
|
||||
int gray_bitdepth;
|
||||
png_color pal_rgb[MAXCMSIZE], *pltep;
|
||||
@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc
|
||||
png_text software;
|
||||
png_text comment;
|
||||
|
||||
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||
+ if (png_ptr == NULL) {
|
||||
+ fprintf(stderr, "gif2png: fatal error, out of memory\n");
|
||||
+ fprintf(stderr, "gif2png: exiting ungracefully\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ info_ptr = png_create_info_struct(png_ptr);
|
||||
+ if (info_ptr == NULL) {
|
||||
+ fprintf(stderr, "gif2png: fatal error, out of memory\n");
|
||||
+ fprintf(stderr, "gif2png: exiting ungracefully\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
/* these volatile declarations prevent gcc warnings ("variable might be
|
||||
* clobbered by `longjmp' or `vfork'") */
|
||||
volatile int gray = TRUE;
|
||||
@ -1,41 +0,0 @@
|
||||
--- gif2png-2.5.5/gif2png.c.orig
|
||||
+++ gif2png-2.5.5/gif2png.c
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <unistd.h> /* for isatty() */
|
||||
#include <sys/stat.h>
|
||||
#include <utime.h>
|
||||
+#include <zlib.h>
|
||||
|
||||
#if !defined(TRUE)
|
||||
#define FALSE 0
|
||||
@@ -122,8 +123,8 @@
|
||||
int colors_used = 0;
|
||||
byte remap[MAXCMSIZE];
|
||||
int low_prec;
|
||||
- png_struct *png_ptr = xalloc(sizeof (png_struct));
|
||||
- png_info *info_ptr = xalloc(sizeof (png_info));
|
||||
+ png_struct *png_ptr;
|
||||
+ png_info *info_ptr;
|
||||
int p;
|
||||
int gray_bitdepth;
|
||||
png_color pal_rgb[MAXCMSIZE], *pltep;
|
||||
@@ -138,6 +139,19 @@
|
||||
png_text software;
|
||||
png_text comment;
|
||||
|
||||
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||
+ if (png_ptr == NULL) {
|
||||
+ fprintf(stderr, "gif2png: fatal error, out of memory\n");
|
||||
+ fprintf(stderr, "gif2png: exiting ungracefully\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ info_ptr = png_create_info_struct(png_ptr);
|
||||
+ if (info_ptr == NULL) {
|
||||
+ fprintf(stderr, "gif2png: fatal error, out of memory\n");
|
||||
+ fprintf(stderr, "gif2png: exiting ungracefully\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
/* these volatile declarations prevent gcc warnings ("variable might be
|
||||
* clobbered by `longjmp' or `vfork'") */
|
||||
volatile int gray = TRUE;
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.4.ebuild,v 1.5 2011/10/23 16:15:03 armin76 Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Converts images from gif format to png format"
|
||||
HOMEPAGE="http://catb.org/~esr/gif2png/"
|
||||
SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=media-libs/libpng-1.4
|
||||
sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README )
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-2.5.1-overflow.patch \
|
||||
"${FILESDIR}"/${P}-libpng15.patch
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.5.ebuild,v 1.1 2012/02/03 07:32:21 radhermit Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Converts images from gif format to png format"
|
||||
HOMEPAGE="http://catb.org/~esr/gif2png/"
|
||||
SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=media-libs/libpng-1.4
|
||||
sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README )
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-2.5.1-overflow.patch \
|
||||
"${FILESDIR}"/${P}-libpng15.patch
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-gfx/gif2png/gif2png-2.5.6.ebuild,v 1.1 2012/03/08 12:36:02 ssuominen Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Converts images from gif format to png format"
|
||||
HOMEPAGE="http://catb.org/~esr/gif2png/"
|
||||
SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=media-libs/libpng-1.2:0
|
||||
sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS="AUTHORS NEWS README"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-2.5.1-overflow.patch
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
DIST freetype-1.4_pre20080316.tar.bz2 1199805 RMD160 5fb5b0737de968602008991c80dac827ea6fdca0 SHA1 73d4289f509213361b040dc9b649e27f810b133a SHA256 b88e8827dfeebcd0c663cac19c798acbd2f1129eaf89172eb26c3594700316a2
|
||||
DIST freetype-2.4.7.tar.bz2 1490543 RMD160 48abfcd4546cbd6626796ab121252e804ddcc6d8 SHA1 e1b2356ebbc6d39d813797572b1e5d8a2635e969 SHA256 ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77
|
||||
DIST freetype-2.4.8.tar.bz2 1492568 RMD160 ae0e68a8a84a201ed133e964ee56c0cc0de84521 SHA1 1634cef894460ab98dd37eadfcdd055ffda9a27c SHA256 a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71
|
||||
DIST freetype-doc-2.4.7.tar.bz2 106740 RMD160 22de3be42148b4d35dc4452859abaa13ec14eae2 SHA1 6e177eef7636c10ec01e895f1a4ddb3ce5caf276 SHA256 61eebfcdf7d8864d97025184ada8b7d022f9fecfa26d6d163df34fc3829c7e2b
|
||||
DIST freetype-2.4.9.tar.bz2 1504819 RMD160 a420df999f2c73ddd44641462281ae86845472bb SHA1 5cb80ab9d369c4e81a2221bcf45adcea2c996b9b SHA256 c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9
|
||||
DIST freetype-doc-2.4.8.tar.bz2 106657 RMD160 224a3d05712c1f21a583f29d811425af11c89dce SHA1 20669faa8d9bab5402ecf15e727e61461659b3dc SHA256 540e4d824534afe0145fd99ed1ca0ead49f7de77c14336146ee06cb106ff0014
|
||||
DIST ft2demos-2.4.7.tar.bz2 163200 RMD160 b0e7abc8efefcb550e56154a9fc6b5d888ed8c2e SHA1 7bc6b6ada3fa7fbf68f92a952392e8ad88776c9e SHA256 694694203072349cccfa8807e6fe024256051a43faa9946edba85f59092e440d
|
||||
DIST freetype-doc-2.4.9.tar.bz2 106690 RMD160 df6cdc55cc822770a1690c989a147c382223a190 SHA1 6d6775172b203e05298433d53dc75581269d129e SHA256 138ec5c5081c2c0d1d4624e83bf3797a27271fdb5218deff6599f2d23b66438a
|
||||
DIST ft2demos-2.4.8.tar.bz2 163264 RMD160 005851bc56cae29ce36634a1bee29fb542b8929c SHA1 c81789301a15c30e2c12560d74d69a4c00d19bac SHA256 071bfbf1bca26ec8d62068026a0e3d17284f6d9b640435f99d149190f0198bc7
|
||||
DIST ft2demos-2.4.9.tar.bz2 163748 RMD160 10b0477d8b2c99ae49e5a284d09f8d9fd4c7b39b SHA1 01163feb104bad54b215f4560e5ee39d074b18cf SHA256 7a67ac6dff11078464c5b9dc68fa2f62c8f05067e0fd15645f5cb7efb05413f9
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
--- libXcm-0.5.0/configure.ac
|
||||
+++ libXcm-0.5.0/configure.ac
|
||||
@@ -37,6 +37,14 @@
|
||||
|
||||
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
|
||||
|
||||
+AC_MSG_CHECKING([wether to enable x11 support])
|
||||
+AC_ARG_WITH(x11,
|
||||
+ [ --with-x11 enable x11 support],
|
||||
+ with_x11=$withval,
|
||||
+ with_x11=yes)
|
||||
+AC_MSG_RESULT($with_x11)
|
||||
+
|
||||
+if test "$with_x11" = "yes"; then
|
||||
PKG_CHECK_EXISTS([x11], [
|
||||
PKG_CHECK_MODULES([libX11], [x11])
|
||||
PKG_CHECK_MODULES([libXfixes], [xfixes])
|
||||
@@ -50,6 +58,12 @@
|
||||
AM_CONDITIONAL([HAVE_X11], [false])
|
||||
HAVE_X11=
|
||||
])
|
||||
+else
|
||||
+ AC_MSG_CHECKING([for libX11])
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ AM_CONDITIONAL([HAVE_X11], [false])
|
||||
+ HAVE_X11=
|
||||
+fi
|
||||
|
||||
AC_PATH_PROGS(RPMBUILD, rpm, :)
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/libXcm/libXcm-0.5.0-r1.ebuild,v 1.1 2012/03/10 03:31:27 xmw Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools eutils
|
||||
|
||||
DESCRIPTION="reference implementation of the net-color spec"
|
||||
HOMEPAGE="http://www.oyranos.org/libxcm/"
|
||||
SRC_URI="mirror://sourceforge/oyranos/${PN}/${PN}-0.4.x/${P}.tar.bz2"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="X doc static-libs"
|
||||
|
||||
RDEPEND="X? ( x11-libs/libXmu
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libX11
|
||||
x11-proto/xproto )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-doc/doxygen"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-buildsystem.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --disable-silent-rules \
|
||||
$(use_with X x11)
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
use doc && dohtml doc/html/*
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST oyranos-0.3.2.tar.bz2 1247164 RMD160 1943af1a79ff3d41b5cd482e3e9ea6e573ef3122 SHA1 a216254b8d0cd2563d3781fea57169d5b70a71e8 SHA256 db8d104c8dc1fd24129a20ddea40ca4b4bf30adc4985e0a8f90bde28229c0e54
|
||||
DIST oyranos-0.4.0.tar.bz2 1265839 RMD160 8e01746a7d4a330fec9133306a1bf93bcb7596dd SHA1 4841e1271a24071600494fc0c1281c65b007de76 SHA256 6fcff9d5f8dc1aaeef55e238a30c65df390a9206ed76cf473f7f0ae348c23ed9
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
--- oyranos-0.4.0/configure
|
||||
+++ oyranos-0.4.0/configure
|
||||
@@ -30,7 +30,7 @@
|
||||
PKGC=$TARGET.pc
|
||||
VERS_H="$TARGET"_version.h
|
||||
zeile="$0 $@"
|
||||
-MAKEFILE_DIR=". fl_i18n libXNVCtrl yajl"; export MAKEFILE_DIR
|
||||
+MAKEFILE_DIR=". fl_i18n libXNVCtrl"; export MAKEFILE_DIR
|
||||
|
||||
if [ `uname` = "Linux" ]; then
|
||||
v=-v
|
||||
@@ -68,7 +68,7 @@
|
||||
OY_DEVEL_MONTH=03
|
||||
OYRANOS_DEVEL_MONTH=3 # numeric
|
||||
OY_DEVEL_YEAR=2012
|
||||
-OY_GIT_MASTER="`cat $ROOT_DIR/.git/refs/heads/master`"
|
||||
+OY_GIT_MASTER=""
|
||||
time="`date +%y%m%d.%H%M%S`"
|
||||
DATE="$OY_START_MONTH $OY_START_YEAR - $OY_DEVEL_MONTH $OY_DEVEL_YEAR"
|
||||
VERSION=$VERSION_A.$VERSION_B.$VERSION_C
|
||||
@@ -120,7 +120,7 @@
|
||||
fi
|
||||
IFS=$old_IFS
|
||||
|
||||
-STRIPOPT="sed s/-O.//"
|
||||
+STRIPOPT="cat"
|
||||
|
||||
if [ $# -gt 0 ]; then
|
||||
prefix=""
|
||||
--- oyranos-0.4.0/configure_tests.sh
|
||||
+++ oyranos-0.4.0/configure_tests.sh
|
||||
@@ -3,7 +3,7 @@
|
||||
set > testset.txt
|
||||
ERROR=0
|
||||
WARNING=0
|
||||
-STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//'
|
||||
+STRIPOPT='s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//'
|
||||
|
||||
mkdir -p tests
|
||||
|
||||
--- oyranos-0.4.0/oforms/oyranos_xforms.makefile
|
||||
+++ oyranos-0.4.0/oforms/oyranos_xforms.makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
INCL = $(INCLUDE) -I../ -I./ $(DEBUG)
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
+CXX ?= c++
|
||||
DEBUG = -Wall -g -O0
|
||||
LDFLAGS_ = $$LDFLAGS -L../fl_i18n
|
||||
OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags)
|
||||
FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags | sed s/-O2//) -lpthread
|
||||
@@ -16,15 +17,15 @@
|
||||
|
||||
oyranos-xforms: $(SRCDIR)oyranos_xforms.c
|
||||
echo "Compiling $(SRCDIR)$< + Linking $@ ..."
|
||||
- gcc -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)
|
||||
+ $(CC) -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)
|
||||
|
||||
oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c
|
||||
echo "Compiling $(SRCDIR)$< + Linking $@ ..."
|
||||
- gcc -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)
|
||||
+ $(CC) -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)
|
||||
|
||||
oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h
|
||||
echo "Compiling $(SRCDIR)$< + Linking $@ ..."
|
||||
- -c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)
|
||||
+ $(CXX) $(LDFLAGS) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS_)
|
||||
|
||||
|
||||
# Build commands and filename extensions...
|
||||
@ -0,0 +1,81 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.4.0.ebuild,v 1.1 2012/03/09 19:26:45 xmw Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="colour management system allowing to share various settings across applications and services"
|
||||
HOMEPAGE="http://www.oyranos.org/"
|
||||
SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="X doc static-libs test xinerama"
|
||||
|
||||
RDEPEND="app-admin/elektra
|
||||
dev-libs/libxml2
|
||||
dev-libs/yajl
|
||||
media-gfx/exiv2
|
||||
media-libs/lcms:0
|
||||
media-libs/libpng:0
|
||||
media-libs/libraw
|
||||
>=media-libs/libXcm-0.5.0
|
||||
X? ( x11-libs/fltk:1
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXxf86vm
|
||||
xinerama? ( x11-libs/libXinerama ) )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-doc/doxygen
|
||||
test? ( media-libs/icc-profiles-basiccolor-printing2009
|
||||
media-libs/icc-profiles-openicc )"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_prepare() {
|
||||
einfo remove bundled elektra yajl
|
||||
rm -rf elektra* yajl || die
|
||||
#keep bundled libXNVCtrl
|
||||
|
||||
epatch "${FILESDIR}"/${P}-buildsystem.patch \
|
||||
"${FILESDIR}"/${PN}-0.3.2-test.patch
|
||||
|
||||
if ! use X ; then
|
||||
sed -e '/FLTK_GUI =/s:=.*:=:' \
|
||||
-i makefile.in || die
|
||||
fi
|
||||
|
||||
sed -e '/#include/s:alpha/oyranos_alpha.h:oyranos_alpha.h:' \
|
||||
-i examples/libraw/oyranos_file.cpp || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC CXX
|
||||
econf --prefix=/usr \
|
||||
--enable-verbose \
|
||||
$(use_with X x) \
|
||||
$(use_enable X libX11) \
|
||||
$(use_enable X libXext) \
|
||||
$(use_enable X libXrandr) \
|
||||
$(use_enable X libXxf86vm) \
|
||||
$(use_enable X fltk) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable xinerama libXinerama)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake all
|
||||
use X && emake oforms
|
||||
emake docu
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" docdir=${EPREFIX}/usr/share/doc/${P} install-main
|
||||
|
||||
if ! use doc ; then
|
||||
rm -rf "${ED}/usr/share/doc/${P}/html" || die
|
||||
fi
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST mpg321-0.2.12-1.tar.gz 156487 RMD160 a6fad99b5b4a2f39b7ce2d938ce1bcbecd765513 SHA1 00b9053f9c373b042bf14040d8f351bd3336773b SHA256 635c7c125b7e888729a70b94f3c43db532c06527b54fb9ebe4f13819d49179cd
|
||||
DIST mpg321-0.3.0.tar.gz 150454 RMD160 40f513b1d879e6cb9fca3e0753021f30faee3985 SHA1 fff3118ae7fdd0dc76114fdf47a9e540c81cbcc8 SHA256 6954c488317736f79f529f9a6e2263f67a464b2da694a5c798667be284b3a6a7
|
||||
DIST mpg321-0.3.1.tar.gz 151104 RMD160 516b5a1986cbe927a1077a4a30f510a935537271 SHA1 e5bedf63cec1c5d285d27aa55c8e720a9ed19a1f SHA256 0b9c23d75a89236ade9830e0319d7e799efea9f6af262d6defda962037d65579
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.12-r1.ebuild,v 1.2 2011/08/31 20:33:54 mattst88 Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools eutils
|
||||
|
||||
MY_P=${P}-1
|
||||
|
||||
DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
|
||||
HOMEPAGE="http://mpg321.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="alsa ipv6"
|
||||
|
||||
RDEPEND="sys-libs/zlib
|
||||
media-libs/libmad
|
||||
media-libs/libid3tag
|
||||
media-libs/libao[alsa?]"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-check-for-lround.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-dependency-tracking \
|
||||
--disable-mpg123-symlink \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
newdoc debian/changelog ChangeLog.debian
|
||||
dodoc AUTHORS BUGS HACKING NEWS README{,.remote} THANKS TODO
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
>=dev-libs/glib-2.18:2 x11-libs/gtk+:2 >=gnome-base/gconf-2.12:2 gnome-base/librsvg:2 sys-apps/dbus app-text/iso-codes x11-libs/libX11 >=dev-lang/python-2.5 >=dev-python/pygobject-2.14:2 dev-python/notify-python nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-perl/XML-Parser dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230
|
||||
>=dev-libs/glib-2.18:2 x11-libs/gtk+:2 >=gnome-base/gconf-2.12:2 gnome-base/librsvg:2 sys-apps/dbus app-text/iso-codes x11-libs/libX11 >=dev-lang/python-2.5 >=dev-python/pygobject-2.14:2 dev-python/notify-python nls? ( virtual/libintl ) dev-python/pygtk >=dev-python/dbus-python-0.83 dev-python/pyxdg >=app-admin/eselect-python-20091230
|
||||
0
|
||||
http://ibus.googlecode.com/files/ibus-1.2.0.20100111.tar.gz
|
||||
test
|
||||
http://code.google.com/p/ibus/
|
||||
LGPL-2.1
|
||||
Intelligent Input Bus for Linux / Unix OS
|
||||
amd64 ~ppc ~ppc64 x86 ~x86-fbsd
|
||||
confutils eutils gnome2-utils multilib python toolchain-funcs user
|
||||
doc nls
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
configure install postinst postrm prepare setup
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
>=dev-libs/glib-2.18:2 gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg:2 sys-apps/dbus app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) X? ( sys-apps/dbus[X] x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-perl/XML-Parser dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
|
||||
>=dev-libs/glib-2.18:2 gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg:2 sys-apps/dbus app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) X? ( sys-apps/dbus[X] x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) python? ( dev-python/pygtk dev-python/pyxdg ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
|
||||
0
|
||||
http://ibus.googlecode.com/files/ibus-1.3.9.tar.gz
|
||||
test
|
||||
http://code.google.com/p/ibus/
|
||||
LGPL-2.1
|
||||
Intelligent Input Bus for Linux / Unix OS
|
||||
amd64 ppc ppc64 x86 ~x86-fbsd
|
||||
confutils eutils gnome2-utils multilib python toolchain-funcs user
|
||||
doc +gconf gtk introspection nls +python vala X
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
configure install postinst postrm prepare setup
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
>=dev-libs/glib-2.18:2 gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg:2 sys-apps/dbus app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( sys-apps/dbus[X] x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-perl/XML-Parser dev-util/intltool dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||
>=dev-libs/glib-2.18:2 gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg:2 sys-apps/dbus app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( sys-apps/dbus[X] x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) python? ( dev-python/pygtk dev-python/pyxdg ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
|
||||
0
|
||||
http://ibus.googlecode.com/files/ibus-1.3.9.tar.gz
|
||||
test
|
||||
http://code.google.com/p/ibus/
|
||||
LGPL-2.1
|
||||
Intelligent Input Bus for Linux / Unix OS
|
||||
~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
|
||||
autotools confutils eutils gnome2-utils libtool multilib python toolchain-funcs user
|
||||
doc +gconf gtk gtk3 introspection nls +python vala X
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
configure install postinst postrm preinst prepare setup
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
>=dev-libs/glib-2.26:2 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-perl/XML-Parser dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
|
||||
>=dev-libs/glib-2.26:2 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) python? ( dev-python/pygtk dev-python/pyxdg ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
|
||||
0
|
||||
http://ibus.googlecode.com/files/ibus-1.4.0.tar.gz
|
||||
test
|
||||
http://code.google.com/p/ibus/
|
||||
LGPL-2.1
|
||||
Intelligent Input Bus for Linux / Unix OS
|
||||
~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
|
||||
autotools confutils eutils gnome2-utils libtool multilib python toolchain-funcs user
|
||||
dconf doc +gconf gtk gtk3 introspection nls +python vala X
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
configure install postinst postrm preinst prepare setup
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
>=dev-lang/python-2.5 >=app-i18n/ibus-1.2 !>=app-i18n/ibus-1.3.99 >=app-i18n/libhangul-0.0.10 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.17 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
>=dev-lang/python-2.5 >=app-i18n/ibus-1.2 !>=app-i18n/ibus-1.3.99 >=app-i18n/libhangul-0.0.10 nls? ( virtual/libintl ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
0
|
||||
http://ibus.googlecode.com/files/ibus-hangul-1.2.0.20100102.tar.gz
|
||||
|
||||
http://code.google.com/p/ibus/
|
||||
GPL-2
|
||||
The Hangul engine for IBus input platform
|
||||
amd64 x86
|
||||
multilib python toolchain-funcs
|
||||
nls
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
compile install unpack
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
>=app-i18n/ibus-1.2.99 dev-python/pygobject dev-python/pygtk >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.17 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
>=app-i18n/ibus-1.2.99 dev-python/pygobject dev-python/pygtk >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
0
|
||||
http://ibus.googlecode.com/files/ibus-hangul-1.3.2.tar.gz
|
||||
|
||||
http://code.google.com/p/ibus/
|
||||
GPL-2
|
||||
The Hangul engine for IBus input platform
|
||||
~amd64 ~x86
|
||||
eutils multilib python toolchain-funcs user
|
||||
nls
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
configure install postinst postrm prepare setup
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 ) dev-cpp/gtest dev-util/pkgconfig >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
0
|
||||
http://mozc.googlecode.com/files/mozc-1.0.558.102.tar.bz2
|
||||
test
|
||||
http://code.google.com/p/mozc/
|
||||
BSD
|
||||
The Mozc engine for IBus Framework
|
||||
amd64 x86
|
||||
elisp-common eutils multilib python toolchain-funcs user
|
||||
emacs +ibus scim +qt4
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
compile configure install prepare setup test
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 app-i18n/zinnia ) dev-cpp/gtest dev-util/pkgconfig >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 app-i18n/zinnia ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
0
|
||||
http://mozc.googlecode.com/files/mozc-1.1.773.102.tar.bz2
|
||||
test
|
||||
http://code.google.com/p/mozc/
|
||||
BSD
|
||||
The Mozc engine for IBus Framework
|
||||
~amd64 ~x86
|
||||
elisp-common eutils multilib python toolchain-funcs user
|
||||
emacs +ibus scim +qt4
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
compile configure install prepare setup test
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 app-i18n/zinnia ) dev-cpp/gtest dev-util/pkgconfig >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 app-i18n/zinnia ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
0
|
||||
http://mozc.googlecode.com/files/mozc-1.2.855.102.tar.bz2
|
||||
test
|
||||
http://code.google.com/p/mozc/
|
||||
BSD
|
||||
The Mozc engine for IBus Framework
|
||||
~amd64 ~x86
|
||||
elisp-common eutils multilib python toolchain-funcs user
|
||||
emacs +ibus scim +qt4
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
compile configure install prepare setup test
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 app-i18n/zinnia ) dev-cpp/gtest dev-util/pkgconfig >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 app-i18n/zinnia ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
0
|
||||
http://mozc.googlecode.com/files/mozc-1.3.911.102.tar.bz2
|
||||
test
|
||||
http://code.google.com/p/mozc/
|
||||
BSD
|
||||
The Mozc engine for IBus Framework
|
||||
~amd64 ~x86
|
||||
elisp-common eutils multilib python toolchain-funcs user
|
||||
emacs +ibus scim +qt4
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
compile configure install prepare setup test
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 app-i18n/zinnia ) dev-cpp/gtest dev-util/pkgconfig >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
dev-libs/glib:2 dev-libs/protobuf net-misc/curl sys-libs/zlib emacs? ( virtual/emacs ) ibus? ( >=app-i18n/ibus-1.2 ) scim? ( app-i18n/scim ) qt4? ( x11-libs/qt-gui:4 app-i18n/zinnia ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
|
||||
0
|
||||
http://mozc.googlecode.com/files/mozc-1.3.931.102.tar.bz2
|
||||
test
|
||||
http://code.google.com/p/mozc/
|
||||
BSD
|
||||
The Mozc engine for IBus Framework
|
||||
~amd64 ~x86
|
||||
elisp-common eutils multilib python toolchain-funcs user
|
||||
emacs +ibus scim +qt4
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
compile configure install prepare setup test
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
app-i18n/ibus >=dev-lang/python-2.5 nls? ( virtual/libintl ) nls? ( >=sys-devel/gettext-0.16.1 ) >=app-admin/eselect-python-20091230
|
||||
app-i18n/ibus >=dev-lang/python-2.5 nls? ( virtual/libintl ) app-i18n/skk-jisyo >=app-admin/eselect-python-20091230
|
||||
0
|
||||
http://cloud.github.com/downloads/ueno/ibus-skk/ibus-skk-0.0.4.tar.gz
|
||||
|
||||
http://github.com/ueno/ibus-skk
|
||||
GPL-2
|
||||
Japanese input method Anthy IMEngine for IBus Framework
|
||||
amd64 x86
|
||||
multilib python toolchain-funcs
|
||||
nls
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
configure install postinst postrm prepare
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
>=app-i18n/ibus-1.3 nls? ( virtual/libintl ) nls? ( >=sys-devel/gettext-0.16.1 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
>=app-i18n/ibus-1.3 nls? ( virtual/libintl ) app-i18n/skk-jisyo >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
0
|
||||
http://cloud.github.com/downloads/ueno/ibus-skk/ibus-skk-1.3.8.tar.gz
|
||||
|
||||
http://github.com/ueno/ibus-skk
|
||||
GPL-2
|
||||
Japanese input method Anthy IMEngine for IBus Framework
|
||||
~amd64 ~x86
|
||||
multilib python toolchain-funcs
|
||||
nls
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
configure install postinst postrm prepare setup
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
>=app-i18n/ibus-1.3 app-i18n/libskk nls? ( virtual/libintl ) dev-util/intltool dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
>=app-i18n/ibus-1.3 app-i18n/libskk nls? ( virtual/libintl ) app-i18n/skk-jisyo >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
|
||||
0
|
||||
mirror://github/ueno/ibus-skk/ibus-skk-1.4.0.tar.gz
|
||||
|
||||
http://github.com/ueno/ibus-skk
|
||||
GPL-2
|
||||
Japanese input method Anthy IMEngine for IBus Framework
|
||||
~amd64 ~x86
|
||||
multilib python toolchain-funcs
|
||||
nls
|
||||
|
||||
|
||||
|
||||
4
|
||||
|
||||
configure postinst postrm prepare setup
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
>=app-i18n/ibus-1.2 !>=app-i18n/ibus-1.3.99 gnome-base/gconf:2 >=x11-libs/gtk+-2.12:2 x11-libs/libX11 dev-util/pkgconfig
|
||||
>=app-i18n/ibus-1.2 !>=app-i18n/ibus-1.3.99 gnome-base/gconf:2 >=x11-libs/gtk+-2.12:2 x11-libs/libX11
|
||||
0
|
||||
http://ibus-unikey.googlecode.com/files/ibus-unikey-0.5.tar.gz
|
||||
|
||||
http://code.google.com/p/ibus-unikey/
|
||||
GPL-3
|
||||
Vietnamese Input Method Engine for IBUS using Unikey IME
|
||||
~amd64 ~x86
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
2
|
||||
|
||||
install
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
>=app-i18n/ibus-1.2 !>=app-i18n/ibus-1.3.99 gnome-base/gconf:2 >=x11-libs/gtk+-2.12:2 x11-libs/libX11 dev-util/pkgconfig
|
||||
>=app-i18n/ibus-1.2 !>=app-i18n/ibus-1.3.99 gnome-base/gconf:2 >=x11-libs/gtk+-2.12:2 x11-libs/libX11
|
||||
0
|
||||
http://ibus-unikey.googlecode.com/files/ibus-unikey-0.5.1.tar.gz
|
||||
|
||||
http://code.google.com/p/ibus-unikey/
|
||||
GPL-3
|
||||
Vietnamese Input Method Engine for IBUS using Unikey IME
|
||||
~amd64 ~x86
|
||||
eutils multilib toolchain-funcs user
|
||||
|
||||
|
||||
|
||||
|
||||
3
|
||||
|
||||
install
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue