[gedit] [osx] Fix enchant patch indentation
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] [osx] Fix enchant patch indentation
- Date: Tue, 26 Aug 2014 19:36:57 +0000 (UTC)
commit 35a19607f14dc05809129073b9b7b76be639cc25
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Tue Aug 26 21:33:59 2014 +0200
[osx] Fix enchant patch indentation
.../patches/enchant/enchant-relocatable.patch | 13 +++++++------
.../updater/patches/enchant-relocatable.patch | 8 ++++----
2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/osx/build/modulesets/patches/enchant/enchant-relocatable.patch
b/osx/build/modulesets/patches/enchant/enchant-relocatable.patch
index 9aee961..7e56eb7 100644
--- a/osx/build/modulesets/patches/enchant/enchant-relocatable.patch
+++ b/osx/build/modulesets/patches/enchant/enchant-relocatable.patch
@@ -1,10 +1,10 @@
--- a/src/enchant.c 2010-04-01 22:53:37.000000000 +0200
-+++ b/src/enchant.c 2014-08-25 17:30:02.000000000 +0200
++++ b/src/enchant.c 2014-08-26 21:32:21.000000000 +0200
@@ -210,6 +210,13 @@
char * module_dir = NULL;
char * prefix = NULL;
-+ const char *envdir = getenv ("ENCHANT_MODULES_DIR");
++ const char *envdir = g_getenv ("ENCHANT_MODULES_DIR");
+
+ if (envdir != NULL && *envdir != '\0')
+ {
@@ -14,20 +14,21 @@
{
char* user_module_dir;
-@@ -239,7 +246,7 @@
+@@ -239,7 +246,8 @@
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));*/
++ if (envdir == NULL || *envdir == '\0')
++ 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 @@
+@@ -278,6 +286,13 @@
if (ordering_dir)
conf_dirs = enchant_slist_append_unique_path (conf_dirs, ordering_dir);
-+ const char *envdir = getenv ("ENCHANT_DATA_DIR");
++ const char *envdir = g_getenv ("ENCHANT_DATA_DIR");
+
+ if (envdir != NULL && *envdir != '\0')
+ {
diff --git a/osx/build/updater/patches/enchant-relocatable.patch
b/osx/build/updater/patches/enchant-relocatable.patch
index 263e3a2..7e56eb7 100644
--- a/osx/build/updater/patches/enchant-relocatable.patch
+++ b/osx/build/updater/patches/enchant-relocatable.patch
@@ -1,10 +1,10 @@
--- a/src/enchant.c 2010-04-01 22:53:37.000000000 +0200
-+++ b/src/enchant.c 2014-08-25 17:30:02.000000000 +0200
++++ b/src/enchant.c 2014-08-26 21:32:21.000000000 +0200
@@ -210,6 +210,13 @@
char * module_dir = NULL;
char * prefix = NULL;
-+ const char *envdir = getenv ("ENCHANT_MODULES_DIR");
++ const char *envdir = g_getenv ("ENCHANT_MODULES_DIR");
+
+ if (envdir != NULL && *envdir != '\0')
+ {
@@ -18,8 +18,8 @@
module_dirs = enchant_slist_append_unique_path (module_dirs, module_dir);
#if defined(ENCHANT_GLOBAL_MODULE_DIR)
-+ if (envdir == NULL || *envdir == '\0')
- module_dirs = enchant_slist_append_unique_path (module_dirs, g_strdup (ENCHANT_GLOBAL_MODULE_DIR));
++ if (envdir == NULL || *envdir == '\0')
+ 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. */
@@ -28,7 +28,7 @@
if (ordering_dir)
conf_dirs = enchant_slist_append_unique_path (conf_dirs, ordering_dir);
-+ const char *envdir = getenv ("ENCHANT_DATA_DIR");
++ const char *envdir = g_getenv ("ENCHANT_DATA_DIR");
+
+ if (envdir != NULL && *envdir != '\0')
+ {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]