diff options
| -rw-r--r-- | app-i18n/xsim/ChangeLog | 8 | ||||
| -rw-r--r-- | app-i18n/xsim/Manifest | 19 | ||||
| -rw-r--r-- | app-i18n/xsim/files/digest-xsim-0.3.9.4-r4 | 3 | ||||
| -rw-r--r-- | app-i18n/xsim/files/xsim-0.3.9.4-64bit.patch | 57 | ||||
| -rw-r--r-- | app-i18n/xsim/xsim-0.3.9.4-r4.ebuild | 80 |
5 files changed, 162 insertions, 5 deletions
diff --git a/app-i18n/xsim/ChangeLog b/app-i18n/xsim/ChangeLog index f664ae88a34d..58600daced44 100644 --- a/app-i18n/xsim/ChangeLog +++ b/app-i18n/xsim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-i18n/xsim # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.14 2007/02/21 22:16:03 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.15 2007/08/20 16:13:18 matsuu Exp $ + +*xsim-0.3.9.4-r4 (20 Aug 2007) + + 20 Aug 2007; MATSUU Takuto <matsuu@gentoo.org> + +files/xsim-0.3.9.4-64bit.patch, +xsim-0.3.9.4-r4.ebuild: + Fixed compile issue, bug #108680 and #189555. 21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/app-i18n/xsim/Manifest b/app-i18n/xsim/Manifest index 8e9d89d9e162..e100f2a87bd8 100644 --- a/app-i18n/xsim/Manifest +++ b/app-i18n/xsim/Manifest @@ -1,3 +1,7 @@ +AUX xsim-0.3.9.4-64bit.patch 2225 RMD160 76620b539fe62d6f47a174da1a7e4be3858df2b4 SHA1 3029a8c015a0298f67316362785cc69a85a450a8 SHA256 29d45cb320876ed4e5b832766fcaf26078a98eefefe357f675f3c274cc5e579f +MD5 ccade3693907ec94983c81b216cbcf20 files/xsim-0.3.9.4-64bit.patch 2225 +RMD160 76620b539fe62d6f47a174da1a7e4be3858df2b4 files/xsim-0.3.9.4-64bit.patch 2225 +SHA256 29d45cb320876ed4e5b832766fcaf26078a98eefefe357f675f3c274cc5e579f files/xsim-0.3.9.4-64bit.patch 2225 AUX xsim-0.3.9.4-compile-fix.patch 2563 RMD160 bec78901452d40846fa003dd838772d151793615 SHA1 2ffded31f006f6e9970da310baf45a927fefaca4 SHA256 01849d3dc7d685e14a20d3d0228550e1b680b5cdb829e30bccd1c1beb7b67f03 MD5 f2699816a48c16ad587b27e48ccf4d8a files/xsim-0.3.9.4-compile-fix.patch 2563 RMD160 bec78901452d40846fa003dd838772d151793615 files/xsim-0.3.9.4-compile-fix.patch 2563 @@ -19,10 +23,14 @@ EBUILD xsim-0.3.9.4-r3.ebuild 1813 RMD160 8bfbfd1dcfd72323642262fc9f07c81dffcec2 MD5 c8548eed2a04a7e9eb9d44a114916058 xsim-0.3.9.4-r3.ebuild 1813 RMD160 8bfbfd1dcfd72323642262fc9f07c81dffcec269 xsim-0.3.9.4-r3.ebuild 1813 SHA256 d7fa5802addd1e034b9b6c90d94e4cebb9d4672075807c29fd5eb68a8c148187 xsim-0.3.9.4-r3.ebuild 1813 -MISC ChangeLog 1725 RMD160 814d7a14f4d4a7504c03fdf11ed05e217a341a1c SHA1 3a948854e492fd3306481768e562943c921f7c11 SHA256 a648417912f6bbb4271bf81e27c69f9a9dd694c0194b120abe53a88d916b33e2 -MD5 546a4b10f441fae3271c97fe62affc18 ChangeLog 1725 -RMD160 814d7a14f4d4a7504c03fdf11ed05e217a341a1c ChangeLog 1725 -SHA256 a648417912f6bbb4271bf81e27c69f9a9dd694c0194b120abe53a88d916b33e2 ChangeLog 1725 +EBUILD xsim-0.3.9.4-r4.ebuild 2115 RMD160 f0c3bf3786d45e8567ebba7b5f85c7f6be9f1061 SHA1 772abdf1b695f4eeef8c481fb3eb32b18746212f SHA256 8c464646b561ea35a0c8611e576400fd524dc62420481cb444f0f9b3790caf5d +MD5 0527079fad4737f8303e1698701393c5 xsim-0.3.9.4-r4.ebuild 2115 +RMD160 f0c3bf3786d45e8567ebba7b5f85c7f6be9f1061 xsim-0.3.9.4-r4.ebuild 2115 +SHA256 8c464646b561ea35a0c8611e576400fd524dc62420481cb444f0f9b3790caf5d xsim-0.3.9.4-r4.ebuild 2115 +MISC ChangeLog 1916 RMD160 9ba22b035d29c099d373340916ff7a41bc53e3a6 SHA1 8c55f9b851be69c5f766ccfb53a6e8e3f969527a SHA256 31e933d49ffbb7943a07dafeb69c6c245fa1caf197c3661fbc7910659600e6f4 +MD5 ef065ef4cdcd1eb515b6c614bf62a2b1 ChangeLog 1916 +RMD160 9ba22b035d29c099d373340916ff7a41bc53e3a6 ChangeLog 1916 +SHA256 31e933d49ffbb7943a07dafeb69c6c245fa1caf197c3661fbc7910659600e6f4 ChangeLog 1916 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156 @@ -33,3 +41,6 @@ SHA256 45e6f190254f1745d51387c37f29d4e52e7cab612ef936461abf710277de031c files/di MD5 60c589683e6e7428a88a908d30a2cd90 files/digest-xsim-0.3.9.4-r3 241 RMD160 92744e53352bea0b88c89a6ae715c303dc32a70b files/digest-xsim-0.3.9.4-r3 241 SHA256 45e6f190254f1745d51387c37f29d4e52e7cab612ef936461abf710277de031c files/digest-xsim-0.3.9.4-r3 241 +MD5 60c589683e6e7428a88a908d30a2cd90 files/digest-xsim-0.3.9.4-r4 241 +RMD160 92744e53352bea0b88c89a6ae715c303dc32a70b files/digest-xsim-0.3.9.4-r4 241 +SHA256 45e6f190254f1745d51387c37f29d4e52e7cab612ef936461abf710277de031c files/digest-xsim-0.3.9.4-r4 241 diff --git a/app-i18n/xsim/files/digest-xsim-0.3.9.4-r4 b/app-i18n/xsim/files/digest-xsim-0.3.9.4-r4 new file mode 100644 index 000000000000..9142ac631814 --- /dev/null +++ b/app-i18n/xsim/files/digest-xsim-0.3.9.4-r4 @@ -0,0 +1,3 @@ +MD5 645d68ee8c565c04782068c4546504d9 xsim-0.3.9.4.tar.gz 1025640 +RMD160 9b5d0106448a3311047d3fe4a8fad0852ca2dca0 xsim-0.3.9.4.tar.gz 1025640 +SHA256 048f23527543b21c4d52dc98967ec7253c34eb704056767364c6dc5007971b2c xsim-0.3.9.4.tar.gz 1025640 diff --git a/app-i18n/xsim/files/xsim-0.3.9.4-64bit.patch b/app-i18n/xsim/files/xsim-0.3.9.4-64bit.patch new file mode 100644 index 000000000000..3b6f0f5d06a5 --- /dev/null +++ b/app-i18n/xsim/files/xsim-0.3.9.4-64bit.patch @@ -0,0 +1,57 @@ +diff -Naur xsim-0.3.9.4.orig/plugins/IMs/jianpin/simpleimc.h xsim-0.3.9.4/plugins/IMs/jianpin/simpleimc.h +--- xsim-0.3.9.4.orig/plugins/IMs/jianpin/simpleimc.h 2002-10-22 18:01:04.000000000 +0900 ++++ xsim-0.3.9.4/plugins/IMs/jianpin/simpleimc.h 2007-08-20 23:15:06.000000000 +0900 +@@ -45,7 +45,7 @@ + uint16_t access_count; + wchar_t w[MAX_WORD_LEN + 1]; + +- size_t ac_size() { return (uint32_t) w - (uint32_t)&access_count; } ++ size_t ac_size() { return (size_t) w - (size_t)&access_count; } + size_t size(){ return ac_size() + wcslen(w) * sizeof(wchar_t); } + void copy(struct Word_Rec_tag * val) { memcpy(this, val, sizeof(Word_Rec_tag));} + }Word_Rec; +diff -Naur xsim-0.3.9.4.orig/plugins/IMs/table/tableimc.h xsim-0.3.9.4/plugins/IMs/table/tableimc.h +--- xsim-0.3.9.4.orig/plugins/IMs/table/tableimc.h 2002-09-13 20:34:03.000000000 +0900 ++++ xsim-0.3.9.4/plugins/IMs/table/tableimc.h 2007-08-20 23:15:47.000000000 +0900 +@@ -23,7 +23,7 @@ + uint8_t sort_index; + wchar_t w[MAX_WORD_LEN + 1]; + +- size_t si_size() { return (uint32_t) w - (uint32_t)&sort_index; } ++ size_t si_size() { return (size_t) w - (size_t)&sort_index; } + size_t size(){ return si_size() + (wcslen(w) + 1) * sizeof(wchar_t); } + void copy(struct Word_Rec_tag * val) { memcpy(this, val, sizeof(Word_Rec_tag));} + }Word_Rec; +diff -Naur xsim-0.3.9.4.orig/xsim/ic.cpp xsim-0.3.9.4/xsim/ic.cpp +--- xsim-0.3.9.4.orig/xsim/ic.cpp 2002-10-01 14:41:23.000000000 +0900 ++++ xsim-0.3.9.4/xsim/ic.cpp 2007-08-20 23:16:11.000000000 +0900 +@@ -101,7 +101,7 @@ + on_stat = 0; + } + +-int TIC::alive() ++long TIC::alive() + { +- return (int)im; ++ return (long)im; + } +diff -Naur xsim-0.3.9.4.orig/xsim/ic.h xsim-0.3.9.4/xsim/ic.h +--- xsim-0.3.9.4.orig/xsim/ic.h 2002-07-15 00:14:24.000000000 +0900 ++++ xsim-0.3.9.4/xsim/ic.h 2007-08-20 23:16:52.000000000 +0900 +@@ -76,14 +76,14 @@ + void set_im(TIM * val); + + TIMC * get_imc(); +- int has_imc() { return (int)imc; } ++ long has_imc() { return (long)imc; } + + void init(int init_mode, TIM * val); + + static TIC * get_focus_ic() { return focused_ic; } + IC * get_IC() { return &ic_; }; + +- int alive(); ++ long alive(); + Window get_client_win() { return ic_.client_win; } + + int has_focus() { return (focused_ic == this); } diff --git a/app-i18n/xsim/xsim-0.3.9.4-r4.ebuild b/app-i18n/xsim/xsim-0.3.9.4-r4.ebuild new file mode 100644 index 000000000000..823664a50b18 --- /dev/null +++ b/app-i18n/xsim/xsim-0.3.9.4-r4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r4.ebuild,v 1.1 2007/08/20 16:13:18 matsuu Exp $ + +inherit db-use eutils flag-o-matic kde-functions multilib + +DESCRIPTION="A simple and fast GB and BIG5 Chinese XIM server" +HOMEPAGE="http://developer.berlios.de/projects/xsim/" +SRC_URI="http://download.berlios.de/xsim/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug kde" + +DEPEND=">=sys-libs/db-4.1 + >=sys-apps/sed-4 + kde? ( >=kde-base/kdelibs-3 )" + +src_unpack() { + local dbver + + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-compile-fix.patch + epatch "${FILESDIR}"/${P}-gcc-3.4.patch + epatch "${FILESDIR}"/${P}-64bit.patch + + append-flags -DPIC -fPIC -fno-strict-aliasing + + dbver="$(db_findver sys-libs/db)" + sed -i -e "s/\(CFLAGS.*\)-O2/\1${CFLAGS}/" \ + -e "s/libdb_cxx.so/libdb_cxx-${dbver}.so/" \ + -e "s/bdblib=\"db_cxx\"/bdblib=\"db_cxx-${dbver}\"/" configure* || die + + find . -name '*.in' | xargs sed -i \ + -e "s#\(@prefix@/\)\(dat\|plugins\)#\1$(get_libdir)/xsim/\2#" \ + -e "s#@prefix@/etc#/etc#" || die +} + +src_compile() { + local myconf + + if use kde; then + set-qtdir 3 + set-kdedir 3 + myconf="${myconf} + --with-kde3=${KDEDIR} \ + --with-qt3=${QTDIR} \ + --enable-status-kde3" + fi + + myconf="${myconf} --with-bdb-includes=$(db_includedir)" + + use debug && myconf="${myconf} --enable-debug" + + econf ${myconf} || die "configure failed" + emake || die "make failed" +} + +src_install() { + emake \ + xsim_datp="${D}"/usr/$(get_libdir)/xsim/dat \ + xsim_libp="${D}"usr/$(get_libdir)/xsim/plugins \ + xsim_binp="${D}"/usr/bin \ + xsim_etcp="${D}"/etc \ + install-data install || die "install failed" + + dodoc ChangeLog KNOWNBUG README* TODO +} + +pkg_postinst() { + elog "XSIM needs write access to /usr/$(get_libdir)/xsim/dat/chardb, so if you" + elog "not running it as root, you need to do the following:" + elog + elog " cp -r /usr/$(get_libdir)/xsim/dat \${HOME}/.xsim" + elog " sed -i \"s#DICT_LOCAL.*#DICT_LOCAL \${HOME}/.xsim#\" > \${HOME}/.xsim/xsimrc" + echo +} |