packages: vice/vice-home_etc.patch - updated for 2.3
lisu
lisu at pld-linux.org
Wed Mar 23 13:05:39 CET 2011
Author: lisu Date: Wed Mar 23 12:05:39 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 2.3
---- Files affected:
packages/vice:
vice-home_etc.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/vice/vice-home_etc.patch
diff -u packages/vice/vice-home_etc.patch:1.5 packages/vice/vice-home_etc.patch:1.6
--- packages/vice/vice-home_etc.patch:1.5 Thu Mar 11 12:04:52 2010
+++ packages/vice/vice-home_etc.patch Wed Mar 23 13:05:34 2011
@@ -1,21 +1,52 @@
---- vice-2.2/src/arch/unix/archdep.c~ 2009-10-21 18:46:46.000000000 +0200
-+++ vice-2.2/src/arch/unix/archdep.c 2010-03-11 11:50:24.756830676 +0100
-@@ -135,6 +135,14 @@
+--- vice-2.2/src/arch/unix/archdep.h~ 2009-10-21 18:46:46.000000000 +0200
++++ vice-2.2/src/arch/unix/archdep.h 2010-03-11 11:51:47.773489033 +0100
+@@ -114,7 +114,7 @@
+ #define ARCHDEP_KEYBOARD_SYM_NONE 0
+ #endif
+
+-extern const char *archdep_home_path(void);
++extern const char *archdep_home_etc_path(void);
+
+ /* set this path to customize the preference storage */
+ extern const char *archdep_pref_path;
+--- vice-2.2/src/arch/unix/gui/uicommands.c~ 2009-10-21 18:46:40.000000000 +0200
++++ vice-2.2/src/arch/unix/gui/uicommands.c 2010-03-11 11:53:07.350154527 +0100
+@@ -296,7 +296,7 @@
+
+ static UI_CALLBACK(load_quicksnap)
+ {
+- char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
++ char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
+
+ if (!ui_emulation_is_paused()) {
+ interrupt_maincpu_trigger_trap(load_snapshot_trap, (void *)fname);
+@@ -328,7 +328,7 @@
+
+ static UI_CALLBACK(save_quicksnap)
+ {
+- char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
++ char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
+
+ interrupt_maincpu_trigger_trap(save_snapshot_trap, (void *)fname);
+ }
+--- vice-2.3/src/arch/unix/archdep.c~ 2010-10-24 06:12:37.000000000 +0200
++++ vice-2.3/src/arch/unix/archdep.c 2011-03-23 12:15:18.370096657 +0100
+@@ -151,6 +151,14 @@
return home;
}
+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;
-@@ -148,7 +156,7 @@
+@@ -164,7 +172,7 @@
const char *home_path;
boot_path = archdep_boot_path();
@@ -24,7 +55,7 @@
/* First search in the `LIBDIR' then the $HOME/.vice/ dir (home_path)
and then in the `boot_path'. */
-@@ -214,7 +222,7 @@
+@@ -230,7 +238,7 @@
if (archdep_pref_path == NULL) {
const char *home;
@@ -33,25 +64,25 @@
return util_concat(home, "/.vice/vicerc", NULL);
} else {
return util_concat(archdep_pref_path, "/vicerc", NULL);
-@@ -226,7 +234,7 @@
+@@ -242,7 +250,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);
+ return util_concat(home, "/.vice/fliplist-", machine_get_name(), ".vfl", NULL);
} else {
- return util_concat(archdep_pref_path, "/fliplist-", machine_name, ".vfl", NULL);
-@@ -238,7 +246,7 @@
+ return util_concat(archdep_pref_path, "/fliplist-", machine_get_name(), ".vfl", NULL);
+@@ -254,7 +262,7 @@
if (archdep_pref_path == NULL) {
const char *home;
- home = archdep_home_path();
+ home = archdep_home_etc_path();
- return util_concat(home, "/.vice/autostart-", machine_name, ".d64", NULL);
+ return util_concat(home, "/.vice/autostart-", machine_get_name(), ".d64", NULL);
} else {
- return util_concat(archdep_pref_path, "/autostart-", machine_name, ".d64", NULL);
-@@ -252,7 +260,7 @@
+ return util_concat(archdep_pref_path, "/autostart-", machine_get_name(), ".d64", NULL);
+@@ -268,7 +276,7 @@
const char *viceuserdir;
if (archdep_pref_path == NULL) {
@@ -60,34 +91,3 @@
viceuserdir = util_concat(home, "/.vice", NULL);
} else {
viceuserdir = archdep_pref_path;
---- vice-2.2/src/arch/unix/archdep.h~ 2009-10-21 18:46:46.000000000 +0200
-+++ vice-2.2/src/arch/unix/archdep.h 2010-03-11 11:51:47.773489033 +0100
-@@ -114,7 +114,7 @@
- #define ARCHDEP_KEYBOARD_SYM_NONE 0
- #endif
-
--extern const char *archdep_home_path(void);
-+extern const char *archdep_home_etc_path(void);
-
- /* set this path to customize the preference storage */
- extern const char *archdep_pref_path;
---- vice-2.2/src/arch/unix/gui/uicommands.c~ 2009-10-21 18:46:40.000000000 +0200
-+++ vice-2.2/src/arch/unix/gui/uicommands.c 2010-03-11 11:53:07.350154527 +0100
-@@ -296,7 +296,7 @@
-
- static UI_CALLBACK(load_quicksnap)
- {
-- char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
-+ char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
-
- if (!ui_emulation_is_paused()) {
- interrupt_maincpu_trigger_trap(load_snapshot_trap, (void *)fname);
-@@ -328,7 +328,7 @@
-
- static UI_CALLBACK(save_quicksnap)
- {
-- char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
-+ char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
-
- interrupt_maincpu_trigger_trap(save_snapshot_trap, (void *)fname);
- }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vice/vice-home_etc.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list