Release 2 (by relup.sh)

[packages/gimp.git] / gimp-home_etc.patch

diff --git a/gimp-home_etc.patch b/gimp-home_etc.patch
index fc5b74263d6180f6accd3057501ca3af818c8b5f..a9d2195f19c49e4262b14317a3cb8f90d6e6c8ff 100644 (file)
--- a/gimp-home_etc.patch
+++ b/gimp-home_etc.patch
@@ -1,19 +1,14 @@
-diff -Nru gimp-1.3.22.orig/libgimpbase/gimpenv.c gimp-1.3.22/libgimpbase/gimpenv.c
---- gimp-1.3.22.orig/libgimpbase/gimpenv.c     2003-10-25 21:02:18.000000000 +0200
-+++ gimp-1.3.22/libgimpbase/gimpenv.c  2003-11-22 19:23:31.000000000 +0100
-@@ -95,13 +95,13 @@
-   static gchar *gimp_dir = NULL;
- 
-   const gchar  *env_gimp_dir;
--  const gchar  *home_dir;
-+  const gchar  *home_dir = g_getenv("HOME_ETC");
- 
-   if (gimp_dir)
-     return gimp_dir;
- 
-   env_gimp_dir = g_getenv ("GIMP2_DIRECTORY");
--  home_dir     = g_get_home_dir ();
-+  if (!home_dir) home_dir     = g_get_home_dir ();
- 
-   if (env_gimp_dir)
-     {
+--- gimp-2.7.1/libgimpbase/gimpenv.c~  2010-06-13 21:15:08.000000000 +0200
++++ gimp-2.7.1/libgimpbase/gimpenv.c   2010-07-19 10:30:13.787427066 +0200
+@@ -259,7 +259,9 @@ gimp_directory (void)
+         }
+       else
+         {
+-          const gchar *home_dir = g_get_home_dir ();
++          const gchar *home_dir = g_getenv("HOME_ETC");
++          if (!home_dir)
++            home_dir = g_get_home_dir ();
+ 
+           if (home_dir)
+             gimp_dir = g_build_filename (home_dir, env_gimp_dir, NULL);
+    {