SOURCES: vice-home_etc.patch - adjust for 2.0 version

[lisu]

Author: lisu                         Date: Thu Nov 27 08:39:33 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjust for 2.0 version

---- Files affected:
SOURCES:
   vice-home_etc.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/vice-home_etc.patch
diff -u SOURCES/vice-home_etc.patch:1.3 SOURCES/vice-home_etc.patch:1.4
--- SOURCES/vice-home_etc.patch:1.3	Sun Jul 15 17:10:48 2007
+++ SOURCES/vice-home_etc.patch	Thu Nov 27 09:39:28 2008
@@ -1,21 +1,21 @@
---- vice-1.21/src/arch/unix/archdep.c~	2007-02-25 18:31:39.000000000 +0100
-+++ vice-1.21/src/arch/unix/archdep.c	2007-07-15 15:41:55.000000000 +0200
-@@ -121,6 +121,14 @@
+--- vice-2.0/src/arch/unix/archdep.c.old	2008-11-26 15:14:36.000000000 +0100
++++ vice-2.0/src/arch/unix/archdep.c	2008-11-26 15:16:33.000000000 +0100
+@@ -131,6 +131,14 @@
  #endif
  }
  
-+const char *archdep_home_etc_path(void)
++extern const char *archdep_home_etc_path(void)
 +{
-+    char *home_etc = getenv("HOME_ETC");
++	char *home_etc = getenv("HOME_ETC");
 +
-+    if (home_etc) return home_etc;
-+               return archdep_home_path();
++	if (home_etc) return home_etc;
++		return archdep_home_path();
 +}
 +
  char *archdep_default_sysfile_pathlist(const char *emu_id)
  {
      static char *default_path;
-@@ -134,7 +142,7 @@
+@@ -144,7 +152,7 @@
          const char *home_path;
  
          boot_path = archdep_boot_path();
@@ -24,46 +24,46 @@
  
          /* First search in the `LIBDIR' then the $HOME/.vice/ dir (home_path)
             and then in the `boot_path'.  */
-@@ -222,7 +230,7 @@
- {
-     const char *home;
- 
--    home = archdep_home_path();
-+    home = archdep_home_etc_path();
-     return util_concat(home, "/.vice/vicerc", NULL);
- }
- 
-@@ -230,7 +238,7 @@
- {
-     const char *home;
- 
--    home = archdep_home_path();
-+    home = archdep_home_etc_path();
-     return util_concat(home, "/.vice/fliplist-", machine_name, ".vfl", NULL);
- }
- 
-@@ -240,7 +248,7 @@
-     const char *home;
-     char *viceuserdir;
- 
--    home = archdep_home_path();
-+    home = archdep_home_etc_path();
- 
-     viceuserdir = util_concat(home, "/.vice", NULL);
- 
---- vice-1.21/src/arch/unix/archdep.h~	2007-07-15 15:37:48.000000000 +0200
-+++ vice-1.21/src/arch/unix/archdep.h	2007-07-15 15:42:59.000000000 +0200
-@@ -93,7 +93,7 @@
- /* Ethernet default device */
- #define ARCHDEP_ETHERNET_DEFAULT_DEVICE "eth0"
+@@ -237,7 +245,7 @@
+     if(archdep_pref_path==NULL) {
+       const char *home;
+       
+-      home = archdep_home_path();
++      home = archdep_home_etc_path();
+       return util_concat(home, "/.vice/vicerc", NULL);
+     } else {
+       return util_concat(archdep_pref_path, "/vicerc", NULL);
+@@ -249,7 +257,7 @@
+     if(archdep_pref_path==NULL) {
+       const char *home;
+ 
+-      home = archdep_home_path();
++      home = archdep_home_etc_path();
+       return util_concat(home, "/.vice/fliplist-", machine_name, ".vfl", NULL);
+     } else {
+       return util_concat(archdep_pref_path, "/fliplist-", machine_name, ".vfl", NULL);
+@@ -263,7 +271,7 @@
+     const char *viceuserdir;
+ 
+     if(archdep_pref_path==NULL) {
+-      home = archdep_home_path();
++      home = archdep_home_etc_path();
+       viceuserdir = util_concat(home, "/.vice", NULL);
+     } else {
+       viceuserdir = archdep_pref_path;
+--- vice-2.0/src/arch/unix/archdep.h~	2008-07-07 20:23:10.000000000 +0200
++++ vice-2.0/src/arch/unix/archdep.h	2008-11-26 15:18:28.000000000 +0100
+@@ -103,7 +103,7 @@
+ /* No key symcode.  */
+ #define ARCHDEP_KEYBOARD_SYM_NONE 0
  
 -extern const char *archdep_home_path(void);
 +extern const char *archdep_home_etc_path(void);
  
- /* Define the default system directory (where the ROMs are).  */
- #define LIBDIR          PREFIX "/share/vice"
---- vice-1.21/src/arch/unix/gui/uicommands.c~	2007-02-11 23:57:19.000000000 +0100
-+++ vice-1.21/src/arch/unix/gui/uicommands.c	2007-07-15 15:44:24.000000000 +0200
+ /* set this path to customize the preference storage */ 
+ extern const char *archdep_pref_path;
+--- vice-2.0/src/arch/unix/gui/uicommands.c~	2008-07-07 20:22:35.000000000 +0200
++++ vice-2.0/src/arch/unix/gui/uicommands.c	2008-11-26 15:20:21.000000000 +0100
 @@ -295,7 +295,7 @@
  
  static UI_CALLBACK(load_quicksnap)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/vice-home_etc.patch?r1=1.3&r2=1.4&f=u