Package: gimp
Version: 2.4.2-1.1
Followup-For: Bug #453711
Tags: patch

I made a patch which fix the problem.

-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (800, 'stable'), (700, 'testing'), (600, 'unstable'), (500, 
'oldstable'), (60, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/dash
Kernel: Linux 2.4.35.3
Locale: LANG=de_DE, LC_CTYPE=de_DE (charmap=ISO-8859-1) (ignored: LC_ALL set to 
de_DE)

Versions of packages gimp depends on:
ii  gimp-data              2.4.2-1.1         Data files for GIMP
ii  libaa1                 1.4p5-30          ascii art library
ii  libart-2.0-2           2.3.17-1          Library of functions for 2D graphi
ii  libatk1.0-0            1.12.4-3          The ATK accessibility toolkit
ii  libc6                  2.3.6.ds1-13etch2 GNU C Library: Shared libraries
ii  libcairo2              1.2.4-4           The Cairo 2D vector graphics libra
ii  libdbus-1-3            1.0.2-1           simple interprocess messaging syst
ii  libdbus-glib-1-2       0.71-3            simple interprocess messaging syst
ii  libexif12              0.6.16-2          library to parse EXIF files
ii  libfontconfig1         2.4.2-1.2         generic font configuration library
ii  libfreetype6           2.2.1-5+etch1     FreeType 2 font engine, shared lib
ii  libgimp2.0             2.4.2-1.1         Libraries for the GNU Image Manipu
ii  libglib2.0-0           2.12.4-2          The GLib library of C routines
ii  libgtk2.0-0            2.10.13-1         The GTK+ graphical user interface 
ii  libhal1                0.5.8.1-9         Hardware Abstraction Layer - share
ii  libjpeg62              6b-13             The Independent JPEG Group's JPEG 
ii  liblcms1               1.15-1            Color management library
ii  libmng1                1.0.9-1           Multiple-image Network Graphics li
ii  libpango1.0-0          1.14.8-5          Layout and rendering of internatio
ii  libpng12-0             1.2.15~beta5-1    PNG library - runtime
ii  libpoppler-glib1       0.5.4-6           PDF rendering library (GLib-based 
ii  librsvg2-2             2.16.1-2          SAX-based renderer library for SVG
ii  libtiff4               3.8.2-7           Tag Image File Format (TIFF) libra
ii  libwmf0.2-7            0.2.8.4-6         Windows metafile conversion librar
ii  libx11-6               2:1.0.3-7         X11 client-side library
ii  libxcursor1            1.1.7-4           X cursor management library
ii  libxext6               1:1.0.1-2         X11 miscellaneous extension librar
ii  libxfixes3             1:4.0.1-5         X11 miscellaneous 'fixes' extensio
ii  libxi6                 1:1.0.1-4         X11 Input extension library
ii  libxinerama1           1:1.0.1-4.1       X11 Xinerama extension library
ii  libxmu6                1:1.0.2-2         X11 miscellaneous utility library
ii  libxpm4                1:3.5.5-2         X11 pixmap library
ii  libxrandr2             2:1.2.1-1         X11 RandR extension library
ii  libxrender1            1:0.9.1-3         X Rendering Extension client libra
ii  zlib1g                 1:1.2.3-13        compression library - runtime

Versions of packages gimp recommends:
ii  gimp-gnomevfs                 2.4.2-1.1  GNOME-VFS URI plugin for GIMP
pn  gimp-python                   <none>     (no description available)

-- no debconf information
Gruß
   Klaus
-- 
Klaus Ethgen                            http://www.ethgen.de/
pub  2048R/D1A4EDE5 2000-02-26 Klaus Ethgen <[EMAIL PROTECTED]>
Fingerprint: D7 67 71 C4 99 A6 D4 FE  EA 40 30 57 3C 88 26 2B
diff -Nur gimp-2.4.2.orig/gimptool-win32.c.in gimp-2.4.2/gimptool-win32.c.in
--- gimp-2.4.2.orig/gimptool-win32.c.in	2007-11-20 10:33:50.000000000 +0100
+++ gimp-2.4.2/gimptool-win32.c.in	2007-12-01 18:17:44.000000000 +0100
@@ -529,7 +529,11 @@
   const gchar slash = '/';
 #endif
 
-  return g_strdup_printf ("[EMAIL PROTECTED]@%cplug-ins",
+  if (g_getenv("HOME"))
+     return g_strdup_printf ("[EMAIL PROTECTED]@%cplug-ins",
+			  g_getenv ("HOME"), slash, slash);
+  else
+     return g_strdup_printf ("[EMAIL PROTECTED]@%cplug-ins",
 			  g_get_home_dir (), slash, slash);
 }
 
@@ -643,7 +647,11 @@
   const gchar slash = '/';
 #endif
 
-  return g_strdup_printf ("[EMAIL PROTECTED]@%cscripts",
+  if (g_getenv("HOME"))
+     return g_strdup_printf ("[EMAIL PROTECTED]@%cscripts",
+			  g_getenv ("HOME"), slash, slash);
+  else
+     return g_strdup_printf ("[EMAIL PROTECTED]@%cscripts",
 			  g_get_home_dir (), slash, slash);
 }
 
diff -Nur gimp-2.4.2.orig/libgimpbase/gimpenv.c gimp-2.4.2/libgimpbase/gimpenv.c
--- gimp-2.4.2.orig/libgimpbase/gimpenv.c	2007-11-20 10:33:50.000000000 +0100
+++ gimp-2.4.2/libgimpbase/gimpenv.c	2007-12-01 18:15:59.000000000 +0100
@@ -170,7 +170,9 @@
     return gimp_dir;
 
   env_gimp_dir = g_getenv ("GIMP2_DIRECTORY");
-  home_dir     = g_get_home_dir ();
+  home_dir = g_getenv ("HOME");
+  if (!home_dir)
+     home_dir = g_get_home_dir ();
 
   if (env_gimp_dir)
     {
@@ -571,8 +573,12 @@
       /* Special-case desktop for historical compatibility */
       if (gimp_user_directories[GIMP_USER_DIRECTORY_DESKTOP] == NULL)
         {
-          gimp_user_directories[GIMP_USER_DIRECTORY_DESKTOP] =
-            g_build_filename (g_get_home_dir (), "Desktop", NULL);
+	   if (g_getenv("HOME"))
+	      gimp_user_directories[GIMP_USER_DIRECTORY_DESKTOP] =
+		 g_build_filename (g_getenv ("HOME"), "Desktop", NULL);
+	   else
+	      gimp_user_directories[GIMP_USER_DIRECTORY_DESKTOP] =
+		 g_build_filename (g_get_home_dir (), "Desktop", NULL);
         }
     }
 
@@ -751,7 +757,9 @@
   if (!path || !*path || max_paths < 1 || max_paths > 256)
     return NULL;
 
-  home = g_get_home_dir ();
+  home = g_getenv ("HOME");
+  if (!home)
+     home = g_get_home_dir ();
 
   patharray = g_strsplit (path, G_SEARCHPATH_SEPARATOR_S, max_paths);
 
diff -Nur gimp-2.4.2.orig/libgimpbase/xdg-user-dir.c gimp-2.4.2/libgimpbase/xdg-user-dir.c
--- gimp-2.4.2.orig/libgimpbase/xdg-user-dir.c	2007-11-20 10:33:49.000000000 +0100
+++ gimp-2.4.2/libgimpbase/xdg-user-dir.c	2007-12-01 18:12:00.000000000 +0100
@@ -66,7 +66,9 @@
   gint         len;
   gint         relative;
 
-  home_dir = g_get_home_dir ();
+  home_dir = g_getenv ("HOME");
+  if (!home_dir)
+     home_dir = g_get_home_dir ();
 
   if (! home_dir)
     return NULL;
diff -Nur gimp-2.4.2.orig/libgimpconfig/gimpconfig-path.c gimp-2.4.2/libgimpconfig/gimpconfig-path.c
--- gimp-2.4.2.orig/libgimpconfig/gimpconfig-path.c	2007-11-20 10:33:43.000000000 +0100
+++ gimp-2.4.2/libgimpconfig/gimpconfig-path.c	2007-12-01 18:09:59.000000000 +0100
@@ -321,7 +321,10 @@
   gint         length   = 0;
   gint         i;
 
-  home = g_get_home_dir ();
+  home = g_getenv ("HOME");
+  if (!home)
+     home = g_get_home_dir ();
+
   if (home)
     home = gimp_filename_to_utf8 (home);
 
diff -Nur gimp-2.4.2.orig/libgimpthumb/gimp-thumbnail-list.c gimp-2.4.2/libgimpthumb/gimp-thumbnail-list.c
--- gimp-2.4.2.orig/libgimpthumb/gimp-thumbnail-list.c	2007-11-20 10:31:20.000000000 +0100
+++ gimp-2.4.2/libgimpthumb/gimp-thumbnail-list.c	2007-12-01 18:11:32.000000000 +0100
@@ -74,7 +74,9 @@
       return -1;
     }
 
-  home = g_get_home_dir ();
+  home = g_getenv ("HOME");
+  if (!home)
+     home = g_get_home_dir ();
 
   thumb_folder = g_build_filename (home, ".thumbnails", NULL);
   dir = g_dir_open (thumb_folder, 0, &error);
diff -Nur gimp-2.4.2.orig/libgimpthumb/gimpthumb-utils.c gimp-2.4.2/libgimpthumb/gimpthumb-utils.c
--- gimp-2.4.2.orig/libgimpthumb/gimpthumb-utils.c	2007-11-20 10:31:20.000000000 +0100
+++ gimp-2.4.2/libgimpthumb/gimpthumb-utils.c	2007-12-01 18:11:07.000000000 +0100
@@ -112,7 +112,9 @@
     }
   else
     {
-      const gchar *home_dir = g_get_home_dir ();
+      const gchar *home_dir = g_getenv ("HOME");
+      if (!home_dir)
+	 home_dir = g_get_home_dir ();
 
       if (home_dir && g_file_test (home_dir, G_FILE_TEST_IS_DIR))
         {

Attachment: signature.asc
Description: Digital signature

Reply via email to