SOURCES: vice-FHS.patch, vice-gettext.patch, vice-home_etc.patch -...

lisu lisu at pld-linux.org
Sun Jul 15 17:10:53 CEST 2007 

Author: lisu                         Date: Sun Jul 15 15:10:53 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adapted for 1.21 version

---- Files affected:
SOURCES:
   vice-FHS.patch (1.3 -> 1.4) , vice-gettext.patch (1.3 -> 1.4) , vice-home_etc.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/vice-FHS.patch
diff -u SOURCES/vice-FHS.patch:1.3 SOURCES/vice-FHS.patch:1.4
--- SOURCES/vice-FHS.patch:1.3	Fri Jan 27 16:00:33 2006
+++ SOURCES/vice-FHS.patch	Sun Jul 15 17:10:48 2007
@@ -1,8 +1,7 @@
-diff -urN vice-1.16.orig/src/arch/unix/x11/gnome/x11ui.c vice-1.16/src/arch/unix/x11/gnome/x11ui.c
---- vice-1.16.orig/src/arch/unix/x11/gnome/x11ui.c	2005-01-22 14:34:43.000000000 +0100
-+++ vice-1.16/src/arch/unix/x11/gnome/x11ui.c	2005-02-06 15:57:30.000000000 +0100
-@@ -401,9 +401,9 @@
-     gnome_init(PACKAGE, VERSION, 1, fake_argv);
+--- vice-1.21/src/arch/unix/x11/gnome/x11ui.c~	2007-03-04 22:47:42.000000000 +0100
++++ vice-1.21/src/arch/unix/x11/gnome/x11ui.c	2007-07-06 19:51:34.000000000 +0200
+@@ -425,9 +425,9 @@
+     gtk_init(&fake_argc, &fake_args);
  
      /* set X11 fontpath */
 -    if (access(PREFIX "/lib/vice/fonts/fonts.dir", R_OK) == 0)
@@ -13,7 +12,7 @@
  	
  	if (system(cmd) != 0)
  	    fprintf(stderr, _("Can't add fontpath `%s'.\n"), cmd);
-@@ -1362,7 +1362,7 @@
+@@ -1435,7 +1435,7 @@
  	ui_dispatch_events();
  
  	/* remove fontpath, Don't care about result */
@@ -22,11 +21,10 @@
  
          lib_free(s);	
  	exit(0);
-diff -urN vice-1.16.orig/src/arch/unix/archdep.h vice-1.16/src/arch/unix/archdep.h
---- vice-1.16.orig/src/arch/unix/archdep.h	2005-02-06 12:10:34.000000000 +0100
-+++ vice-1.16/src/arch/unix/archdep.h	2005-02-06 12:45:03.000000000 +0100
-@@ -91,7 +91,7 @@
- extern const char *archdep_home_etc_path(void);
+--- vice-1.21/src/arch/unix/archdep.h~	2005-03-28 21:10:20.000000000 +0200
++++ vice-1.21/src/arch/unix/archdep.h	2007-07-06 19:53:16.000000000 +0200
+@@ -96,7 +96,7 @@
+ extern const char *archdep_home_path(void);
  
  /* Define the default system directory (where the ROMs are).  */
 -#define LIBDIR          PREFIX "/lib/vice"
@@ -34,48 +32,22 @@
  #define DOCDIR          LIBDIR "/doc"
  #define VICEUSERDIR     ".vice"
  
-diff -urN vice-1.16.orig/data/C128/Makefile.am vice-1.16/data/C128/Makefile.am
---- vice-1.16.orig/data/C128/Makefile.am	2003-07-27 20:19:46.000000000 +0200
-+++ vice-1.16/data/C128/Makefile.am	2005-02-06 12:08:38.000000000 +0100
+--- vice-1.21/configure.in~	2007-03-04 22:58:50.000000000 +0100
++++ vice-1.21/configure.in	2007-07-06 20:00:05.000000000 +0200
+@@ -1891,7 +1891,7 @@
+ 		   [Where do we want to install the executable?])
+ 
+ dnl Path for keymaps, ROMs etc.
+-VICEDIR="$PREFIX/lib/vice";
++VICEDIR="/usr/share/vice";
+ AC_SUBST(VICEDIR)
+ 
+ if false ; then
+--- vice-1.21/data/fonts/Makefile.am~	2006-01-30 22:48:17.000000000 +0100
++++ vice-1.21/data/fonts/Makefile.am	2007-07-06 21:34:07.000000000 +0200
 @@ -1,4 +1,4 @@
