在 2017年9月14日星期四 CST 上午10:54:42，Dmitry E. Oboukhov 写道：
> Hi, Boyuan!
>
> > commit 45d460fcc8c86f50e6bff1c505396dd4d7c462df
> > Author: Boyuan Yang <073plan@gmail.com>
> > Date: Wed Sep 13 16:16:48 2017 +0800
> >
> > debian: prepare new release 1.5.0~rc2+git20170908+ds-1
> >
> > config.cc | 3
> > -
> > debian/changelog | 10
> > ++- debian/control
> > | 2 + ...sable-autostart-control =>
> > 0001-Disable-default-autostart.patch} | 17 +++--
> > debian/patches/8e11d2a0bdec3ccf24ebb61d468b005543b899ee.patch |
> > 115 ------------------------------ debian/patches/series
> > | 4 +- debian/patches/wordnet-dict-paths
> > | 14 ---- debian/rules
> > | 5 ++ debian/watch
> > | 5 ++ preferences.ui
> > | 3 - 10 files
> > changed, 34 insertions(+), 144 deletions(-)
>
> You dropped patch debian/patches/wordnet-dict-paths, so Your version
> goldendict can not use wordnet dictionaries (see Debian packages
> wordnet and goldendict-wordnet).
>
> Could You revert the patch?
>
> PS: Debian contains package "wordnet". The patch created an
> integration between goldendict and wordnet.
I believe this patch is long merged upstream.
https://github.com/goldendict/goldendict/blob/master/config.cc#L345
$ git show-ref HEAD
1b9d894a60ff7059e3f5a6d5fd3e23a2745f431d refs/remotes/origin/HEAD
$ git blame config.cc
[...]
55749e23 src/config.cc (Konstantin Isakov 2009-04-09 19:03:28 +0000 341)
ba1f38b9 config.cc (Tvangeste 2013-07-18 20:22:41 +0200 342)
if ( QDir( "/usr/share/opendict/dictionaries" ).exists() )
ba1f38b9 config.cc (Tvangeste 2013-07-18 20:22:41 +0200 343)
c.paths.push_back( Path( "/usr/share/opendict/dictionaries", true ) );
ba1f38b9 config.cc (Tvangeste 2013-07-18 20:22:41 +0200 344)
af0fceb7 config.cc (Tvangeste 2013-07-18 20:14:01 +0200 345)
if ( QDir( "/usr/share/goldendict-wordnet" ).exists() )
af0fceb7 config.cc (Tvangeste 2013-07-18 20:14:01 +0200 346)
c.paths.push_back( Path( "/usr/share/goldendict-wordnet", true ) );
af0fceb7 config.cc (Tvangeste 2013-07-18 20:14:01 +0200 347)
107c75ce src/config.cc (Konstantin Isakov 2009-04-04 19:20:09 +0000 348)
if ( QDir( "/usr/share/WyabdcRealPeopleTTS" ).exists() )
c6cbaa64 config.cc (Julian Depetris Chauvin 2013-02-02 19:00:19 -0300 349)
c.soundDirs.push_back( SoundDir( "/usr/share/
WyabdcRealPeopleTTS","WyabdcRealPeopleTTS" ) );
[...]
$ git show af0fceb7 | cat
commit af0fceb7f189506d198452875ab06e670438592a
Author: Tvangeste <i.4m.l33t@yandex.ru>
Date: Thu Jul 18 20:14:01 2013 +0200
Preconfigure goldendict-wordnet path (patch by Dmitry E. Oboukhov)
diff --git a/config.cc b/config.cc
index 75923d9..6d2798c 100644
--- a/config.cc
+++ b/config.cc
@@ -308,6 +308,9 @@ Class load() throw( exError )
if ( QDir( "/usr/share/dictd" ).exists() )
c.paths.push_back( Path( "/usr/share/dictd", true ) );
+ if ( QDir( "/usr/share/goldendict-wordnet" ).exists() )
+ c.paths.push_back( Path( "/usr/share/goldendict-wordnet", true ) );
+
if ( QDir( "/usr/share/WyabdcRealPeopleTTS" ).exists() )
c.soundDirs.push_back( SoundDir( "/usr/share/WyabdcRealPeopleTTS",
"WyabdcRealPeopleTTS" ) );
Regards,
Boyuan YangAttachment:
signature.asc
Description: This is a digitally signed message part.