From 17eadf2db85bf80c2715a57976d771272343eaad Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 8 Jan 2012 17:33:33 +0000 Subject: [PATCH] Version bump wrt #351416 by "zvasylvv". Remove unnecessary runtime depend for festival and resort to pkg_postinst() message wrt #330351 by Andrew Savchenko. Fix building with GLIB >= 2.31 wrt #396219 by Oschtan. USE="tools" to install utilities which have been moved to the main package since 3.0.3 wrt #292773 by "andcycle-gentoo.bugs". Punt any reference to esound... read the ChangeLog Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- app-text/stardict/ChangeLog | 17 ++- app-text/stardict/Manifest | 19 +++- .../stardict-3.0.3-correct-glib-include.patch | 13 +++ .../stardict/files/stardict-3.0.3-entry.patch | 20 ++++ .../stardict/files/stardict-3.0.3-gcc46.patch | 13 +++ app-text/stardict/metadata.xml | 1 + app-text/stardict/stardict-3.0.3.ebuild | 106 ++++++++++++++++++ 7 files changed, 182 insertions(+), 7 deletions(-) create mode 100644 app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch create mode 100644 app-text/stardict/files/stardict-3.0.3-entry.patch create mode 100644 app-text/stardict/files/stardict-3.0.3-gcc46.patch create mode 100644 app-text/stardict/stardict-3.0.3.ebuild diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog index 0abac87fd31d..5129f7a1139e 100644 --- a/app-text/stardict/ChangeLog +++ b/app-text/stardict/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for app-text/stardict -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.10 2011/09/21 23:55:12 dirtyepic Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.11 2012/01/08 17:33:33 ssuominen Exp $ + +*stardict-3.0.3 (08 Jan 2012) + + 08 Jan 2012; Samuli Suominen +stardict-3.0.3.ebuild, + +files/stardict-3.0.3-correct-glib-include.patch, + +files/stardict-3.0.3-entry.patch, +files/stardict-3.0.3-gcc46.patch, + metadata.xml: + Version bump wrt #351416 by "zvasylvv". Remove unnecessary runtime depend for + festival and resort to pkg_postinst() message wrt #330351 by Andrew + Savchenko. Fix building with GLIB >= 2.31 wrt #396219 by Oschtan. USE="tools" + to install utilities which have been moved to the main package since 3.0.3 + wrt #292773 by "andcycle-gentoo.bugs". Punt any reference to esound wrt + #246174 by Yu Yuwei. 22 Sep 2011; Ryan Hill stardict-3.0.1-r3.ebuild, +files/stardict-3.0.1-gcc46.patch: diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest index c704ef3ae803..f1ac2c70d6f8 100644 --- a/app-text/stardict/Manifest +++ b/app-text/stardict/Manifest @@ -12,17 +12,26 @@ AUX stardict-3.0.1-gconf-m4.diff 1720 RMD160 e4fea58f8730207a2de6d64f33c563f2fb7 AUX stardict-3.0.1-gucharmap2.patch 1815 RMD160 663e1979b996e45f17a4b61f42a1fdf6b818cd10 SHA1 9ebf602e2e8af8a9add69db32fe9cd5a76829f43 SHA256 369c57818e8bbadc4ddc144a389d36c19b8ed82c10052d91d709c4e09658a592 AUX stardict-3.0.1-sparc_sigbus.patch 2878 RMD160 6909a103f7f5f17e30302574687c001406efec80 SHA1 07e07b83eedfbc5ad105ea95b9e06f5eb6e23971 SHA256 eda41fa84ccf69d8da8bd38cf2030ffa997bd4437d5c090143db383dc73078ae AUX stardict-3.0.1-transparent_trayicon.patch 5712 RMD160 3ff5b688c264258d980c9168fff151d75164de65 SHA1 891f23e7be8e0b277f32414fa786874eed965344 SHA256 9171ae1aeb154d1159fe7fd2dee1ab30accd834fcdaa56f62bb66dac4fcbd741 +AUX stardict-3.0.3-correct-glib-include.patch 243 RMD160 ed5620fc734f824c0f00a3530992bb64e6b478d1 SHA1 3bec51d7bb4d0a477b7ec5c81f928178d58436c9 SHA256 42b88cd040b53d0e9084829472b03502616d2b3f794c1190272391a6b072d9f3 +AUX stardict-3.0.3-entry.patch 741 RMD160 f6307339c3b0b328a92ed5a90aca7971d62395cb SHA1 4cf50f218c046a87c033d4f39296db1b41e9ff57 SHA256 af4d049ee98b2eef865372dbda604fb8f896a09470d55088d61dd66f478d2fd6 +AUX stardict-3.0.3-gcc46.patch 279 RMD160 9138aabe80bcfc584cec6b146a43e303ec5adcad SHA1 01463361f0680e05cdd12853baa5c6b6f9924499 SHA256 fd1a102cc87b4c5cdb0256d75584ff012fa7c731a523bb2d8225bc8d3c2a26f3 DIST QQWry.Dat.bz2 4114875 RMD160 646916f7ac234a95526f9e43cfca674c2b4b7bd1 SHA1 de7ff7208da0f889ec08911119948780d7ee4738 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 RMD160 9c9bd37cf85aaed8d5b090b2014c3122e98ba8e4 SHA1 056609ec9743bda105ff6db956b321436ae50b90 SHA256 96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870 DIST stardict-3.0.1.tar.bz2 1964195 RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b76de SHA1 a0357e88105eaf7d6a4aa4803bf8617759bf0315 SHA256 504b3a7748933b9bd998cb85f37d4fa0a8575306643ffe6a9742450e66cd556f +DIST stardict-3.0.3.tar.bz2 9147947 RMD160 4c63f3cf439a7c34829b371e75c16db97fb35fd1 SHA1 5043c0918963cd4d40e6d6289353f295766ec74f SHA256 9ba10a5b3dcdd02b81c7a138dac15903a6bc2355856f60338f3775e371472b73 EBUILD stardict-3.0.1-r2.ebuild 3022 RMD160 d75d427d66563eb47d6950e78175ffac644b9f20 SHA1 013fe46caed49f9dc936f4a1d75ba4892f0bc807 SHA256 20830c859142f16a68d0e577266b3c30225abb8d8755825f623c76d52b3d94fc EBUILD stardict-3.0.1-r3.ebuild 3103 RMD160 41155f59f3fd97eab8b3f126d7f13d0ddc0f0ac8 SHA1 f2d8258dd8dca1e0a674442e25f5d01fa396dbfc SHA256 8083f1ba8062d4dadc2026206202e65977e79b9478bb26dc6597329228775361 -MISC ChangeLog 10926 RMD160 906f4e26e3967af1fe06b05127a54c443ef6243b SHA1 46c90ec8ab1b8db6cca202a64c9aed7e2bf0ec24 SHA256 6dba24c1b5164ec7c9afa3fded1ee87ca56857d9c97b4031b05fcad95f8baf5c -MISC metadata.xml 1042 RMD160 0ced5634cca57caf85b8175f265cb5dd78071166 SHA1 ec96a72f7cea8d3635503946162b648caa914e47 SHA256 aef7fd1a02db1666dbf4f3243c7ed9b4665b14c935d8b4676c069fdcf4d06e07 +EBUILD stardict-3.0.3.ebuild 2935 RMD160 a683243ab063acab5ff9e4cdd49bc0e4fbde1270 SHA1 b8afdce217299a7de6ef28946eb15f15ca96932e SHA256 fb3b5c15c0f229b46a02a76ee94f8b9a2f1551f901af45d2cab162c46123161b +MISC ChangeLog 11580 RMD160 dda0965acf0477dc2c674a0724ce9b5b0a2b7a89 SHA1 07013496aa39bbbd2ea045ec744bb8c308f730ba SHA256 594abe43aff25ea70c573bb414c98ed859ab3a95e75e65fdb1879b9b5903e9a1 +MISC metadata.xml 1095 RMD160 7efb9c133d3ccec819d92589682009ed42d6c0da SHA1 28d771674c12a2943fc4b7d129328475cd0d9ebc SHA256 6efd7622d5daf308d3bc645a3c69ded6f7004d811f201897416a8557ea7b723b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk56e50ACgkQiqiDRvmkBmKvyQCfeMG/2jM3JM1wbLQ4ffPLKrfe -JrYAn1ssA64eH1RKMO15sbdfvYZQatwg -=2TI3 +iQEcBAEBAgAGBQJPCdMfAAoJEEdUh39IaPFNFj8IAKNzTseINZYZv00MSO49NScj +DxO5ZI29V5kz3fEw8YuqbuWYpuYNKko1Tvet6uRaTTjgdsxj1iKer5P6+ixyK1Uw +zYKxOndjnmm6rC4g23TB51H5bM+zvOEr8OgXOs7n7gqK2u5saRF16iaW6yAxKwZ3 +PSRcw7ak2sk6PzXdIiQwdX+6xAbWTZPWszDqHnUkdshat+9TqR7lJfvxw454vabZ +V/ckfEQN2RriQTWw1oL5NbuEwC6xBuEsAQM7O06Rj/9SkwU9jOtNeKIs7vY2FXur +ZnaNp1z3rrZx80kCXoAeYyGp5bMB5rscm+K+R9FlOP5guYrLgrTJ8VLl+DypO4Y= +=q8pn -----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..fd89243938eb --- /dev/null +++ b/app-text/stardict/files/stardict-3.0.3-correct-glib-include.patch @@ -0,0 +1,13 @@ +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 ++#include + + 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 new file mode 100644 index 000000000000..38182b0c8e0b --- /dev/null +++ b/app-text/stardict/files/stardict-3.0.3-entry.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000000..d85bc0de5ce0 --- /dev/null +++ b/app-text/stardict/files/stardict-3.0.3-gcc46.patch @@ -0,0 +1,13 @@ +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 ++ + #include "partic.h" + #include "spring.h" + diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml index ccb068646e6f..c1f41ef6ab9f 100644 --- a/app-text/stardict/metadata.xml +++ b/app-text/stardict/metadata.xml @@ -19,5 +19,6 @@ Enable QQWry plugin, which provides information (in Chinese language) about geographical positions, owner, etc. for IP addresses + Build and install tools diff --git a/app-text/stardict/stardict-3.0.3.ebuild b/app-text/stardict/stardict-3.0.3.ebuild new file mode 100644 index 000000000000..acf3557719e6 --- /dev/null +++ b/app-text/stardict/stardict-3.0.3.ebuild @@ -0,0 +1,106 @@ +# 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.ebuild,v 1.1 2012/01/08 17:33:33 ssuominen 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. + +EAPI=4 +inherit eutils + +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="GPL-3" +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 + dev-util/pkgconfig + sys-devel/gettext" + +RESTRICT="test" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-correct-glib-include.patch \ + "${FILESDIR}"/${P}-entry.patch \ + "${FILESDIR}"/${P}-gcc46.patch +} + +src_configure() { + econf \ + $(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_install() { + emake DESTDIR="${D}" 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 + + find "${ED}" -name '*.la' -exec rm -f {} + +} + +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-" +} -- 2.26.2