--c128dir = $(prefix)/lib/vice/C128
-+c128dir = $(datadir)/vice/C128
- 
- c128_DATA = \
- 	basic64 \
-diff -urN vice-1.16.orig/data/C64/Makefile.am vice-1.16/data/C64/Makefile.am
---- vice-1.16.orig/data/C64/Makefile.am	2004-12-19 19:28:01.000000000 +0100
-+++ vice-1.16/data/C64/Makefile.am	2005-02-06 12:08:42.000000000 +0100
-@@ -1,4 +1,4 @@
--c64dir = $(prefix)/lib/vice/C64
-+c64dir = $(datadir)/vice/C64
- 
- c64_DATA = \
- 	basic \
-diff -urN vice-1.16.orig/data/CBM-II/Makefile.am vice-1.16/data/CBM-II/Makefile.am
---- vice-1.16.orig/data/CBM-II/Makefile.am	2004-12-19 20:00:59.000000000 +0100
-+++ vice-1.16/data/CBM-II/Makefile.am	2005-02-06 12:08:08.000000000 +0100
-@@ -1,4 +1,4 @@
--cbm2dir = $(prefix)/lib/vice/CBM-II
-+cbm2dir = $(datadir)/vice/CBM-II
- 
- cbm2_DATA = \
- 	amber.vpl \
-diff -urN vice-1.16.orig/data/DRIVES/Makefile.am vice-1.16/data/DRIVES/Makefile.am
---- vice-1.16.orig/data/DRIVES/Makefile.am	2003-10-06 00:10:01.000000000 +0200
-+++ vice-1.16/data/DRIVES/Makefile.am	2005-02-06 12:08:33.000000000 +0100
-@@ -1,4 +1,4 @@
--drvdir = $(prefix)/lib/vice/DRIVES
-+drvdir = $(datadir)/vice/DRIVES
- 
- drv_DATA = \
- 	dos1541 \
-diff -urN vice-1.16.orig/data/fonts/Makefile.am vice-1.16/data/fonts/Makefile.am
---- vice-1.16.orig/data/fonts/Makefile.am	2003-11-08 14:34:41.000000000 +0100
-+++ vice-1.16/data/fonts/Makefile.am	2005-02-06 12:08:27.000000000 +0100
-@@ -1,4 +1,4 @@
--fontsdir = $(prefix)/lib/vice/fonts
-+fontsdir = $(datadir)/fonts/misc
+-fontsdir = $(VICEDIR)/fonts
++fontsdir = /usr/share/fonts/misc
  
  fonts_DATA = \
  	vice-cbm.bdf
@@ -83,67 +55,9 @@
  
  install: install-data-am
  	@echo "Preparing fontdir..." ; \
--	cd $(DESTDIR)$(prefix)/lib/vice/fonts ; \
+-	cd $(DESTDIR)$(fontsdir) ; \
 +	cd $(DESTDIR)$(datadir)/fonts/misc ; \
  	bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
 -	rm vice-cbm.bdf ; \
 -	mkfontdir .
 +	rm vice-cbm.bdf
