summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-10-01 19:54:20 +0000
committerPeter Volkov <pva@gentoo.org>2011-10-01 19:54:20 +0000
commit5055a34746149ccdf03d90810294a68109f08be6 (patch)
treedebbdcf2e5166a84c8d47ada755c7cb8e48fe60b /app-text
parentDrop roundcube and dependencies - they are in tree. Clean out redmine. (diff)
downloadpva-5055a34746149ccdf03d90810294a68109f08be6.tar.gz
pva-5055a34746149ccdf03d90810294a68109f08be6.tar.bz2
pva-5055a34746149ccdf03d90810294a68109f08be6.zip
Clean out old ebuilds that are mostly in tree.
svn path=/; revision=506
Diffstat (limited to 'app-text')
-rw-r--r--app-text/stardict/ChangeLog217
-rw-r--r--app-text/stardict/Manifest14
-rw-r--r--app-text/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch20
-rw-r--r--app-text/stardict/files/stardict-2.4.8-floatwin-disappear.patch13
-rw-r--r--app-text/stardict/files/stardict-3.0.1-changelog-minor-typo-fixes.patch63
-rw-r--r--app-text/stardict/files/stardict-3.0.1-configure.in-EST.diff11
-rw-r--r--app-text/stardict/files/stardict-3.0.1-gcc43.patch406
-rw-r--r--app-text/stardict/files/stardict-3.0.1-gconf-m4.diff43
-rw-r--r--app-text/stardict/files/stardict-3.0.1-gucharmap.patch44
-rw-r--r--app-text/stardict/files/stardict-3.0.1-optional-esd.patch125
-rw-r--r--app-text/stardict/files/stardict-3.0.1-transparent_trayicon.patch168
-rw-r--r--app-text/stardict/metadata.xml11
-rw-r--r--app-text/stardict/stardict-3.0.1-r2.ebuild106
13 files changed, 0 insertions, 1241 deletions
diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
deleted file mode 100644
index 17d6b43..0000000
--- a/app-text/stardict/ChangeLog
+++ /dev/null
@@ -1,217 +0,0 @@
-# ChangeLog for app-dicts/stardict
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.45 2008/04/29 08:24:24 pva Exp $
-
- 29 Apr 2008; Peter Volkov <pva@gentoo.org> stardict-3.0.1-r1.ebuild:
- Changed ordering of use ... and built_with_use ... to avoid built_with_use
- checks on nonexistent packages, bug #219631, thank Martin Väth for
- report.
-
- 28 Apr 2008; Peter Volkov <pva@gentoo.org> metadata.xml:
- moved to app-dicts herd, added longdescription.
-
-*stardict-3.0.1-r1 (28 Apr 2008)
-
- 28 Apr 2008; Peter Volkov <pva@gentoo.org>
- +files/stardict-3.0.1-changelog-minor-typo-fixes.patch,
- +files/stardict-3.0.1-gcc43.patch,
- +files/stardict-3.0.1-transparent_trayicon.patch,
- -files/stardict-gentoo.patch, -files/stardict-gtk24.patch,
- -stardict-2.4.2.ebuild, -stardict-2.4.6-r1.ebuild,
- +stardict-3.0.1-r1.ebuild:
- Added qqwry USE flag to install QQWry.Dat to make QQWry plugin workable;
- added pronounce USE flag to install WyabdcRealPeopleTTS wav files; small
- cleanups, bug #217895, thank Denilson for the ideas/work. Fixed
- compilation with gcc-4.3, bug #216238, thank Martin Väth for report/fix.
- Added patch to fix transparency of tray icon (from upstream). Added patch
- to fix minor typos in ChangeLog (from debian). Removed unused
- patches/ebuilds.
-
- 14 Apr 2008; Raúl Porcel <armin76@gentoo.org> stardict-3.0.1.ebuild:
- sparc stable wrt #216707
-
- 10 Apr 2008; Markus Meier <maekke@gentoo.org> stardict-2.4.8-r1.ebuild,
- stardict-3.0.1.ebuild:
- amd64/x86 stable, bug #216707
-
- 10 Apr 2008; Markus Rothe <corsair@gentoo.org> stardict-3.0.1.ebuild:
- Stable on ppc64; bug #216707
-
- 09 Apr 2008; nixnut <nixnut@gentoo.org> stardict-2.4.8-r1.ebuild,
- stardict-3.0.1.ebuild:
- Stable on ppc wrt bug #216707
-
- 13 Mar 2008; Markus Rothe <corsair@gentoo.org> stardict-3.0.1.ebuild:
- Added ~ppc64; bug #211385
-
- 25 Feb 2008; <pva@gentoo.org> +files/stardict-3.0.1-configure.in-EST.diff,
- +files/stardict-3.0.1-gconf-m4.diff:
- Missed patches are added now, thank Alexxy for report.
-
-*stardict-3.0.1 (25 Feb 2008)
-*stardict-2.4.8-r1 (25 Feb 2008)
-
- 25 Feb 2008; <pva@gentoo.org>
- +files/stardict-2.4.8-ClipboardReceivedCallback.patch,
- +files/stardict-2.4.8-floatwin-disappear.patch, metadata.xml,
- stardict-2.4.2.ebuild, -stardict-2.4.8.ebuild, +stardict-2.4.8-r1.ebuild,
- +stardict-3.0.1.ebuild:
- Version bump, finally startdict-3.0.1 is in the tree. Thank you Zhang Le,
- jjmmma, Pro and others for work in bug #188684! Fixed compile problem and
- popup window "jumping away" problem, bug #188827 and #195882, thank Ed
- Catmur, Evgeniy Dushistov and other people for help, fix and investigations
- of these bugs.
-
- 30 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
- Removing liquidx from metadata due to his retirement (see #171155 for
- reference).
-
- 26 Mar 2007; Kevin F. Quinn <kevquinn@gentoo.org>
- -files/stardict-config.sh:
- Remove insecure legacy script from files/ - bug #159543
-
- 22 Mar 2007; MATSUU Takuto <matsuu@gentoo.org> stardict-2.4.6-r1.ebuild,
- stardict-2.4.8.ebuild:
- Fixed dependency, bug #171597
-
- 25 Jan 2007; Marius Mauch <genone@gentoo.org> stardict-2.4.2.ebuild,
- stardict-2.4.6-r1.ebuild, stardict-2.4.8.ebuild:
- Replacing einfo with elog
-
- 03 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org>
- stardict-2.4.6-r1.ebuild:
- Stable on sparc
-
- 30 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
- stardict-2.4.6-r1.ebuild:
- ppc stable
-
-*stardict-2.4.8 (27 Jul 2006)
-
- 27 Jul 2006; Alastair Tse <liquidx@gentoo.org> -stardict-2.2.1.ebuild,
- -stardict-2.4.1.ebuild, stardict-2.4.2.ebuild, -stardict-2.4.3.ebuild,
- -stardict-2.4.4.ebuild, stardict-2.4.6-r1.ebuild, +stardict-2.4.8.ebuild:
- version bump (#130608). stable bump for x86 for 2.4.6-r1.
-
- 07 May 2006; Markus Rothe <corsair@gentoo.org> stardict-2.4.6-r1.ebuild:
- Stable on ppc64; bug #108571
-
- 23 Jan 2006; Markus Rothe <corsair@gentoo.org> stardict-2.4.6-r1.ebuild:
- Added ~ppc64; bug #108571
-
-*stardict-2.4.6-r1 (20 Jan 2006)
-
- 20 Jan 2006; Harald van Dijk <truedfx@gentoo.org> -stardict-2.4.6.ebuild,
- +stardict-2.4.6-r1.ebuild:
- Upstream re-released 2.4.6.
-
-*stardict-2.4.6 (19 Jan 2006)
-
- 19 Jan 2006; Harald van Dijk <truedfx@gentoo.org> +stardict-2.4.6.ebuild:
- Version bump, making a bunch of GNOME deps optional
-
- 19 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> stardict-2.4.2.ebuild:
- Stable on sparc
-
- 02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> stardict-2.4.2.ebuild,
- stardict-2.4.3.ebuild, stardict-2.4.4.ebuild:
- Keyworded ~sparc
-
-*stardict-2.4.4 (13 Jan 2005)
-
- 13 Jan 2005; Alastair Tse <liquidx@gentoo.org> +stardict-2.4.4.ebuild:
- version bump (#73584)
-
- 22 Nov 2004; Jason Huebel,,, <jhuebel@gentoo.org> stardict-2.4.3.ebuild:
- ~amd64
-
-*stardict-2.4.3 (22 Sep 2004)
-
- 22 Sep 2004; Alastair Tse <liquidx@gentoo.org> +stardict-2.4.3.ebuild:
- version bump
-
- 19 Aug 2004; foser <foser@gentoo.org> stardict-2.2.1,2.4.1.ebuild :
- Also fix for gtk+-2.4 issues (#45791)
-
- 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> stardict-2.4.2.ebuild:
- Add inherit eutils
-
- 22 Apr 2004; <khai@gentoo.org> +files/stardict-gtk24.patch,
- stardict-2.4.2.ebuild:
- Applied patch to fix compilation against gtk+-2.4.
-
- 06 Mar 2004; Alastair Tse <liquidx@gentoo.org> stardict-2.4.2.ebuild:
- make tools executable (#43719)
-
-*stardict-2.4.2 (07 Jan 2004)
-
- 07 Jan 2004; Alastair Tse <liquidx@gentoo.org> stardict-2.4.1.ebuild,
- stardict-2.4.2.ebuild:
- version bump. 2.4.2 requires a new modified dictionary format. you'll have to
- remerge your dictionaries to the same version 2.4.2
-
-*stardict-2.4.1 (30 Oct 2003)
-
- 30 Oct 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.4.0.ebuild:
- version bump
-
-*stardict-2.4.0 (12 Sep 2003)
-
- 12 Sep 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.0.0.ebuild,
- stardict-2.2.0.ebuild, stardict-2.2.1.ebuild, stardict-2.4.0.ebuild:
- version bump
-
- 12 Sep 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.0.0.ebuild,
- stardict-2.2.0.ebuild, stardict-2.2.1.ebuild:
- removing bonobo deps and clean up
-
- 09 Jul 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.0.0.ebuild,
- stardict-2.2.0.ebuild, stardict-2.2.1.ebuild:
- add pkgconfig dep
-
-*stardict-2.2.1 (01 Jul 2003)
-
- 01 Jul 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.2.0.ebuild,
- stardict-2.2.1.ebuild:
- version bump and bumping 2.2.0 to stable
-
- 19 Jun 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.2.0.ebuild:
- digest fixes
-
-*stardict-2.2.0 (04 Jun 2003)
-
- 04 Jun 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.2.0.ebuild:
- version bump. dictionary files are now distributed seperately. you must
- install them by merging the appropriate ones named app-dicts/stardict-*
-
- 21 May 2003; Alastair Tse <liquidx@gentoo.org> stardict-1.3.ebuild,
- stardict-1.3.ebuild, stardict-2.0.0.ebuild, stardict-2.0.0_pre2.ebuild,
- stardict-2.0.0_pre2.ebuild:
- marking stardict 2.0.0 as stable and cleanups
-
-*stardict-2.0.0 (04 May 2003)
-
- 04 May 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.0.0.ebuild:
- version bump
-
-*stardict-2.0.0_pre2 (01 May 2003)
-
- 01 May 2003; Alastair Tse <liquidx@gentoo.org> stardict-2.0.0_pre2.ebuild:
- bump to gnome2 version. very neat, thanks to Lloyd Huang
- <lloyd@coventive.com> (#20151)
-
-*stardict-1.3 (08 Nov 2002)
-
- 29 Mar 2003; Alastair Tse <liquidx@gentoo.org> stardict-1.3.ebuild:
- Replacing openmotif with virtual/motif
-
- 03 Dec 2002; Seemant Kulleen <seemant@gentoo.org> * :
-
- Moved to app-dicts
-
- 08 Nov 2002; Stuart Bouyer <stubear@gentoo.org> stardict-1.3.ebuild,
- ChangeLog, files/digest-stardict-1.3, files/stardict-config.sh,
- files/stardict-gentoo.patch :
-
- Initial ebuild submitted and created by Lloyd Huang (Huang YU HSIN)
- <lloyd@coventive.com>.
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
deleted file mode 100644
index e8c4bf8..0000000
--- a/app-text/stardict/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX stardict-2.4.8-ClipboardReceivedCallback.patch 669 RMD160 051e058f3c5cb174ecb461d4ae67115eca26c5e7 SHA1 d65226bef41e19b85114869a434c635b4cdee515 SHA256 c38927160ed618728db391033397801ffd1850c0aeaa98caa4cf4441a668d459
-AUX stardict-2.4.8-floatwin-disappear.patch 591 RMD160 334bc9fce6f765c17ac38c0bbf95ed2b1ba86803 SHA1 ad7ff07266de13c958bcdad08538a2327d1fc255 SHA256 a9b6d4269bc546004fa0535b5562b733de6f502483deb9346f1a40fe4a3026f6
-AUX stardict-3.0.1-changelog-minor-typo-fixes.patch 3415 RMD160 b6938e9a0f1272863187770bf5a893d239eb0c9a SHA1 117bcf2eb2478a932b9b0535cb06012a04e50293 SHA256 36543e608207de14eafd8b943afd855fe718856ede1c3c13a8e0a0808c6ef0b0
-AUX stardict-3.0.1-configure.in-EST.diff 459 RMD160 d8d3de801eedbab337fab87d7cb1e60be2517805 SHA1 85f56191176cd16fa2c13e951ce05f7bfb708c33 SHA256 cad6dcbb615b90d4e14e7578f53efcf8c78c3f36d7ba20a66dedef3a260510c5
-AUX stardict-3.0.1-gcc43.patch 12626 RMD160 068e8af4430d0c137fe41664fcae12053aec5ef3 SHA1 cd15116ac9a74ed4847fe0149a5093e6e36fef7b SHA256 49a7db8765b3add63c7774237903b7bcc5c6df8e713d00ee14a067877a695bf3
-AUX stardict-3.0.1-gconf-m4.diff 1720 RMD160 e4fea58f8730207a2de6d64f33c563f2fb758011 SHA1 a1fff45ee0ee30fa27ac9e512c9a9b7539117d9b SHA256 dac7841720aa693fc65150beff507120346b1a6b1040a33baf26cb7485cf5939
-AUX stardict-3.0.1-gucharmap.patch 1807 RMD160 3cdbef1f529bfb5a2990baa0d7ccee20ea6f8812 SHA1 da2bc881004e22046fd6c5f0397ffd40748313b0 SHA256 cca7f2c50fbabc0a2418cf07da3413e5901b7c2f3358c3556fd300455649e82c
-AUX stardict-3.0.1-optional-esd.patch 5493 RMD160 565c3a25521c402e76d0c9579a2a2093d22732b1 SHA1 30ef355de0b8b6d1bbe95934d506e1a4650b5408 SHA256 52ddf3f27a9dc42591b5a0514332891da69c111898eb51ff13e601a92302c979
-AUX stardict-3.0.1-transparent_trayicon.patch 5712 RMD160 3ff5b688c264258d980c9168fff151d75164de65 SHA1 891f23e7be8e0b277f32414fa786874eed965344 SHA256 9171ae1aeb154d1159fe7fd2dee1ab30accd834fcdaa56f62bb66dac4fcbd741
-DIST QQWry.Dat.bz2 4114875 RMD160 646916f7ac234a95526f9e43cfca674c2b4b7bd1 SHA1 de7ff7208da0f889ec08911119948780d7ee4738 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83
-DIST stardict-3.0.1.tar.bz2 1964195 RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b76de SHA1 a0357e88105eaf7d6a4aa4803bf8617759bf0315 SHA256 504b3a7748933b9bd998cb85f37d4fa0a8575306643ffe6a9742450e66cd556f
-EBUILD stardict-3.0.1-r2.ebuild 3276 RMD160 42dd448badf0f311e912a2a48cfd75eb2c296ef2 SHA1 991fa87e78bb41026077782313e75b8b25370a78 SHA256 a77c51def4d3a2842e9b5c5ff2bcaaf53938b31ce1b0822c0f8b03fd5aa9d515
-MISC ChangeLog 7818 RMD160 0794064bbeeeb6a473ca76a97f652b922bf884f8 SHA1 34fbfedb1a02b5ad09e95fc92b0cd0de02512df1 SHA256 53ee41a1cb53dfa69bb2c04b2bdbbc6f5edba108d7a45c6b0b84403d920b91fa
-MISC metadata.xml 469 RMD160 ae947b682cc418e7a0824a05fbcbb5fbbc285dd5 SHA1 6f9ec489c6e7454e2238463141f8213923290da5 SHA256 2b4b55eda05febaff8e789535addb1c6ae76569e2988984ea7120995b96eab58
diff --git a/app-text/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch b/app-text/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch
deleted file mode 100644
index 630da35..0000000
--- a/app-text/stardict/files/stardict-2.4.8-ClipboardReceivedCallback.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- trunk/src/mainwin.h 2006/08/08 12:44:42 1
-+++ trunk/src/mainwin.h 2006/08/09 19:00:35 2
-@@ -68,8 +68,6 @@
- static void on_main_menu_about_activate(GtkMenuItem *menuitem, TopWin *oTopWin);
- static void on_main_menu_quit_activate(GtkMenuItem *menuitem, TopWin *oTopWin);
-
-- static void ClipboardReceivedCallback(GtkClipboard *clipboard, const gchar *text, gpointer data);
--
- void LoadHistory(void);
- void SaveHistory(void);
- public:
-@@ -97,7 +95,7 @@
- bool HasFocus() {
- return GTK_WIDGET_HAS_FOCUS(GTK_COMBO(WordCombo)->entry);
- }
--
-+ static void ClipboardReceivedCallback(GtkClipboard *clipboard, const gchar *text, gpointer data);
- };
-
- class ListWin
diff --git a/app-text/stardict/files/stardict-2.4.8-floatwin-disappear.patch b/app-text/stardict/files/stardict-2.4.8-floatwin-disappear.patch
deleted file mode 100644
index 44f92ee..0000000
--- a/app-text/stardict/files/stardict-2.4.8-floatwin-disappear.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: stardict-2.4.8/src/floatwin.cpp
-===================================================================
---- stardict-2.4.8.orig/src/floatwin.cpp
-+++ stardict-2.4.8/src/floatwin.cpp
-@@ -788,7 +788,7 @@ gboolean FloatWin::vButtonReleaseCallbac
-
- gboolean FloatWin::vMotionNotifyCallback (GtkWidget * widget, GdkEventMotion * event , FloatWin *oFloatWin)
- {
-- if (event->window == oFloatWin->FloatWindow->window || (event->state & GDK_BUTTON1_MASK))
-+ if (event->state & GDK_BUTTON1_MASK)
- {
- gint x,y;
- x = oFloatWin->press_window_x + (gint)(event->x_root) - oFloatWin->press_x_root;
diff --git a/app-text/stardict/files/stardict-3.0.1-changelog-minor-typo-fixes.patch b/app-text/stardict/files/stardict-3.0.1-changelog-minor-typo-fixes.patch
deleted file mode 100644
index bd7248a..0000000
--- a/app-text/stardict/files/stardict-3.0.1-changelog-minor-typo-fixes.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_changelog-minor-typo-fixes.dpatch by Anthony Fok <foka@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Minor typo fixes to upstream ChangeLog.
-
-@DPATCH@
-
---- stardict-3.0.1.orig/ChangeLog
-+++ stardict-3.0.1/ChangeLog
-@@ -12,7 +12,7 @@
-
- 2007.8.13
- StarDict-3.0.0 (RedHat) released.
--http://www.StarDict.org on-line dictionries website is out in 2006.9.25. We have developed the stardictd dictionary server for it.
-+http://www.StarDict.org on-line dictionaries website is out in 2006.9.25. We have developed the stardictd dictionary server for it.
- StarDict's total download count reached two millions in 2007.3.8.
- Network dictionaries support.
- Plugin system.
-@@ -38,14 +38,14 @@
- KingSoft PowerWord support. This added 158 dictionaries. The data is cracked by Dwing(http://free5.ys168.com/?dwing).
- Synonym support.
- Sort word list by collate function support.
--XDXF project(http://xdxf.sourceforge.net) has port its dictionaries to StarDict format, some dictionries are come from Sdictionary. This added 615 dictionries.
-+XDXF project (http://xdxf.sourceforge.net) has port its dictionaries to StarDict format, some dictionaries are come from Sdictionary. This added 615 dictionaries.
- French translation, thanks Christophe Durville <cdurpp@ifrance.com>.
- Brazilian Portuguese translation, thanks Ernesto <ernesto_mor@yahoo.com.ar>.
- Add cfdict dictionary, thanks Gilles Vigner <xiaogil@yahoo.fr>.
- Add English-Thai Lexitron Dictionary and Thai-English Lexitron Dictionary, thanks Suphanut Thanyaboon <suphanut@tcllab.org>.
- Add many Japanese dictionaries.
- Add some Chinese dictionaries, data comes from KDic.
--Add two Germany dictionries: ldaf, xindehan.
-+Add two Germany dictionaries: ldaf, xindehan.
- Add duden Germany dictionary, thanks Liu Guizhu <zhuzi813@gmail.com> for providing data file.
- Add fundset dictionary, thanks Lin Fanshun <fundset@hotmail.com> for providing data file.
- Add DrEye4in1 dictionary, thanks Lilian <fairyland@gmail.com> for providing data file.
-@@ -54,7 +54,7 @@
-
- 2006.4.18
- StarDict-2.4.7 (complete) released.
--Port to GPE(http://gpe.handhelds.org).
-+Port to GPE (http://gpe.handhelds.org).
- Full-text search.
- Acrobat plug-in in Win32, thanks Dewolf Xue <dewolf_matri_x@msn.com>.
- Evgeniy's patches for special character search and other changes.
-@@ -94,14 +94,14 @@
-
- 2005.7.20
- StarDict-2.4.5 (final) released.
--Source code optimize and many changes, thanks Evgeney <dushistov@mail.ru>.
-+Source code optimize and many changes, thanks Evgeniy <dushistov@mail.ru>.
- Dutch translation and help document translation, thanks Ruud Slaats <ruudslaats@eurotechgroup.nl>.
-
- 2004.11.28
- StarDict-2.4.4 (fine) released.
--sdcv-0.1(StarDict command line version) is out, developed by Evgeney <dushistov@mail.ru>.
-+sdcv-0.1(StarDict command line version) is out, developed by Evgeniy <dushistov@mail.ru>.
- Try to create .idx.oft file to speed up the interpretation of the .idx file. This feature is especially useful to sdcv.
--Mueller7 optimized, thanks Evgeney.
-+Mueller7 optimized, thanks Evgeniy.
- quick_eng-gre, quick_gre-eng dictionary encoding fix, thanks Christophe Combelles <ccomb@free.fr> for bug reporting.
- Add Hanzi Master dictionary, thanks Michael Robinson <robinson@netrinsics.com>.
- zh_TW help document translation and a small bug fix, thanks Roy Chan <roy.chan@debian.org.hk>.
diff --git a/app-text/stardict/files/stardict-3.0.1-configure.in-EST.diff b/app-text/stardict/files/stardict-3.0.1-configure.in-EST.diff
deleted file mode 100644
index 286da76..0000000
--- a/app-text/stardict/files/stardict-3.0.1-configure.in-EST.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig 2007-08-13 20:44:31.000000000 +0800
-+++ configure.in 2007-08-13 22:12:33.000000000 +0800
-@@ -131,7 +131,7 @@
- else
- AC_MSG_RESULT(yes)
- FESTIVAL_LIBS="-lFestival -lestools -lestbase -leststring"
-- FESTIVAL_CFLAGS="-I/usr/include/speech-tools/EST -ffriend-injection -Wno-deprecated"
-+ FESTIVAL_CFLAGS="-I/usr/include/speech-tools -ffriend-injection -Wno-deprecated"
- FESTIVAL_PLUGIN_DIR="stardict-festival-tts-plugin"
- fi
- else
diff --git a/app-text/stardict/files/stardict-3.0.1-gcc43.patch b/app-text/stardict/files/stardict-3.0.1-gcc43.patch
deleted file mode 100644
index f90642b..0000000
--- a/app-text/stardict/files/stardict-3.0.1-gcc43.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-=== modified file 'src/config_file.hpp'
---- src/config_file.hpp 2008-04-26 21:05:23 +0000
-+++ src/config_file.hpp 2008-04-26 21:05:29 +0000
-@@ -5,7 +5,7 @@
- #include <list>
- #include <string>
-
--#include "sigc++/sigc++.h"
-+#include <sigc++/sigc++.h>
-
- class config_file;
-
-
-=== modified file 'src/gconf_file.cpp'
---- src/gconf_file.cpp 2008-04-26 21:05:23 +0000
-+++ src/gconf_file.cpp 2008-04-26 21:05:29 +0000
-@@ -22,6 +22,7 @@
- # include "config.h"
- #endif
-
-+#include <memory>
- #include <glib/gi18n.h>
-
- #include "gconf_file.hpp"
-
-=== modified file 'src/inifile.cpp'
---- src/inifile.cpp 2008-04-26 21:05:23 +0000
-+++ src/inifile.cpp 2008-04-26 21:05:29 +0000
-@@ -28,6 +28,7 @@
- #include <cstdio>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
-+#include <stdlib.h>
-
- #include "utils.h"
-
-
-=== modified file 'src/lib/common.cpp'
---- src/lib/common.cpp 2008-04-26 21:05:23 +0000
-+++ src/lib/common.cpp 2008-04-26 21:05:29 +0000
-@@ -24,6 +24,8 @@
- # include "config.h"
- #endif
-
-+#include <cstring>
-+#include <stdlib.h>
- #include "common.hpp"
-
- static void parse_description(const char *p, long len, std::string &description)
-
-=== modified file 'src/lib/data.cpp'
---- src/lib/data.cpp 2008-04-26 21:05:23 +0000
-+++ src/lib/data.cpp 2008-04-26 21:05:29 +0000
-@@ -26,6 +26,7 @@
-
- #include "data.hpp"
- #include "getuint32.h"
-+#include <cstring>
-
-
- DictBase::DictBase()
-
-=== modified file 'src/lib/http_client.cpp'
---- src/lib/http_client.cpp 2008-04-26 21:05:23 +0000
-+++ src/lib/http_client.cpp 2008-04-26 21:05:29 +0000
-@@ -4,6 +4,7 @@
-
- #include "http_client.h"
- #include "sockets.hpp"
-+#include <cstring>
-
- sigc::signal<void, HttpClient *, const char *> HttpClient::on_error_;
- sigc::signal<void, HttpClient *> HttpClient::on_response_;
-
-=== modified file 'src/lib/pluginmanager.cpp'
---- src/lib/pluginmanager.cpp 2008-04-26 21:05:23 +0000
-+++ src/lib/pluginmanager.cpp 2008-04-26 21:05:29 +0000
-@@ -1,6 +1,7 @@
- #include "pluginmanager.h"
- #include "file.hpp"
- #include <string>
-+#include <cstring>
-
- StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_):
- plugin_filename(filename), module(module_), configure_func(configure_func_)
-
-=== modified file 'src/lib/stardict_client.cpp'
---- src/lib/stardict_client.cpp 2008-04-26 21:05:23 +0000
-+++ src/lib/stardict_client.cpp 2008-04-26 21:05:29 +0000
-@@ -25,6 +25,8 @@
- #include <glib.h>
- #include <glib/gi18n.h>
-
-+#include <cstring>
-+#include <stdlib.h>
- #include "sockets.hpp"
- #include "md5.h"
- #include "getuint32.h"
-
-=== modified file 'src/lib/stddict.cpp'
---- src/lib/stddict.cpp 2008-04-26 21:05:23 +0000
-+++ src/lib/stddict.cpp 2008-04-26 21:05:29 +0000
-@@ -28,6 +28,7 @@
- # include "config.h"
- #endif
-
-+#include <cstring>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
-
-
-=== modified file 'src/lib/treedict.cpp'
---- src/lib/treedict.cpp 2008-04-26 21:05:23 +0000
-+++ src/lib/treedict.cpp 2008-04-26 21:05:29 +0000
-@@ -25,6 +25,7 @@
- # include "config.h"
- #endif
-
-+#include <cstring>
- #include "file.hpp"
- #include "getuint32.h"
-
-
-=== modified file 'src/pangoview.cpp'
---- src/pangoview.cpp 2008-04-26 21:05:23 +0000
-+++ src/pangoview.cpp 2008-04-26 21:05:29 +0000
-@@ -22,6 +22,7 @@
- # include "config.h"
- #endif
-
-+#include <cstring>
- #include "gtktextviewpango.h"
- #include "utils.h"
- #include "skin.h"//for SkinCursor definition
-
-=== modified file 'src/prefsdlg.cpp'
---- src/prefsdlg.cpp 2008-04-26 21:05:23 +0000
-+++ src/prefsdlg.cpp 2008-04-26 21:07:58 +0000
-@@ -34,6 +34,7 @@
- #include "utils.h"
- #include "iskeyspressed.hpp"
- #include "lib/md5.h"
-+#include <cstdlib>
-
- #include "prefsdlg.h"
-
-
-=== modified file 'src/readword.cpp'
---- src/readword.cpp 2008-04-26 21:05:23 +0000
-+++ src/readword.cpp 2008-04-26 21:08:42 +0000
-@@ -4,6 +4,7 @@
-
- #include <cstring>
- #include <string>
-+#include <cstdlib>
-
- #include <glib/gi18n.h>
-
-
-=== modified file 'src/sigc++/signal.h'
---- src/sigc++/signal.h 2008-04-26 21:05:23 +0000
-+++ src/sigc++/signal.h 2008-04-26 21:06:11 +0000
-@@ -18,7 +18,7 @@
- //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
- //do not allow a typedef to have the same name as a class in the typedef's definition.
- //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
-- #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
-+ //#define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
- #endif
-
- namespace sigc {
-
-=== modified file 'src/utils.cpp'
---- src/utils.cpp 2008-04-26 21:05:23 +0000
-+++ src/utils.cpp 2008-04-26 21:05:29 +0000
-@@ -22,6 +22,7 @@
- # include "config.h"
- #endif
-
-+#include <cstring>
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <cstdlib>
-
-=== modified file 'src/x11_iskeyspressed.hpp'
---- src/x11_iskeyspressed.hpp 2008-04-26 21:05:23 +0000
-+++ src/x11_iskeyspressed.hpp 2008-04-26 21:05:29 +0000
-@@ -5,6 +5,8 @@
- #include <X11/keysym.h>
- #include <gtk/gtk.h>
-
-+#include <memory>
-+
- #include "iskeyspressed.hpp"
-
- typedef enum { SYM, CODE, BUTTON } KeyType_t;
-
-=== modified file 'stardict-plugins/stardict-advertisement-plugin/advertisement.cpp'
---- stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2008-04-26 21:05:29 +0000
-@@ -2,6 +2,7 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
-+#include <cstring>
- #include <string>
- #include <map>
- #include <list>
-
-=== modified file 'stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp'
---- stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp 2008-04-26 21:05:29 +0000
-@@ -1,5 +1,6 @@
- #include "stardict_dictdotcn.h"
- #include <glib/gi18n.h>
-+#include <cstring>
- #include <string>
- #include <list>
-
-
-=== modified file 'stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp'
---- stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-04-26 21:05:29 +0000
-@@ -1,6 +1,7 @@
- #include "stardict_espeak.h"
- #include <espeak/speak_lib.h>
- #include <glib/gi18n.h>
-+#include <cstring>
-
- static const StarDictPluginSystemInfo *plugin_info = NULL;
- static std::string voice_engine;
-
-=== modified file 'stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp'
---- stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-04-26 21:05:29 +0000
-@@ -1,6 +1,8 @@
- #include "stardict_gucharmap.h"
- #include <glib/gi18n.h>
- #include <gucharmap/gucharmap.h>
-+#include <stdlib.h>
-+#include <cstring>
- #include <string>
-
- static char *build_dictdata(char type, const char *definition)
-
-=== modified file 'stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp'
---- stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-04-26 21:05:29 +0000
-@@ -1,5 +1,7 @@
- #include "stardict_html_parsedata.h"
- #include <glib/gi18n.h>
-+#include <cstring>
-+#include <stdlib.h>
-
- #ifdef _WIN32
- #include <windows.h>
-
-=== modified file 'stardict-plugins/stardict-man-plugin/stardict_man.cpp'
---- stardict-plugins/stardict-man-plugin/stardict_man.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-man-plugin/stardict_man.cpp 2008-04-26 21:05:29 +0000
-@@ -1,5 +1,6 @@
- #include "stardict_man.h"
- #include <glib/gi18n.h>
-+#include <cstring>
- #include <string>
-
- static const StarDictPluginSystemInfo *plugin_info = NULL;
-
-=== modified file 'stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp'
---- stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp 2008-04-26 21:05:29 +0000
-@@ -1,4 +1,5 @@
- #include "stardict_powerword_parsedata.h"
-+#include <cstring>
- #include <glib/gi18n.h>
-
- #ifdef _WIN32
-
-=== modified file 'stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp'
---- stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp 2008-04-26 21:05:29 +0000
-@@ -1,6 +1,8 @@
- #include "stardict_qqwry.h"
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
-+#include <cstring>
-+#include <stdlib.h>
- #include <string>
-
- #ifdef _WIN32
-
-=== modified file 'stardict-plugins/stardict-spell-plugin/stardict_spell.cpp'
---- stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-04-26 21:05:29 +0000
-@@ -3,6 +3,7 @@
- #include <glib/gi18n.h>
- #include <enchant.h>
- #include <pango/pango.h>
-+#include <cstring>
- #include <string>
- #include <vector>
-
-
-=== modified file 'stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp'
---- stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp 2008-04-26 21:05:29 +0000
-@@ -1,5 +1,7 @@
- #include "stardict_update_info.h"
- #include <glib/gi18n.h>
-+#include <cstring>
-+#include <stdlib.h>
-
- #ifdef _WIN32
- #include <windows.h>
-
-=== modified file 'stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp'
---- stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp 2008-04-26 21:05:29 +0000
-@@ -1,5 +1,6 @@
- #include "stardict_wiki2xml.h"
- #include "WIKI2XML.h"
-+#include <cstring>
- #include <glib.h>
-
- std::string wiki2xml(std::string &str)
-
-=== modified file 'stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp'
---- stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp 2008-04-26 21:05:29 +0000
-@@ -1,5 +1,6 @@
- #include "stardict_wiki_parsedata.h"
- #include "stardict_wiki2xml.h"
-+#include <cstring>
- #include <glib/gi18n.h>
-
- #ifdef _WIN32
-
-=== modified file 'stardict-plugins/stardict-wordnet-plugin/court_widget.cpp'
---- stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-04-26 21:05:29 +0000
-@@ -1,6 +1,7 @@
- #include "court_widget.h"
- #include <math.h>
- #include <list>
-+#include <cstring>
-
-
- wnobj::wnobj(partic_t & p, unsigned int t) : _p(p), _t(t), highlight(false)
-
-=== modified file 'stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp'
---- stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-04-26 21:05:29 +0000
-@@ -1,6 +1,7 @@
- #include "stardict_wordnet.h"
- #include "court_widget.h"
- #include <glib/gi18n.h>
-+#include <cstring>
-
- #ifdef _WIN32
- #include <windows.h>
-
-=== modified file 'stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp'
---- stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp 2008-04-26 21:05:29 +0000
-@@ -1,4 +1,5 @@
- #include "stardict_wordnet_parsedata.h"
-+#include <cstring>
- #include <glib/gi18n.h>
-
- #ifdef _WIN32
-
-=== modified file 'stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp'
---- stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-04-26 21:05:23 +0000
-+++ stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-04-26 21:05:29 +0000
-@@ -1,5 +1,6 @@
- #include "stardict_xdxf_parsedata.h"
- #include <glib/gi18n.h>
-+#include <cstring>
-
- #ifdef _WIN32
- #include <windows.h>
-
-=== modified file 'tests/t_config_file.cpp'
---- tests/t_config_file.cpp 2008-04-26 21:05:23 +0000
-+++ tests/t_config_file.cpp 2008-04-26 21:05:29 +0000
-@@ -2,6 +2,7 @@
- # include "config.h"
- #endif
-
-+#include <memory>
- #include <cerrno>
- #include <cstdio>
- #include <cstdlib>
-
-=== modified file 'tests/t_xml.cpp'
---- tests/t_xml.cpp 2008-04-26 21:05:23 +0000
-+++ tests/t_xml.cpp 2008-04-26 21:05:29 +0000
-@@ -3,6 +3,7 @@
- #endif
-
- #include <glib.h>
-+#include <cstring>
- #include <cstdlib>
- #include <string>
-
-
diff --git a/app-text/stardict/files/stardict-3.0.1-gconf-m4.diff b/app-text/stardict/files/stardict-3.0.1-gconf-m4.diff
deleted file mode 100644
index fc412ec..0000000
--- a/app-text/stardict/files/stardict-3.0.1-gconf-m4.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urN stardict-3.0.0.orig/m4/gconf-2.m4 stardict-3.0.0/m4/gconf-2.m4
---- m4/gconf-2.m4 1970-01-01 08:00:00.000000000 +0800
-+++ m4/gconf-2.m4 2007-11-10 14:48:00.000000000 +0800
-@@ -0,0 +1,39 @@
-+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,
-+ [ --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,
-+ [ --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,
-+ [ --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])
-+])
diff --git a/app-text/stardict/files/stardict-3.0.1-gucharmap.patch b/app-text/stardict/files/stardict-3.0.1-gucharmap.patch
deleted file mode 100644
index c9a076a..0000000
--- a/app-text/stardict/files/stardict-3.0.1-gucharmap.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in (revision 257)
-+++ configure.in (working copy)
-@@ -12,6 +12,7 @@
-
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
- AC_PROG_INTLTOOL([0.22])
-+PKG_PROG_PKG_CONFIG
-
- AC_CONFIG_MACRO_DIR(m4)
- AM_PROG_LIBTOOL
-@@ -72,13 +73,17 @@
- dnl gucharmap plugin checks.
- dnl ================================================================
-
-+GUCHARMAP_REQUIRED=1.4.0
- AC_ARG_ENABLE([gucharmap],
- AS_HELP_STRING([--disable-gucharmap],[Disable gucharmap plugin (default: enabled)]),
- [enable_gucharmap=$enableval],
- [enable_gucharmap=yes])
-
- if test "x$enable_gucharmap" = "xyes" ; then
-- PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0], have_gucharmap=yes, have_gucharmap=no)
-+ PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= $GUCHARMAP_REQUIRED], have_gucharmap=yes, have_gucharmap=no)
-+ if test "x$have_gucharmap" != "xyes"; then
-+ PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2 >= $GUCHARMAP_REQUIRED], have_gucharmap=yes, have_gucharmap=no)
-+ fi
- if test "x$have_gucharmap" = "xyes"; then
- GUCHARMAP_CFLAGS="${GUCHARMAP_CFLAGS}"
- GUCHARMAP_LIBS="${GUCHARMAP_LIBS}"
-Index: stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
-===================================================================
---- stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp (revision 257)
-+++ stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp (working copy)
-@@ -238,7 +238,7 @@
- /* canonical decomposition */
- gunichar *decomposition;
- gsize result_len;
-- decomposition = gucharmap_unicode_canonical_decomposition (uc, &result_len);
-+ decomposition = g_unicode_canonical_decomposition (uc, &result_len);
- if (result_len != 1) {
- definition += _("Canonical decomposition:");
- definition += " ";
diff --git a/app-text/stardict/files/stardict-3.0.1-optional-esd.patch b/app-text/stardict/files/stardict-3.0.1-optional-esd.patch
deleted file mode 100644
index ab283b3..0000000
--- a/app-text/stardict/files/stardict-3.0.1-optional-esd.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -urN stardict-3.0.1/configure.in stardict-3.0.1-f/configure.in
---- stardict-3.0.1/configure.in 2007-11-01 15:37:15.000000000 +0800
-+++ stardict-3.0.1-f/configure.in 2008-11-09 14:30:49.000000000 +0800
-@@ -296,6 +296,8 @@
- AC_ARG_ENABLE(gnome-support, AC_HELP_STRING([--disable-gnome-support], [Disable gnome support]))
- AC_ARG_ENABLE(gpe-support, AC_HELP_STRING([--enable-gpe-support], [Enable gpe support]))
- AC_ARG_ENABLE(maemo-support, AC_HELP_STRING([--enable-maemo-support], [Enable maemo support]))
-+AC_ARG_ENABLE(esd-support, AC_HELP_STRING([--enable-esd-support], [Enable esd support]))
-+AM_CONDITIONAL(ESD_SUPPORT, test "x${enable_gpe_support}" != "xyes" && test "x${enable_maemo_support}" != "xyes" && test "x${enable_gnome_support}" != "xno" && test "x${enable_esd_support}" = "xyes" )
- AM_CONDITIONAL(GNOME_SUPPORT, test "x${enable_gpe_support}" != "xyes" && test "x${enable_maemo_support}" != "xyes" && test "x${enable_gnome_support}" != "xno")
- AM_CONDITIONAL(GPE_SUPPORT, test "x${enable_gpe_support}" = "xyes")
- AM_CONDITIONAL(MAEMO_SUPPORT, test "x${enable_maemo_support}" = "xyes")
-@@ -307,7 +309,11 @@
- elif test "x${enable_gnome_support}" = "xno" ; then
- DEP_MODULES="gtk+-2.0 >= 2.12 gthread-2.0"
- else
-- DEP_MODULES="libgnomeui-2.0 >= 2.20"
-+ if test "x${enable_esd_support}" = "xyes"; then
-+ DEP_MODULES="libgnomeui-2.0 >= 2.20 esound >= 0.2"
-+ else
-+ DEP_MODULES="libgnomeui-2.0 >= 2.20"
-+ fi
- fi
-
- dnl
-@@ -338,6 +344,12 @@
- echo "Enable gnome suppport";
- AC_DEFINE([CONFIG_GNOME],[], [Compile with gnome support])
-
-+dnl For esound support
-+ if test "x${enable_esd_support}" = "xyes"; then
-+ echo "Enable esound suppport";
-+ AC_DEFINE([CONFIG_ESD],[], [Compile with esound support])
-+ fi
-+
- dnl *********************************************
- dnl for anything which calls gconftool-2 correctly
- dnl *********************************************
-diff -urN stardict-3.0.1/src/conf.cpp stardict-3.0.1-f/src/conf.cpp
---- stardict-3.0.1/src/conf.cpp 2007-10-30 16:05:35.000000000 +0800
-+++ stardict-3.0.1-f/src/conf.cpp 2008-11-09 14:11:51.000000000 +0800
-@@ -108,7 +108,7 @@
- add_entry("/apps/stardict/preferences/dictionary/enable_collation", false);
- add_entry("/apps/stardict/preferences/dictionary/collate_function", 0);
-
--#if defined(CONFIG_GTK) || defined (CONFIG_GPE)
-+#if defined(CONFIG_GTK) || defined (CONFIG_GPE) || (! defined(CONFIG_ESD))
- add_entry("/apps/stardict/preferences/dictionary/play_command", std::string("play"));
- #endif
- #ifdef _WIN32
-diff -urN stardict-3.0.1/src/desktop.cpp stardict-3.0.1-f/src/desktop.cpp
---- stardict-3.0.1/src/desktop.cpp 2007-08-31 15:27:59.000000000 +0800
-+++ stardict-3.0.1-f/src/desktop.cpp 2008-11-09 13:51:51.000000000 +0800
-@@ -37,7 +37,7 @@
-
- #include "desktop.hpp"
-
--#if defined(CONFIG_GTK) || defined(CONFIG_GPE) || defined(CONFIG_MAEMO)
-+#if defined(CONFIG_GTK) || defined(CONFIG_GPE) || defined(CONFIG_MAEMO) || (! defined(CONFIG_ESD))
- static void spawn_command(const gchar *exe, const gchar *arg)
- {
- gchar *qarg = g_shell_quote(arg);
-@@ -55,7 +55,7 @@
- #if !defined(_MSC_VER)
- PlaySound(filename.c_str(), 0, SND_ASYNC | SND_FILENAME);
- #endif
--#elif defined(CONFIG_GNOME)
-+#elif defined(CONFIG_ESD)
- gnome_sound_play(filename.c_str());
- #else
- const std::string &playcmd=
-diff -urN stardict-3.0.1/src/prefsdlg.cpp stardict-3.0.1-f/src/prefsdlg.cpp
---- stardict-3.0.1/src/prefsdlg.cpp 2007-10-30 16:14:07.000000000 +0800
-+++ stardict-3.0.1-f/src/prefsdlg.cpp 2008-11-09 14:13:38.000000000 +0800
-@@ -734,7 +734,7 @@
- g_signal_connect (G_OBJECT (check_button), "toggled", G_CALLBACK (on_setup_dictionary_sound_ckbutton_toggled), (gpointer)this);
- gtk_box_pack_start(GTK_BOX(vbox1),check_button,false,false,0);
- GtkWidget *label;
--#if defined(CONFIG_GTK) || defined(CONFIG_GPE)
-+#if defined(CONFIG_GTK) || defined(CONFIG_GPE) || (! defined(CONFIG_ESD))
- GtkWidget *hbox2 = gtk_hbox_new(FALSE, 6);
- label=gtk_label_new(_("Command for playing wav files:"));
- gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0);
-@@ -1865,7 +1865,7 @@
- port = 2628;
- conf->set_int_at("network/port", port);
- gpAppFrame->oStarDictClient.set_server(server, port);
--#if defined(CONFIG_GTK) || defined(CONFIG_GPE)
-+#if defined(CONFIG_GTK) || defined(CONFIG_GPE) || (! defined(CONFIG_ESD))
- ch = gtk_entry_get_text(ePlayCommand);
- if (ch[0])
- conf->set_string_at("dictionary/play_command", ch);
-diff -urN stardict-3.0.1/src/prefsdlg.h stardict-3.0.1-f/src/prefsdlg.h
---- stardict-3.0.1/src/prefsdlg.h 2007-10-30 16:05:48.000000000 +0800
-+++ stardict-3.0.1-f/src/prefsdlg.h 2008-11-09 14:43:43.000000000 +0800
-@@ -32,7 +32,7 @@
- GtkButton *bAccount;
- std::string register_user;
- std::string register_hex;
--#if defined(CONFIG_GTK) || defined(CONFIG_GPE)
-+#if defined(CONFIG_GTK) || defined(CONFIG_GPE) || (! defined(CONFIG_ESD))
- GtkEntry *ePlayCommand;
- #endif
- #ifndef CONFIG_GPE
-diff -urN stardict-3.0.1/src/stardict.cpp stardict-3.0.1-f/src/stardict.cpp
---- stardict-3.0.1/src/stardict.cpp 2007-11-05 11:39:51.000000000 +0800
-+++ stardict-3.0.1-f/src/stardict.cpp 2008-11-09 13:25:35.000000000 +0800
-@@ -136,7 +136,7 @@
- dict_manage_dlg = NULL;
- plugin_manage_dlg = NULL;
- prefs_dlg = NULL;
--#ifdef CONFIG_GNOME
-+#ifdef CONFIG_ESD
- gnome_sound_init(NULL);
- #endif
- }
-@@ -144,7 +144,7 @@
- AppCore::~AppCore()
- {
- stop_word_change_timer();
--#ifdef CONFIG_GNOME
-+#ifdef CONFIG_ESD
- gnome_sound_shutdown();
- #endif
- delete dict_manage_dlg;
diff --git a/app-text/stardict/files/stardict-3.0.1-transparent_trayicon.patch b/app-text/stardict/files/stardict-3.0.1-transparent_trayicon.patch
deleted file mode 100644
index 1522a2a..0000000
--- a/app-text/stardict/files/stardict-3.0.1-transparent_trayicon.patch
+++ /dev/null
@@ -1,168 +0,0 @@
---- stardict-3.0.1/src/docklet.cpp 2007-10-25 10:57:22.000000000 +0400
-+++ stardict/src/docklet.cpp 2008-02-25 16:32:08.000000000 +0300
-@@ -25,15 +25,15 @@
- void DockLet::create_docklet()
- {
- docklet_ = egg_tray_icon_new("StarDict");
-- box_ = gtk_event_box_new();
-+ gtk_widget_add_events (GTK_WIDGET(docklet_), GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
- if (is_hide_state()) {
-- gtk_widget_set_tooltip_text(box_, _("StarDict"));
-+ gtk_widget_set_tooltip_text(GTK_WIDGET(docklet_), _("StarDict"));
- image_ = gtk_image_new_from_pixbuf(normal_icon_);
- } else if (is_scan_on()) {
-- gtk_widget_set_tooltip_text(box_, _("StarDict - Scanning"));
-+ gtk_widget_set_tooltip_text(GTK_WIDGET(docklet_), _("StarDict - Scanning"));
- image_ = gtk_image_new_from_pixbuf(scan_icon_);
- } else {
-- gtk_widget_set_tooltip_text(box_, _("StarDict - Stopped"));
-+ gtk_widget_set_tooltip_text(GTK_WIDGET(docklet_), _("StarDict - Stopped"));
- image_ = gtk_image_new_from_pixbuf(stop_icon_);
- }
-
-@@ -41,11 +41,10 @@
- G_CALLBACK(on_embedded), this);
- g_signal_connect(G_OBJECT(docklet_), "destroy",
- G_CALLBACK(on_destroyed), this);
-- g_signal_connect(G_OBJECT(box_), "button-press-event",
-+ g_signal_connect(G_OBJECT(docklet_), "button-press-event",
- G_CALLBACK(on_btn_press), this);
-
-- gtk_container_add(GTK_CONTAINER(box_), image_);
-- gtk_container_add(GTK_CONTAINER(docklet_), box_);
-+ gtk_container_add(GTK_CONTAINER(docklet_), image_);
- gtk_widget_show_all(GTK_WIDGET(docklet_));
-
- /* ref the docklet_ before we bandy it about the place */
-@@ -179,13 +178,13 @@
-
- void DockLet::scan_on()
- {
-- gtk_widget_set_tooltip_text(box_, _("StarDict - Scanning"));
-+ gtk_widget_set_tooltip_text(GTK_WIDGET(docklet_), _("StarDict - Scanning"));
- gtk_image_set_from_pixbuf(GTK_IMAGE(image_), scan_icon_);
- }
-
- void DockLet::scan_off()
- {
-- gtk_widget_set_tooltip_text(box_, _("StarDict - Stopped"));
-+ gtk_widget_set_tooltip_text(GTK_WIDGET(docklet_), _("StarDict - Stopped"));
- gtk_image_set_from_pixbuf(GTK_IMAGE(image_), stop_icon_);
- }
-
-@@ -193,7 +192,7 @@
- {
- if (!image_)
- return;
-- gtk_widget_set_tooltip_text(box_, _("StarDict"));
-+ gtk_widget_set_tooltip_text(GTK_WIDGET(docklet_), _("StarDict"));
- gtk_image_set_from_pixbuf(GTK_IMAGE(image_), normal_icon_);
- }
-
---- stardict-3.0.1/src/docklet.h 2007-10-25 10:53:06.000000000 +0400
-+++ stardict/src/docklet.h 2008-02-25 16:32:08.000000000 +0300
-@@ -16,7 +16,6 @@
- void set_scan_mode(bool);
- private:
- EggTrayIcon *docklet_;
-- GtkWidget *box_;
- GtkWidget *image_; //icon image.
- typedef ResourceWrapper<GtkWidget, GtkWidget, gtk_widget_destroy> GMenu;
- GMenu menu_;
---- stardict-3.0.1/src/eggtrayicon.c 2007-07-10 11:16:04.000000000 +0400
-+++ stardict/src/eggtrayicon.c 2008-02-25 16:32:08.000000000 +0300
-@@ -66,6 +66,8 @@
-
- static void egg_tray_icon_realize (GtkWidget *widget);
- static void egg_tray_icon_unrealize (GtkWidget *widget);
-+static void egg_tray_icon_add (GtkContainer *container,
-+ GtkWidget *widget);
-
- #ifdef GDK_WINDOWING_X11
- static void egg_tray_icon_update_manager_window (EggTrayIcon *icon,
-@@ -113,6 +115,7 @@
- {
- GObjectClass *gobject_class = (GObjectClass *)klass;
- GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-+ GtkContainerClass *container_class = (GtkContainerClass *)klass;
-
- parent_class = g_type_class_peek_parent (klass);
-
-@@ -121,6 +124,8 @@
- widget_class->realize = egg_tray_icon_realize;
- widget_class->unrealize = egg_tray_icon_unrealize;
-
-+ container_class->add = egg_tray_icon_add;
-+
- g_object_class_install_property (gobject_class,
- PROP_ORIENTATION,
- g_param_spec_enum ("orientation",
-@@ -159,6 +164,35 @@
- }
-
- #ifdef GDK_WINDOWING_X11
-+static gboolean
-+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
-+{
-+ gdk_window_clear_area (widget->window, event->area.x, event->area.y,
-+ event->area.width, event->area.height);
-+ return FALSE;
-+}
-+
-+static void
-+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
-+ gpointer user_data)
-+{
-+ gdk_window_set_back_pixmap(widget->window, NULL, TRUE);
-+}
-+
-+static void
-+make_transparent (GtkWidget *widget, gpointer user_data)
-+{
-+ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-+ return;
-+
-+ gtk_widget_set_app_paintable (widget, TRUE);
-+ gtk_widget_set_double_buffered (widget, FALSE);
-+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-+ g_signal_connect (widget, "expose_event",
-+ G_CALLBACK (transparent_expose_event), NULL);
-+ g_signal_connect_after (widget, "style_set",
-+ G_CALLBACK (make_transparent_again), NULL);
-+}
-
- static void
- egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
-@@ -238,10 +272,22 @@
- }
- return GDK_FILTER_CONTINUE;
- }
--
-+#else
-+static void
-+make_transparent (GtkWidget *widget, gpointer user_data)
-+{
-+}
- #endif
-
- static void
-+egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
-+{
-+ g_signal_connect (widget, "realize",
-+ G_CALLBACK (make_transparent), NULL);
-+ GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
-+}
-+
-+static void
- egg_tray_icon_unrealize (GtkWidget *widget)
- {
- #ifdef GDK_WINDOWING_X11
-@@ -381,6 +427,8 @@
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
-+ make_transparent (widget, NULL);
-+
- screen = gtk_widget_get_screen (widget);
- display = gdk_screen_get_display (screen);
- xdisplay = gdk_x11_display_get_xdisplay (display);
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
deleted file mode 100644
index 843f74a..0000000
--- a/app-text/stardict/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>app-dicts</herd>
- <longdescription>
- StarDict is an international dictionary Software. It has powerful features
- such as "Glob-style pattern matching", "Scan selection word," "Fuzzy
- query," etc. Stardict Version3.0 has developed a lot of new functions, such
- as Full-text translation, Net Dict.
- </longdescription>
-</pkgmetadata>
diff --git a/app-text/stardict/stardict-3.0.1-r2.ebuild b/app-text/stardict/stardict-3.0.1-r2.ebuild
deleted file mode 100644
index cb5e769..0000000
--- a/app-text/stardict/stardict-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-3.0.1-r1.ebuild,v 1.3 2008/04/29 08:24:24 pva Exp $
-
-inherit gnome2 eutils autotools
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-# their indexes seem to be in a different format. So we'll keep them
-# seperate for now.
-
-DESCRIPTION="A GNOME2 international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stardict/${P}.tar.bz2
- qqwry? ( mirror://sourceforge/stardict/QQWry.Dat.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="festival espeak esd gnome gucharmap qqwry pronounce spell"
-RESTRICT="test"
-
-DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
- >=gnome-base/libgnome-2.2.0
- >=gnome-base/libgnomeui-2.2.0
- >=gnome-base/gconf-2
- >=gnome-base/orbit-2.6
- app-text/scrollkeeper )
- pronounce? ( app-dicts/wyabdcrealpeopletts )
- spell? ( app-text/enchant )
- gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
- >=sys-libs/zlib-1.1.4
- >=x11-libs/gtk+-2.12"
-
-RDEPEND="${DEP}
- espeak? ( >=app-accessibility/espeak-1.29 )
- festival? ( =app-accessibility/festival-1.96_beta )"
-
-DEPEND="${DEP}
- >=dev-util/intltool-0.22
- dev-util/pkgconfig"
-
-pkg_setup() {
- if (use gnome && use pronounce && ! built_with_use gnome-base/libgnome esd); then
- if use esd; then
- ewarn 'Note, being built with USE="gnome" stardict uses gnome_sound_play()'
- ewarn 'to play RealPeopleTTS sounds, which plays sounds only in case'
- ewarn 'gnome-base/libgnome was built with USE="esd".'
- else
- ewarn "Note: to play sounde you'll have manually configure command"
- ewarn "to play sounds:"
- ewarn "Preferences -> Sound -> Command for playing wav files"
- fi
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-configure.in-EST.diff"
- epatch "${FILESDIR}/${P}-gconf-m4.diff"
- epatch "${FILESDIR}/${P}-gcc43.patch"
- epatch "${FILESDIR}/${P}-transparent_trayicon.patch"
- epatch "${FILESDIR}/${P}-changelog-minor-typo-fixes.patch"
- epatch "${FILESDIR}/${P}-gucharmap.patch"
- epatch "${FILESDIR}/${P}-optional-esd.patch"
- eautoreconf
- gnome2_omf_fix
-}
-
-src_compile() {
- # Festival plugin crashes, bug 188684. Disable for now.
- G2CONF="$(use_enable gnome gnome-support)
- $(use_enable spell)
- $(use_enable esd esd-support)
- $(use_enable gucharmap)
- $(use_enable espeak)
- $(use_enable qqwry)
- --disable-festival
- --disable-advertisement
- --disable-updateinfo"
- gnome2_src_compile
-}
-
-src_install() {
- gnome2_src_install
- if use qqwry; then
- insinto /usr/share/stardict/data
- doins ../QQWry.Dat
- fi
- dodoc doc/{FAQ,HowToCreateDictionary,StarDictFileFormat,Translation,HACKING}
-}
-
-pkg_postinst() {
- if use festival; then
- elog "Note: festival text to speach (TTS) plugin is not built. To use festival"
- elog 'TTS plugin, please, enable "Use TTS program." at:'
- elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
- elog '"echo %s | festival --tts"'
- elog
- fi
- elog "You will now need to install stardict dictionary files. If"
- elog "you have not, execute the below to get a list of dictionaries:"
- elog
- elog " emerge -s stardict-"
-}