- release 2

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

diff --git a/abiword-home_etc.patch b/abiword-home_etc.patch
index ccaaf91cc085c2c61c6a6c4695ad524d23372f6a..ed0f1b6343bf5f64281e50cfdaa67512cc14760f 100644 (file)
--- a/abiword-home_etc.patch
+++ b/abiword-home_etc.patch
@@ -22,37 +22,6 @@ diff -Nru abiword-2.0.1.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp abiword-2.0.1/abi
        if (!szHome || !*szHome)
                szHome = "./";
        
---- abiword-2.0.1.orig/abi/src/other/pango/pango/mini-xft/minixftcfg.c 2002-05-12 21:12:49.000000000 +0200
-+++ abiword-2.0.1/abi/src/other/pango/pango/mini-xft/minixftcfg.c      2003-11-14 09:50:19.000000000 +0100
-@@ -50,7 +50,7 @@
- 
-     if (*d == '~')
-     {
--      h = getenv ("HOME");
-+      h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME");
-       if (!h)
-           return False;
-       dir = (char *) malloc (strlen (h) + strlen (d));
-@@ -93,7 +93,7 @@
- 
-     if (*c == '~')
-     {
--      h = getenv ("HOME");
-+      h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME");
-       if (!h)
-           return False;
-       new = (char *) malloc (strlen (h) + strlen (c));
---- abiword-2.0.1.orig/abi/src/other/pango/pango/mini-xft/minixftlex.l 2002-05-12 21:12:55.000000000 +0200
-+++ abiword-2.0.1/abi/src/other/pango/pango/mini-xft/minixftlex.l      2003-11-14 09:51:17.000000000 +0100
-@@ -212,7 +212,7 @@
-     t = s;
-     if (*s == '~')
-     {
--      h = getenv ("HOME");
-+      h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME");
-       if (h)
-       {
-           t = (char *) malloc (strlen (h) + strlen (s));
 --- abiword-2.0.1.orig/popt/poptconfig.c       2002-11-11 03:00:51.000000000 +0100
 +++ abiword-2.0.1/popt/poptconfig.c    2003-11-14 09:55:31.000000000 +0100
 @@ -144,7 +144,9 @@