diff options
Diffstat (limited to 'app-text/stardict')
| -rw-r--r-- | app-text/stardict/ChangeLog | 10 | ||||
| -rw-r--r-- | app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch | 19 | ||||
| -rw-r--r-- | app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch | 13 | ||||
| -rw-r--r-- | app-text/stardict/files/stardict-3.0.3-entry.patch | 20 | ||||
| -rw-r--r-- | app-text/stardict/files/stardict-3.0.3-gcc46.patch | 13 | ||||
| -rw-r--r-- | app-text/stardict/files/stardict-3.0.3-overflow.patch | 26 | ||||
| -rw-r--r-- | app-text/stardict/stardict-3.0.3-r2.ebuild | 135 | ||||
| -rw-r--r-- | app-text/stardict/stardict-3.0.4-r1.ebuild | 129 |
8 files changed, 9 insertions, 356 deletions
diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog index 4830920735ca..7d8f614589b4 100644 --- a/app-text/stardict/ChangeLog +++ b/app-text/stardict/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-text/stardict # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.43 2014/09/12 06:48:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.44 2014/09/12 06:56:20 ssuominen Exp $ + + 12 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> + -files/stardict-3.0.3-compositelookup_cpp.patch, + -files/stardict-3.0.3-correct-glib-include.patch, + -files/stardict-3.0.3-entry.patch, -files/stardict-3.0.3-gcc46.patch, + -files/stardict-3.0.3-overflow.patch, -stardict-3.0.3-r2.ebuild, + -stardict-3.0.4-r1.ebuild: + old 12 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> stardict-3.0.5.ebuild: Add missing "sd2foldoc" to plugins handling in src_install() from "diff -u diff --git a/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch b/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch deleted file mode 100644 index 86825555d9cb..000000000000 --- a/app-text/stardict/files/stardict-3.0.3-compositelookup_cpp.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch is from OpenSUSE .src.rpm for the following crash on startup: - -ERROR:compositelookup.cpp:53:void CompositeLookup::send_net_dict_request(const string&, const string&): assertion failed: (NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)) - ---- dict/src/lib/compositelookup.cpp -+++ dict/src/lib/compositelookup.cpp -@@ -50,8 +50,10 @@ - void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) - { - NetDictRequest request(dict_id, key); -- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); -- NetDictRequests.push_back(request); -+ if(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)) -+ { -+ NetDictRequests.push_back(request); -+ } - } - - /* returns true if got expected response */ diff --git a/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch b/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch deleted file mode 100644 index fd89243938eb..000000000000 --- a/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/396219 - ---- dict/src/tomboykeybinder.h -+++ dict/src/tomboykeybinder.h -@@ -21,7 +21,7 @@ - #ifndef __TOMBOY_KEY_BINDER_H__ - #define __TOMBOY_KEY_BINDER_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - - G_BEGIN_DECLS - diff --git a/app-text/stardict/files/stardict-3.0.3-entry.patch b/app-text/stardict/files/stardict-3.0.3-entry.patch deleted file mode 100644 index 38182b0c8e0b..000000000000 --- a/app-text/stardict/files/stardict-3.0.3-entry.patch +++ /dev/null @@ -1,20 +0,0 @@ -warning: key "Encoding" in group "Desktop Entry" is deprecated -error: value "stardict.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension -error: value "Dictionary" in key "Categories" in group "Desktop Entry" requires another category to be present among the following categories: Office;TextTools - ---- dict/data/stardict.desktop.in -+++ dict/data/stardict.desktop.in -@@ -1,11 +1,10 @@ - [Desktop Entry] --Encoding=UTF-8 - _Name=StarDict - _Comment=Lookup words - Exec=stardict - Terminal=false - Type=Application --Icon=stardict.png -+Icon=stardict - StartupNotify=true --Categories=Utility;Dictionary; -+Categories=Utility;Office;TextTools;Dictionary; - X-GNOME-DocPath=stardict/stardict.xml diff --git a/app-text/stardict/files/stardict-3.0.3-gcc46.patch b/app-text/stardict/files/stardict-3.0.3-gcc46.patch deleted file mode 100644 index d85bc0de5ce0..000000000000 --- a/app-text/stardict/files/stardict-3.0.3-gcc46.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/362299 - ---- dict/stardict-plugins/stardict-wordnet-plugin/scene.h -+++ dict/stardict-plugins/stardict-wordnet-plugin/scene.h -@@ -25,6 +25,8 @@ - #ifndef __PHYSICS_H__ - #define __PHYSICS_H__ - -+#include <cstddef> -+ - #include "partic.h" - #include "spring.h" - diff --git a/app-text/stardict/files/stardict-3.0.3-overflow.patch b/app-text/stardict/files/stardict-3.0.3-overflow.patch deleted file mode 100644 index 482490105704..000000000000 --- a/app-text/stardict/files/stardict-3.0.3-overflow.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch is stardict-tools-3.0.3-destbufferoverflow.patch from OpenSUSE .src.rpm for: - -warning: call to ‘__fgets_chk_warn’ declared with attribute warning: fgets called with bigger size than length of destination buffer [enabled by default] - ---- tools/src/myspell2dic.c -+++ tools/src/myspell2dic.c -@@ -132,7 +132,7 @@ if (argc<3) - - fprintf(stderr, "Enter grammar language [Spanish]: "); - fflush(stderr); --fgets(lang, 100, stdin); -+fgets(lang, 50, stdin); - if ((p=strchr(lang, '\n'))!=NULL) *p=0; - if (*lang==0) strcpy(lang, "Spanish"); - ---- tools/src/ooo2dict.c -+++ tools/src/ooo2dict.c -@@ -71,7 +71,7 @@ current2=malloc(10000); - - fprintf(stderr, "Enter thesaurus language [WordNet_English]: "); - fflush(stderr); --fgets(lang, 100, stdin); -+fgets(lang, 50, stdin); - if ((p=strchr(lang, '\n'))!=NULL) *p=0; - if (*lang==0) strcpy(lang, "WordNet_English"); - F=fopen((argc>1)? argv[1]: "/usr/share/myspell/dicts/th_en_US_v2.dat", "rt"); diff --git a/app-text/stardict/stardict-3.0.3-r2.ebuild b/app-text/stardict/stardict-3.0.3-r2.ebuild deleted file mode 100644 index aa6454082f6c..000000000000 --- a/app-text/stardict/stardict-3.0.3-r2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3-r2.ebuild,v 1.8 2012/07/29 16:45:05 armin76 Exp $ - -# 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. - -# NOTE: Festival plugin crashes, bug 188684. Disable for now. - -EAPI=4 - -GNOME2_LA_PUNT=yes -GCONF_DEBUG=no - -inherit eutils gnome2 - -DESCRIPTION="A international dictionary supporting fuzzy and glob style matching" -HOMEPAGE="http://code.google.com/p/stardict-3/" -SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2 - pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) - qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )" - -LICENSE="CPL-1.0 GPL-3 LGPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" -IUSE="espeak gnome gucharmap qqwry pronounce spell tools" - -COMMON_DEPEND=">=dev-libs/glib-2.16 - dev-libs/libsigc++:2 - sys-libs/zlib - >=x11-libs/gtk+-2.20:2 - gnome? ( - >=gnome-base/libbonobo-2 - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/gconf-2 - >=gnome-base/orbit-2 - ) - gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 ) - spell? ( >=app-text/enchant-1.2 ) - tools? ( - dev-libs/libpcre - dev-libs/libxml2 - virtual/mysql - )" -RDEPEND="${COMMON_DEPEND} - espeak? ( >=app-accessibility/espeak-1.29 )" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - app-text/gnome-doc-utils - dev-libs/libxslt - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext" - -RESTRICT="test" - -pkg_setup() { - G2CONF="$(use_enable tools) - --disable-scrollkeeper - $(use_enable spell) - $(use_enable gucharmap) - --disable-festival - $(use_enable espeak) - $(use_enable qqwry) - --disable-updateinfo - $(use_enable gnome gnome-support) - --disable-gpe-support - --disable-schemas-install" -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-correct-glib-include.patch \ - "${FILESDIR}"/${P}-entry.patch \ - "${FILESDIR}"/${P}-gcc46.patch \ - "${FILESDIR}"/${P}-compositelookup_cpp.patch \ - "${FILESDIR}"/${P}-overflow.patch \ - "${FILESDIR}"/${P}-zlib-1.2.5.2.patch - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation} - - if use qqwry; then - insinto /usr/share/stardict/data - doins ../QQWry.Dat - fi - - if use pronounce; then - docinto WyabdcRealPeopleTTS - dodoc ../WyabdcRealPeopleTTS/{README,readme.txt} - rm -f ../WyabdcRealPeopleTTS/{README,readme.txt} - insinto /usr/share - doins -r ../WyabdcRealPeopleTTS - fi - - # noinst_PROGRAMS with stardict_ prefix from tools/src/Makefile.am wrt #292773 - if use tools; then - local app - local apps="pydict2dic olddic2newdic oxford2dic directory2dic dictd2dic - wquick2dic ec50 directory2treedic treedict2dir jdictionary mova - xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist - tabfile cedict edict duden stardict-dict-update degb2utf frgb2utf - jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon - stardict2txt stardict-verify fest2dict i2e2dict downloadwiki - ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan - xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb - resdatabase2dir dir2resdatabase stardict-index stardict-text2bin - stardict-bin2text stardict-repair" - - for app in ${apps}; do - newbin tools/src/${app} ${PN}_${app} - done - fi -} - -pkg_postinst() { - elog "Note: festival text to speech (TTS) plugin is not built. To use festival" - elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:' - elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:' - elog '"echo %s | festival --tts"' - elog - 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-" - - gnome2_pkg_postinst -} diff --git a/app-text/stardict/stardict-3.0.4-r1.ebuild b/app-text/stardict/stardict-3.0.4-r1.ebuild deleted file mode 100644 index b22f1062b850..000000000000 --- a/app-text/stardict/stardict-3.0.4-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.4-r1.ebuild,v 1.1 2014/08/03 15:41:27 ssuominen Exp $ - -EAPI=5 - -# 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. - -# NOTE: Festival plugin crashes, bug 188684. Disable for now. - -GNOME2_LA_PUNT=yes -GCONF_DEBUG=no - -inherit eutils gnome2 - -DESCRIPTION="A international dictionary supporting fuzzy and glob style matching" -HOMEPAGE="http://code.google.com/p/stardict-3/" -SRC_URI="http://${PN}-3.googlecode.com/files/${P}.tar.bz2 - pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) - qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )" - -LICENSE="CPL-1.0 GPL-3 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="espeak gucharmap qqwry pronounce spell tools" - -RESTRICT="test" - -COMMON_DEPEND=">=dev-libs/glib-2.16:2= - dev-libs/libsigc++:2= - sys-libs/zlib:= - >=x11-libs/gtk+-2.20:2= - gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 ) - spell? ( >=app-text/enchant-1.2 ) - tools? ( - dev-libs/libpcre:= - dev-libs/libxml2:= - virtual/mysql - )" -RDEPEND="${COMMON_DEPEND} - espeak? ( >=app-accessibility/espeak-1.29 )" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - app-text/gnome-doc-utils - dev-libs/libxslt - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - # These 2 fixes have been upstreamized for upcoming 3.0.5 differently, so drop 'em: - epatch "${FILESDIR}"/${PN}-3.0.3-zlib-1.2.5.2.patch - sed -i -e '/DEP_MODULES/s:glib-2.0:gmodule-2.0 &:' dict/configure || die - - gnome2_src_prepare -} - -src_configure() { - # Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of - # libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will - # give you GNOME 2.x support, that is otherwise considered deprecated - # because of the deep GNOME 2.x core library dependencies - gnome2_src_configure \ - $(use_enable tools) \ - --disable-scrollkeeper \ - $(use_enable spell) \ - $(use_enable gucharmap) \ - --disable-festival \ - $(use_enable espeak) \ - $(use_enable qqwry) \ - --disable-updateinfo \ - --disable-gnome-support \ - --disable-gpe-support \ - --disable-schemas-install -} - -src_install() { - gnome2_src_install - - dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation} - - if use qqwry; then - insinto /usr/share/${PN}/data - doins ../QQWry.Dat - fi - - if use pronounce; then - docinto WyabdcRealPeopleTTS - dodoc ../WyabdcRealPeopleTTS/{README,readme.txt} - rm -f ../WyabdcRealPeopleTTS/{README,readme.txt} - insinto /usr/share - doins -r ../WyabdcRealPeopleTTS - fi - - # noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773 - if use tools; then - local app - local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic - dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova - xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist - tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf - jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon - ${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki - ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan - xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb - resdatabase2dir dir2resdatabase ${PN}-index ${PN}-text2bin - ${PN}-bin2text ${PN}-repair" - - for app in ${apps}; do - newbin tools/src/${app} ${PN}_${app} - done - fi -} - -pkg_postinst() { - elog "Note: festival text to speech (TTS) plugin is not built. To use festival" - elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:' - elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:' - elog '"echo %s | festival --tts"' - elog - elog "You will now need to install ${PN} dictionary files. If" - elog "you have not, execute the below to get a list of dictionaries:" - elog - elog " emerge -s ${PN}-" - - gnome2_pkg_postinst -} |