[geary/wip/jtojnar/rpath] Plugins: Add libgeary-client to rpath



commit fbb41f7e86df347469e850518119160f442b263c
Author: Jan Tojnar <jtojnar gmail com>
Date:   Wed May 6 02:29:15 2020 +0200

    Plugins: Add libgeary-client to rpath
    
    Since we moved libgeary-client to a subdirectory, running ldd over the plug-ins shows they cannot find 
the library.
    They will still likely work in Geary, inheriting the library but we should still fix it in order not to 
trip up packagers' linters.

 src/client/plugin/desktop-notifications/meson.build | 3 ++-
 src/client/plugin/email-templates/meson.build       | 3 ++-
 src/client/plugin/folder-highlight/meson.build      | 3 ++-
 src/client/plugin/messaging-menu/meson.build        | 3 ++-
 src/client/plugin/notification-badge/meson.build    | 3 ++-
 src/client/plugin/sent-sound/meson.build            | 3 ++-
 src/client/plugin/special-folders/meson.build       | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/src/client/plugin/desktop-notifications/meson.build 
b/src/client/plugin/desktop-notifications/meson.build
index 501d3042..d09e723b 100644
--- a/src/client/plugin/desktop-notifications/meson.build
+++ b/src/client/plugin/desktop-notifications/meson.build
@@ -13,7 +13,8 @@ shared_module(
   vala_args: geary_vala_args,
   c_args: plugin_c_args,
   install: true,
-  install_dir: plugin_dest
+  install_dir: plugin_dest,
+  install_rpath: client_lib_dir,
 )
 
 i18n.merge_file(
diff --git a/src/client/plugin/email-templates/meson.build b/src/client/plugin/email-templates/meson.build
index 56ef251f..835eb72c 100644
--- a/src/client/plugin/email-templates/meson.build
+++ b/src/client/plugin/email-templates/meson.build
@@ -13,7 +13,8 @@ shared_module(
   vala_args: geary_vala_args,
   c_args: plugin_c_args,
   install: true,
-  install_dir: plugin_dest
+  install_dir: plugin_dest,
+  install_rpath: client_lib_dir,
 )
 
 i18n.merge_file(
diff --git a/src/client/plugin/folder-highlight/meson.build b/src/client/plugin/folder-highlight/meson.build
index 0a5fdeb1..2abd611d 100644
--- a/src/client/plugin/folder-highlight/meson.build
+++ b/src/client/plugin/folder-highlight/meson.build
@@ -13,7 +13,8 @@ shared_module(
   vala_args: geary_vala_args,
   c_args: plugin_c_args,
   install: true,
-  install_dir: plugin_dest
+  install_dir: plugin_dest,
+  install_rpath: client_lib_dir,
 )
 
 i18n.merge_file(
diff --git a/src/client/plugin/messaging-menu/meson.build b/src/client/plugin/messaging-menu/meson.build
index 8a14b7c6..7b3bb0ab 100644
--- a/src/client/plugin/messaging-menu/meson.build
+++ b/src/client/plugin/messaging-menu/meson.build
@@ -32,7 +32,8 @@ if libmessagingmenu_dep.found()
     vala_args: geary_vala_args,
     c_args: plugin_c_args,
     install: true,
-    install_dir: plugin_dest
+    install_dir: plugin_dest,
+    install_rpath: client_lib_dir,
   )
 
   i18n.merge_file(
diff --git a/src/client/plugin/notification-badge/meson.build 
b/src/client/plugin/notification-badge/meson.build
index 98dca2e8..008c4a85 100644
--- a/src/client/plugin/notification-badge/meson.build
+++ b/src/client/plugin/notification-badge/meson.build
@@ -16,7 +16,8 @@ shared_module(
   vala_args: geary_vala_args,
   c_args: plugin_c_args,
   install: true,
-  install_dir: plugin_dest
+  install_dir: plugin_dest,
+  install_rpath: client_lib_dir,
 )
 
 i18n.merge_file(
diff --git a/src/client/plugin/sent-sound/meson.build b/src/client/plugin/sent-sound/meson.build
index ba627228..7228ecc2 100644
--- a/src/client/plugin/sent-sound/meson.build
+++ b/src/client/plugin/sent-sound/meson.build
@@ -16,7 +16,8 @@ shared_module(
   vala_args: geary_vala_args,
   c_args: plugin_c_args,
   install: true,
-  install_dir: plugin_dest
+  install_dir: plugin_dest,
+  install_rpath: client_lib_dir,
 )
 
 i18n.merge_file(
diff --git a/src/client/plugin/special-folders/meson.build b/src/client/plugin/special-folders/meson.build
index f6d1d522..347d40ea 100644
--- a/src/client/plugin/special-folders/meson.build
+++ b/src/client/plugin/special-folders/meson.build
@@ -13,7 +13,8 @@ shared_module(
   vala_args: geary_vala_args,
   c_args: plugin_c_args,
   install: true,
-  install_dir: plugin_dest
+  install_dir: plugin_dest,
+  install_rpath: client_lib_dir,
 )
 
 i18n.merge_file(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]