diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2020-02-05 15:01:38 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2020-02-05 15:06:44 +0200 |
| commit | 726e0d745ddada5306b2b9740608ecefa18ac944 (patch) | |
| tree | 9b291d8d1a046e4412eb34efc55215331b8f6caa /mail-client | |
| parent | package.mask: Unmask enchant:2 using gspell-1.8 (diff) | |
| download | gentoo-726e0d745ddada5306b2b9740608ecefa18ac944.tar.gz gentoo-726e0d745ddada5306b2b9740608ecefa18ac944.tar.bz2 gentoo-726e0d745ddada5306b2b9740608ecefa18ac944.zip | |
mail-client/geary: ensure a single enchant version mapped at runtime
Raise dependencies further to ensure all libraries used also use enchant:2,
so we don't get both libenchant.so and libenchant-2.so mapped in at runtime,
with each having mostly the same symbol names.
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/geary/geary-3.34.2-r3.ebuild (renamed from mail-client/geary/geary-3.34.2-r2.ebuild) | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail-client/geary/geary-3.34.2-r2.ebuild b/mail-client/geary/geary-3.34.2-r3.ebuild index 3d83e66a39b8..dc4d077d3cdb 100644 --- a/mail-client/geary/geary-3.34.2-r2.ebuild +++ b/mail-client/geary/geary-3.34.2-r3.ebuild @@ -19,13 +19,14 @@ KEYWORDS="~amd64 ~x86" # for now both enchants work, but ensuring enchant:2 # FIXME: add valadoc support -# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it. +# >=webkit-gtk-2.26.3-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2 +# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it; # If not, it could be compiled against 2.24 and then webkit-gtk upgraded and # geary not rebuilt, ending up in geary issues #558 and #559 still. DEPEND=" >=dev-libs/glib-2.54:2 >=x11-libs/gtk+-3.24.7:3 - >=net-libs/webkit-gtk-2.26:4= + >=net-libs/webkit-gtk-2.26.3-r1:4= >=dev-libs/gmime-2.6.17:2.6 >=dev-db/sqlite-3.12:3 @@ -35,7 +36,7 @@ DEPEND=" >=app-crypt/gcr-3.10.1:0= >=dev-libs/libgee-0.8.5:0.8= net-libs/gnome-online-accounts - app-text/gspell:= + >=app-text/gspell-1.7:= app-text/iso-codes >=dev-libs/json-glib-1.0 >=media-libs/libcanberra-0.28 |