summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-12-29 15:40:25 +0200
committerMart Raudsepp <leio@gentoo.org>2019-12-29 16:35:09 +0200
commitf3a1dd273fde122cd45ef342b21dee01cbef7205 (patch)
tree34f457168d3ced9740683f342c39b19e9872a95b /mail-client/geary/files
parentapp-text/gspell: vala is only a build depend here (diff)
downloadgentoo-f3a1dd273fde122cd45ef342b21dee01cbef7205.tar.gz
gentoo-f3a1dd273fde122cd45ef342b21dee01cbef7205.tar.bz2
gentoo-f3a1dd273fde122cd45ef342b21dee01cbef7205.zip
mail-client/geary: various package fixes and touchups
* Fix tests (one needs virtx) * Fix some minimum deps and sort in meson.build occurrence order * Require webkit-gtk-2.26 to ensure a build conditional compatibility branch is used (building against 2.24 and then upgrading webkitgtk to 2.26 without geary rebuild may end up taking lots of CPU for some operations, afaiu) * Fix automagic dep on ytnef (previously may have linked against it even with USE=-ytnef if the library was present) * Drop conditional unwind support, as it's automagic and as it's a small dep, didn't fix it fully (much more involved than for ytnef) * Move introspection,vala USE flag requirements to build-time only - these aren't needed at runtime for geary. * Add missing itstool build depend * Drop old LINGUAS based translation file dropping - it's not done for almost all meson based packages, and we aren't special in any way * Drop dconf dep - again, don't think geary is more special than any other GSettings using application that don't dep on it for persistent configuration storage * Explicit meson_options settings where appropriate, resorted in meson_options.txt order Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'mail-client/geary/files')
-rw-r--r--mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch b/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch
new file mode 100644
index 000000000000..dccc40aab8c1
--- /dev/null
+++ b/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch
@@ -0,0 +1,32 @@
+From 91f78fb411bc2bf1e2269ceab02740e9cb969c9b Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 26 Dec 2019 19:28:07 +0200
+Subject: [PATCH] build: Fix automagic dependency on ytnef library
+
+It would be best to use meson feature option type for ytnef and unwind,
+but for now fix the automagic dependency on ytnef with the existing
+meson_options.txt setup.
+It was adding ytnef to list of dependencies unconditionally, and then
+also if tnef-support was enabled. So if the option was disabled, but the
+pkg-config file was present, it would still link to it surprisingly.
+Just remove the unconditional addition to dep, and rely on the already
+existing conditional addition to deps.
+---
+ src/engine/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/engine/meson.build b/src/engine/meson.build
+index cb61c2aa..23b5fa48 100644
+--- a/src/engine/meson.build
++++ b/src/engine/meson.build
+@@ -325,7 +325,6 @@ geary_engine_dependencies = [
+ gmime,
+ libmath,
+ libxml,
+- libytnef,
+ posix,
+ sqlite
+ ]
+--
+2.20.1
+