-diff -urN vice-1.16.orig/data/PET/Makefile.am vice-1.16/data/PET/Makefile.am
---- vice-1.16.orig/data/PET/Makefile.am	2004-12-19 19:46:18.000000000 +0100
-+++ vice-1.16/data/PET/Makefile.am	2005-02-06 12:08:40.000000000 +0100
-@@ -42,7 +42,7 @@
- 	rom4b80.vrs \
- 	rom4g40.vrs
- 
--petdir = $(prefix)/lib/vice/PET
-+petdir = $(datadir)/vice/PET
- 
- pet_DATA = $(keymaps) $(roms) $(palettes) $(romsets)
- 
-diff -urN vice-1.16.orig/data/PLUS4/Makefile.am vice-1.16/data/PLUS4/Makefile.am
---- vice-1.16.orig/data/PLUS4/Makefile.am	2002-06-08 20:53:02.000000000 +0200
-+++ vice-1.16/data/PLUS4/Makefile.am	2005-02-06 12:08:31.000000000 +0100
-@@ -1,4 +1,4 @@
--plus4dir = $(prefix)/lib/vice/PLUS4
-+plus4dir = $(datadir)/vice/PLUS4
- 
- plus4_DATA = \
- 	3plus1hi \
-diff -urN vice-1.16.orig/data/PRINTER/Makefile.am vice-1.16/data/PRINTER/Makefile.am
---- vice-1.16.orig/data/PRINTER/Makefile.am	2003-11-10 16:14:54.000000000 +0100
-+++ vice-1.16/data/PRINTER/Makefile.am	2005-02-06 12:08:21.000000000 +0100
-@@ -1,4 +1,4 @@
--prtdir = $(prefix)/lib/vice/PRINTER
-+prtdir = $(datadir)/vice/PRINTER
- 
- prt_DATA = \
- 	cbm1526 \
-diff -urN vice-1.16.orig/data/VIC20/Makefile.am vice-1.16/data/VIC20/Makefile.am
---- vice-1.16.orig/data/VIC20/Makefile.am	2002-06-08 20:53:02.000000000 +0200
-+++ vice-1.16/data/VIC20/Makefile.am	2005-02-06 12:08:29.000000000 +0100
-@@ -1,5 +1,5 @@
- 
--vic20dir = $(prefix)/lib/vice/VIC20
-+vic20dir = $(datadir)/vice/VIC20
- 
- vic20_DATA = \
- 	basic \
-diff -urN vice-1.16.orig/doc/html/Makefile.am vice-1.16/doc/html/Makefile.am
---- vice-1.16.orig/doc/html/Makefile.am	2004-01-18 22:25:31.000000000 +0100
-+++ vice-1.16/doc/html/Makefile.am	2005-02-06 12:08:47.000000000 +0100
-@@ -1,4 +1,4 @@
--docdir = $(prefix)/lib/vice/doc
-+docdir = $(datadir)/vice/doc
- 
- doc_DATA = \
- 	images/new.gif \
-diff -urN vice-1.16.orig/doc/Makefile.am vice-1.16/doc/Makefile.am
---- vice-1.16.orig/doc/Makefile.am	2004-03-13 15:29:54.000000000 +0100
-+++ vice-1.16/doc/Makefile.am	2005-02-06 12:08:44.000000000 +0100
-@@ -1,4 +1,4 @@
--docdir = $(prefix)/lib/vice/doc
-+docdir = $(datadir)/vice/doc
- 
- doc_DATA = \
- 	MSDOS-Howto.txt \

================================================================
Index: SOURCES/vice-gettext.patch
diff -u SOURCES/vice-gettext.patch:1.3 SOURCES/vice-gettext.patch:1.4
--- SOURCES/vice-gettext.patch:1.3	Fri Jan 27 16:00:33 2006
+++ SOURCES/vice-gettext.patch	Sun Jul 15 17:10:48 2007
@@ -1,8 +1,8 @@
---- vice-1.12/configure.in.orig	2003-06-09 00:06:31.000000000 +0200
-+++ vice-1.12/configure.in	2003-07-20 22:20:49.000000000 +0200
-@@ -272,127 +272,10 @@
+--- vice-1.21/configure.in~	2007-07-06 20:08:39.000000000 +0200
++++ vice-1.21/configure.in	2007-07-06 20:11:54.000000000 +0200
+@@ -418,129 +418,10 @@
  dnl Add new languages here
- ALL_LINGUAS="de fr it sv pl nl"
+ ALL_LINGUAS="de fr it sv pl nl hu"
  
 -dnl These rules are solely for the distribution goal.  While doing this
 -dnl we only have to keep exactly one list of the available catalogs
@@ -14,7 +14,7 @@
 -AC_SUBST(GMOFILES)
 -AC_SUBST(POFILES)
 -
--if test x"$enable_nls" != x"no" ; then
+-if test x"$enable_nls" != "xno" -a x"$is_unix" = "xyes"; then
 -  AC_CHECK_HEADER(libintl.h,
 -    [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
 -      [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
@@ -109,11 +109,13 @@
 -  GENCAT=
 -  AC_SUBST(GENCAT)
 -else
--  AC_MSG_WARN([disabling NLS on user request])
+-  if test x"$is_unix" = "xyes"; then
+-    AC_MSG_WARN([disabling NLS on user request])
+-  fi
 -  USE_NLS=no
 -fi
 -
--if test x"$USE_NLS" = x"" ; then
+-if test x"$USE_NLS" = "x" ; then
 -  USE_NLS=no
 -fi
 -if test "$MSGFMT" = "no" ; then

================================================================
Index: SOURCES/vice-home_etc.patch
diff -u SOURCES/vice-home_etc.patch:1.2 SOURCES/vice-home_etc.patch:1.3
--- SOURCES/vice-home_etc.patch:1.2	Tue Feb 22 23:42:49 2005
+++ SOURCES/vice-home_etc.patch	Sun Jul 15 17:10:48 2007
@@ -1,8 +1,7 @@
-diff -Nru vice-1.13.orig/src/arch/unix/archdep.c vice-1.13/src/arch/unix/archdep.c
---- vice-1.13.orig/src/arch/unix/archdep.c	2003-04-24 21:00:14.000000000 +0200
-+++ vice-1.13/src/arch/unix/archdep.c	2003-11-09 13:56:07.000000000 +0100
-@@ -115,6 +115,14 @@
-     return home;
+--- 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 @@
+ #endif
  }
  
 +const char *archdep_home_etc_path(void)
@@ -10,13 +9,13 @@
 +    char *home_etc = getenv("HOME_ETC");
 +
 +    if (home_etc) return home_etc;
-+		return archdep_home_path();
++               return archdep_home_path();
 +}
 +
  char *archdep_default_sysfile_pathlist(const char *emu_id)
  {
      static char *default_path;
-@@ -124,7 +132,7 @@
+@@ -134,7 +142,7 @@
          const char *home_path;
  
          boot_path = archdep_boot_path();
@@ -25,7 +24,7 @@
  
          /* First search in the `LIBDIR' then the $HOME/.vice/ dir (home_path)
             and then in the `boot_path'.  */
-@@ -161,7 +169,7 @@
+@@ -222,7 +230,7 @@
  {
      const char *home;
  
@@ -34,7 +33,7 @@
      return util_concat(home, "/.vice/vicerc", NULL);
  }
  
-@@ -169,7 +177,7 @@
+@@ -230,7 +238,7 @@
  {
      const char *home;
  
@@ -43,7 +42,7 @@
      return util_concat(home, "/.vice/fliplist-", machine_name, ".vfl", NULL);
  }
  
-@@ -179,7 +187,7 @@
+@@ -240,7 +248,7 @@
      const char *home;
      char *viceuserdir;
  
@@ -52,21 +51,20 @@
  
      viceuserdir = util_concat(home, "/.vice", NULL);
  
-diff -Nru vice-1.13.orig/src/arch/unix/archdep.h vice-1.13/src/arch/unix/archdep.h
---- vice-1.13.orig/src/arch/unix/archdep.h	2002-12-02 20:19:02.000000000 +0100
-+++ vice-1.13/src/arch/unix/archdep.h	2003-11-09 13:56:41.000000000 +0100
-@@ -76,6 +76,7 @@
- #define ARCHDEP_RAWDRIVE_DEFAULT "/dev/fd0"
+--- 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"
  
- extern const char *archdep_home_path(void);
+-extern const char *archdep_home_path(void);
 +extern const char *archdep_home_etc_path(void);
  
- #endif
- 
-diff -Nru vice-1.13.orig/src/arch/unix/uicommands.c vice-1.13/src/arch/unix/uicommands.c
---- vice-1.13.orig/src/arch/unix/uicommands.c	2003-09-07 19:30:12.000000000 +0200
-+++ vice-1.13/src/arch/unix/uicommands.c	2003-11-09 13:57:50.000000000 +0100
-@@ -478,7 +478,7 @@
+ /* 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
+@@ -295,7 +295,7 @@
  
  static UI_CALLBACK(load_quicksnap)
  {
@@ -75,7 +73,7 @@
          machine_name, ".vsf", NULL);
  
      if (!ui_emulation_is_paused())
-@@ -510,7 +510,7 @@
+@@ -327,7 +327,7 @@
  
  static UI_CALLBACK(save_quicksnap)
  {
================================================================

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

More information about the pld-cvs-commit mailing list