From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 21 Apr 2006 23:40:26 +0000 (+0000)
Subject: - orphaned, outdated
X-Git-Tag: auto/th/aterm-1_0_1-1~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Faterm.git;a=commitdiff_plain;h=dbf313fc52a1c54b5e23391c0a109e8a3ac1d9ee;ds=sidebyside

- orphaned, outdated

Changed files:
    aterm-home_etc.patch -> 1.2
---

diff --git a/aterm-home_etc.patch b/aterm-home_etc.patch
deleted file mode 100644
index 6b229c1..0000000
--- a/aterm-home_etc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Nru aterm-0.4.2/src/xdefaults.c aterm-0.4.2.new/src/xdefaults.c
---- aterm-0.4.2/src/xdefaults.c	Thu Sep  6 16:38:07 2001
-+++ aterm-0.4.2.new/src/xdefaults.c	Sun Mar 23 13:01:37 2003
-@@ -957,21 +957,38 @@
- # else				/* USE_XGETDEFAULT */
- /* get resources the hard way, but save lots of memory */
-     const char     *fname[] = { ".Xdefaults", ".Xresources" };
-+    const char     *fname2[] = { "Xdefaults", "Xresources" };
-     FILE           *fd = NULL;
-     char           *home;
-+    char           *config_dir = getenv("CONFIG_DIR");
-+    
-+    if (config_dir != NULL) {
-+	    int             i, len = strlen(config_dir) + 2;
-+	    char           *f = NULL;
- 
--    if ((home = getenv("HOME")) != NULL) {
--	int             i, len = strlen(home) + 2;
--	char           *f = NULL;
--
--	for (i = 0; i < (sizeof(fname) / sizeof(fname[0])); i++) {
--	    f = REALLOC(f, (len + strlen(fname[i])) * sizeof(char));
--
--	    sprintf(f, "%s/%s", home, fname[i]);
--
--	    if ((fd = fopen(f, "r")) != NULL)
--		break;
--	}
-+	    for (i = 0; i < (sizeof(fname2) / sizeof(fname2[0])); i++) {
-+	        f = REALLOC(f, (len + strlen(fname2[i])) * sizeof(char));
-+
-+	        sprintf(f, "%s/%s", config_dir, fname2[i]);
-+
-+	        if ((fd = fopen(f, "r")) != NULL)
-+		    break;
-+	    }
-+    } else {
-+
-+        if ((home = getenv("HOME")) != NULL) {
-+	    int             i, len = strlen(home) + 2;
-+	    char           *f = NULL;
-+
-+	    for (i = 0; i < (sizeof(fname) / sizeof(fname[0])); i++) {
-+	        f = REALLOC(f, (len + strlen(fname[i])) * sizeof(char));
-+
-+	        sprintf(f, "%s/%s", home, fname[i]);
-+
-+	        if ((fd = fopen(f, "r")) != NULL)
-+		    break;
-+	    }
-+    }
- 	FREE(f);
-     }
- /*