Commit 68ec504a authored by Jesse van den Kieboom's avatar Jesse van den Kieboom

[osx] Make enchant relocatable

parent 5039fb24
......@@ -398,6 +398,7 @@
<branch module="1.6.0/enchant-1.6.0.tar.gz" version="1.6.0" repo="abisource/enchant">
<patch file="enchant/enchant-gsize.patch" strip="1"/>
<patch file="enchant/enchant-applespell.patch" strip="1"/>
<patch file="enchant/enchant-relocatable.patch" strip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
......
--- a/src/enchant.c 2010-04-01 22:53:37.000000000 +0200
+++ b/src/enchant.c 2014-08-25 17:30:02.000000000 +0200
@@ -210,6 +210,13 @@
char * module_dir = NULL;
char * prefix = NULL;
+ const char *envdir = getenv ("ENCHANT_MODULES_DIR");
+
+ if (envdir != NULL && *envdir != '\0')
+ {
+ module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (envdir));
+ }
+
{
char* user_module_dir;
@@ -239,7 +246,7 @@
module_dirs = enchant_slist_append_unique_path (module_dirs, module_dir);
#if defined(ENCHANT_GLOBAL_MODULE_DIR)
- module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
+ /*module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));*/
#else
/* Dynamically locate library and search for modules relative to it. */
prefix = enchant_get_prefix_dir();
@@ -278,6 +285,13 @@
if (ordering_dir)
conf_dirs = enchant_slist_append_unique_path (conf_dirs, ordering_dir);
+ const char *envdir = getenv ("ENCHANT_DATA_DIR");
+
+ if (envdir != NULL && *envdir != '\0')
+ {
+ conf_dirs = enchant_slist_append_unique_path (conf_dirs, g_strdup (envdir));
+ }
+
/* Dynamically locate library and search for files relative to it. */
prefix = enchant_get_prefix_dir();
if(prefix)
......@@ -21,6 +21,7 @@
repo="abisource/enchant">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/enchant-gsize.patch" strip="1"/>
<patch file="patches/enchant-applespell.patch" strip="1"/>
<patch file="patches/enchant-relocatable.patch" strip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
......
--- a/src/enchant.c 2010-04-01 22:53:37.000000000 +0200
+++ b/src/enchant.c 2014-08-25 17:30:02.000000000 +0200
@@ -210,6 +210,13 @@
char * module_dir = NULL;
char * prefix = NULL;
+ const char *envdir = getenv ("ENCHANT_MODULES_DIR");
+
+ if (envdir != NULL && *envdir != '\0')
+ {
+ module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (envdir));
+ }
+
{
char* user_module_dir;
@@ -239,7 +246,7 @@
module_dirs = enchant_slist_append_unique_path (module_dirs, module_dir);
#if defined(ENCHANT_GLOBAL_MODULE_DIR)
- module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
+ /*module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));*/
#else
/* Dynamically locate library and search for modules relative to it. */
prefix = enchant_get_prefix_dir();
@@ -278,6 +285,13 @@
if (ordering_dir)
conf_dirs = enchant_slist_append_unique_path (conf_dirs, ordering_dir);
+ const char *envdir = getenv ("ENCHANT_DATA_DIR");
+
+ if (envdir != NULL && *envdir != '\0')
+ {
+ conf_dirs = enchant_slist_append_unique_path (conf_dirs, g_strdup (envdir));
+ }
+
/* Dynamically locate library and search for files relative to it. */
prefix = enchant_get_prefix_dir();
if(prefix)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment