File fix_syntax_errors.patch of Package nonpareil

Overview Repositories Revisions Requests Users Attributes Meta

File fix_syntax_errors.patch of Package nonpareil (Revision f94765d05fc2ba3aa5797ef988959d06)

Currently displaying revision f94765d05fc2ba3aa5797ef988959d06 , Show latest

diff -Naur nonpareil-0.78/image/SConscript nonpareil-0.78-new/image/SConscript
--- nonpareil-0.78/image/SConscript	2006-10-31 03:26:16.000000000 -0300
+++ nonpareil-0.78-new/image/SConscript	2023-10-16 13:22:21.456723764 -0300
@@ -55,7 +55,7 @@
 # build Voyager PNG images from the PNM pieces (base image + segment image)
 #-----------------------------------------------------------------------------
 
-vimg_env = env.Copy ()
+vimg_env = env.Clone ()
 
 def VPNM2PNG_Emitter (target, source, env):
     source.append (voyager_segment_pnm)
diff -Naur nonpareil-0.78/SConstruct nonpareil-0.78-new/SConstruct
--- nonpareil-0.78/SConstruct	2006-10-31 03:26:17.000000000 -0300
+++ nonpareil-0.78-new/SConstruct	2023-10-16 13:21:17.743336201 -0300
@@ -27,21 +27,21 @@
 # Options
 #-----------------------------------------------------------------------------
 
-opts = Options (conf_file)
+opts = Variables (conf_file)
 
-opts.AddOptions (EnumOption ('host',
+opts.AddVariables (EnumVariable ('host',
 			     help = 'host build platform',
 			     allowed_values = ('posix', 'win32'),
 			     default = 'posix',
 			     ignorecase = 1),
 
-		 EnumOption ('target',
+		 EnumVariable ('target',
 			     help = 'execution target platform',
 			     allowed_values = ('posix', 'win32'),
 			     default = 'posix',
 			     ignorecase = 1),
 
-		 PathOption ('prefix',
+		 PathVariable ('prefix',
 			     'installation path prefix',
 			     '/usr/local'),
 
@@ -59,25 +59,25 @@
 		  'installation virtual root directory (for packaging)',
 		  ''),
 
-		 BoolOption ('debug',
+		 BoolVariable ('debug',
 			     help = 'compile for debugging',
 			     default = 1),
 
 		 # Feature switches:
 
-		 BoolOption ('has_debugger_gui',
+		 BoolVariable ('has_debugger_gui',
 			     help = 'enable debugger GUI interface',
 			     default = 0),
 
-		 BoolOption ('has_debugger_cli',
+		 BoolVariable ('has_debugger_cli',
 			     help = 'enable debugger command-line interface',
 			     default = 0),
 
-		 BoolOption ('use_tcl',
+		 BoolVariable ('use_tcl',
 			     help = 'use Tcl as debug command interpreter (only when debugger CLI is enabled)',
 			     default = 1),  # only if has_debugger_cli
 
-		 BoolOption ('use_readline',
+		 BoolVariable ('use_readline',
 			     help = 'use Readline library for command editing and history (only when debugger CLI is enabled)',
 			     default = 1))  # only if has_debugger_cli
 
@@ -120,9 +120,10 @@
 
     try:
         os.mkdir (treedir)
-    except OSError, (errnum, strerror):
+    except OSError as xxx_todo_changeme:
+        (errnum, strerror) = xxx_todo_changeme.args
         if errnum != errno.EEXIST:
-            print 'mkdir ', treedir, ':', strerror
+            print('mkdir ', treedir, ':', strerror)
 
     cmd = 'tar cf - '
     #
@@ -137,7 +138,7 @@
 
 def tarballer (target, source, env):            
     cmd = 'tar -czf ' + str (target[0]) +  ' ' + str(source[0])
-    print 'running ', cmd, ' ... '
+    print('running ', cmd, ' ... ')
     p = os.popen (cmd)
     return p.close ()
 
@@ -235,7 +236,7 @@
 # host platform code
 #-----------------------------------------------------------------------------
 
-native_env = env.Copy ()
+native_env = env.Clone ()
 native_env ['build_target_only'] = 0
 SConscript ('src/SConscript',
             build_dir = 'build/' + env ['host'],
@@ -256,7 +257,7 @@
 #-----------------------------------------------------------------------------
 
 if (env ['host'] != env ['target']):
-	cross_build_env = env.Copy ()
+	cross_build_env = env.Clone ()
 	cross_build_env ['build_target_only'] = 1
 	SConscript ('src/SConscript',
 		    build_dir = 'build/' + env ['target'],
diff -Naur nonpareil-0.78/src/asm.h nonpareil-0.78-new/src/asm.h
--- nonpareil-0.78/src/asm.h	2006-10-31 03:26:16.000000000 -0300
+++ nonpareil-0.78-new/src/asm.h	2023-10-16 13:31:07.030504629 -0300
@@ -22,7 +22,7 @@
 
 extern int arch;
 
-int pass;
+extern int pass;
 extern int lineno;
 extern int errors;
 
diff -Naur nonpareil-0.78/src/printer.h nonpareil-0.78-new/src/printer.h
--- nonpareil-0.78/src/printer.h	2006-10-31 03:26:16.000000000 -0300
+++ nonpareil-0.78-new/src/printer.h	2023-10-16 13:29:29.253754505 -0300
@@ -41,5 +41,9 @@
 #define PRINTER_WINDOW_INITIAL_HEIGHT_PIXELS \
     (PRINTER_WINDOW_INITIAL_HEIGHT_LINES * PRINTER_LINE_HEIGHT_PIXELS)
 
+#if !defined(Z_BEST_COMPRESSION)
+#define Z_BEST_COMPRESSION 9
+#endif
+
 
 chip_t *gui_printer_init (sim_t *sim);
diff -Naur nonpareil-0.78/src/SConscript nonpareil-0.78-new/src/SConscript
--- nonpareil-0.78/src/SConscript	2006-10-31 03:26:16.000000000 -0300
+++ nonpareil-0.78-new/src/SConscript	2023-10-16 13:22:02.870041276 -0300
@@ -79,7 +79,7 @@
 state_io_objs = [build_env.Object(src) for src in state_io_srcs];
 state_io_packages = "gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0 glib-2.0 libxml-2.0"
 
-release_env = build_env.Copy (CPPDEFINES = { 'NONPAREIL_RELEASE': build_env ['RELEASE']})
+release_env = build_env.Clone (CPPDEFINES = { 'NONPAREIL_RELEASE': build_env ['RELEASE']})
 common_objs.append (release_env.Object ('release.c'))
 
 build_env.ParseConfig(pkg_config_cmd + state_io_packages)
@@ -89,7 +89,7 @@
 #-----------------------------------------------------------------------------
 
 if build_env ['build_target_only'] == 0:
-    str2png_env = build_env.Copy ()
+    str2png_env = build_env.Clone ()
 
     str2png_env.Append (CPPDEFINES = {'DEFAULT_PATH': 'image'})
 
@@ -196,7 +196,7 @@
 #-----------------------------------------------------------------------------
 
 if not build_target_only:
-    title_env = native_env.Copy (STR2PNG_STRING = 'NONPAREIL',
+    title_env = native_env.Clone (STR2PNG_STRING = 'NONPAREIL',
                                  STR2PNG_OPTS = '-x 40 -y 44 -m 10')
 
     title_env.STR2PNG (target = 'nonpareil_title',
@@ -205,7 +205,7 @@
     native_env.PNG2C (target = '#build/common/nonpareil_title_png.c',
                       source = 'nonpareil_title.png')
             
-    rgoose_env = native_env.Copy (STR2PNG_STRING = '.',
+    rgoose_env = native_env.Clone (STR2PNG_STRING = '.',
                                   STR2PNG_OPTS = '-x 40 -y 44')
 
     rgoose_env.STR2PNG (target = 'rgoose',
@@ -214,7 +214,7 @@
     native_env.PNG2C (target = '#build/common/rgoose_png.c',
                       source = 'rgoose.png')
             
-    lgoose_env = native_env.Copy (STR2PNG_STRING = ',',
+    lgoose_env = native_env.Clone (STR2PNG_STRING = ',',
                                   STR2PNG_OPTS = '-x 40 -y 44')
 
     lgoose_env.STR2PNG (target = 'lgoose',
@@ -235,7 +235,7 @@
 # nonpareil
 #-----------------------------------------------------------------------------
 
-nonpareil_env = build_env.Copy ()
+nonpareil_env = build_env.Clone ()
 
 nonpareil_srcs = Split ("""proc.c glib_async_queue_source.c
                            about.c goose.c pixbuf_util.c
@@ -285,7 +285,7 @@
 if (not ming) or (cross and not build_target_only):
     nonpareil_env.ParseConfig (sdl_pkg_config_cmd)
 
-csim_env = nonpareil_env.Copy ()
+csim_env = nonpareil_env.Clone ()
 if not ming:
     csim_env.Append (CPPDEFINES = {'DEFAULT_PATH': build_env ['libdir']})
 
@@ -297,7 +297,7 @@
 
 if build_env ['has_debugger_cli']:
     csim_env.Append (CPPDEFINES = {'HAS_DEBUGGER_CLI': 1})
-    debugger_cli_env = csim_env.Copy ()
+    debugger_cli_env = csim_env.Clone ()
     if build_env ['use_tcl']:
         debugger_cli_env.Append (CPPDEFINES = {'USE_TCL': 1})
         nonpareil_env.Append (LIBS = 'tcl')
@@ -326,7 +326,7 @@
 # udis
 #-----------------------------------------------------------------------------
 
-udis_env = build_env.Copy ()
+udis_env = build_env.Clone ()
 
 udis_srcs = Split ("""dis.c""")
 
@@ -337,7 +337,7 @@
 # nsim_conv
 #-----------------------------------------------------------------------------
 
-nsim_conv_env = build_env.Copy ()
+nsim_conv_env = build_env.Clone ()
 
 nsim_conv_srcs = Split ("""nsim_conv.c
 	                   state_read_nsim.c state_write_nsim.c""")
diff -Naur nonpareil-0.78/src/util.c nonpareil-0.78-new/src/util.c
--- nonpareil-0.78/src/util.c	2006-10-31 03:26:16.000000000 -0300
+++ nonpareil-0.78-new/src/util.c	2023-10-16 13:26:47.823617125 -0300
@@ -129,7 +129,7 @@
   strcpy (*dest, src);
 }
 
-
+/* 
 // strlcpy will copy as much of src into dest as it can, up to one less than
 // the maximum length of dest specified by the argument l.  Unlike strncpy(),
 // strlcpy() will always leave dest NULL-terminated on return.
@@ -139,7 +139,7 @@
   dest [l - 1] = '\0';
   return dest;
 }
-
+*/
 
 // strlncpy will copy up to n characters from src to dest, but not more than
 // one less than the maximum length of dest specified by the argument l.
@@ -157,7 +157,6 @@
   return dest;
 }
 
-
 // On entry, dest must be NULL-terminated.
 char *max_strncat (char *dest, const char *src, size_t n)
 {
diff -Naur nonpareil-0.78/src/util.h nonpareil-0.78-new/src/util.h
--- nonpareil-0.78/src/util.h	2006-10-31 03:26:16.000000000 -0300
+++ nonpareil-0.78-new/src/util.h	2023-10-16 13:27:02.936963318 -0300
@@ -52,12 +52,12 @@
 
 void realloc_strcpy (char **dest, char *src);
 
-
+/* 
 // strlcpy will copy as much of src into dest as it can, up to one less than
 // the maximum length of dest specified by the argument l.  Unlike strncpy(),
 // strlcpy() will always leave dest NULL-terminated on return.
 char *strlcpy (char *dest, const char *src, size_t l);
-
+*/
 
 // strlncpy will copy up to n characters from src to dest, but not more than
 // one less than the maximum length of dest specified by the argument l.
@@ -65,7 +65,6 @@
 // return.
 char *strlncpy (char *dest, const char *src, size_t l, size_t n);
 
-
 // max_strncat() is similar to strncat(), except that the size parameter
 // is the maximum total length of the destination, not the maximum number
 // of characters to concatenate.

Places

File fix_syntax_errors.patch of Package nonpareil (Revision f94765d05fc2ba3aa5797ef988959d06)

Places