[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[834] vendor/fuse-emulator/current

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 834
          http://sourceforge.net/p/fuse-for-macosx/code/834
Author:   fredm
Date:     2016-11-04 00:30:18 +0000 (Fri, 04 Nov 2016)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.

Modified Paths:
--------------
    vendor/fuse-emulator/current/fuse/ChangeLog
    vendor/fuse-emulator/current/fuse/README
    vendor/fuse-emulator/current/fuse/configure.ac
    vendor/fuse-emulator/current/fuse/hacking/ChangeLog
    vendor/fuse-emulator/current/fuse/settings.pl
    vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c
    vendor/fuse-emulator/current/libspectrum/ChangeLog
    vendor/fuse-emulator/current/libspectrum/Makefile.am
    vendor/fuse-emulator/current/libspectrum/README
    vendor/fuse-emulator/current/libspectrum/configure.ac
    vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
    vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog

Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================

--- vendor/fuse-emulator/current/fuse/ChangeLog	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/fuse/ChangeLog	2016-11-04 00:30:18 UTC (rev 834)
@@ -1373,4 +1373,4 @@
 
 	* Version 0.1.0 released.
 
-$Id: ChangeLog 5818 2016-10-02 11:35:56Z fredm $
+$Id: ChangeLog 5829 2016-10-18 12:13:48Z fredm $

Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/fuse/README	2016-11-04 00:30:18 UTC (rev 834)
@@ -110,4 +110,4 @@
 Philip Kendall <phi...@sh...>
 2nd October, 2016
 
-$Id: README 5818 2016-10-02 11:35:56Z fredm $
+$Id: README 5829 2016-10-18 12:13:48Z fredm $

Modified: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/fuse/configure.ac	2016-11-04 00:30:18 UTC (rev 834)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 5809 2016-09-24 04:27:40Z fredm $
+dnl $Id: configure.ac 5829 2016-10-18 12:13:48Z fredm $
 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -724,7 +724,7 @@
 if test "$libxml2" = yes; then
   PKG_CHECK_MODULES(
     [XML],
-    [libxml-2.0],
+    [libxml-2.0 >= 2.6.0],
     [AC_DEFINE([HAVE_LIB_XML2], 1, [Defined if we've got libxml2])],
     [AC_MSG_WARN([libxml2 not found - config file will use ini format])
      libxml2="no"]

Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog	2016-11-04 00:30:18 UTC (rev 834)
@@ -5446,3 +5446,9 @@
          (Fred).
 20160924 ChangeLog: tweak thanks for Recreated ZX feature and fix typo (Sergio).
 20161002 ChangeLog,README,man/fuse.1: update release dates for 1.3.0 (Fred).
+20161009 ui/win32/win32keyboard.c: must explicitly include glib.h as it is no
+         longer pulled in by libspectrum (fixes bug #362) (Guesser).
+20161016 configure.ac,settings.pl: use xmlReadFile() from libxml2 instead of
+         xmlParseFile() (patch #381) (Sergio).
+20161018 ChangeLog,README,configure.ac,man/fuse.1: merge changes from 1.3.0
+         release (Fred).

Modified: vendor/fuse-emulator/current/fuse/settings.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.pl	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/fuse/settings.pl	2016-11-04 00:30:18 UTC (rev 834)
@@ -4,7 +4,7 @@
 # Copyright (c) 2002-2015 Philip Kendall
 # Copyright (c) 2016 BogDan Vatra
 
-# $Id: settings.pl 5670 2016-07-08 21:33:08Z pak21 $
+# $Id: settings.pl 5826 2016-10-16 07:35:25Z sbaldovi $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -181,7 +181,7 @@
       return 0;
   }
 
-  doc = xmlParseFile( path );
+  doc = xmlReadFile( path, NULL, 0 );
   if( !doc ) {
     ui_error( UI_ERROR_ERROR, "error reading config file" );
     return 1;

Modified: vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c	2016-11-04 00:30:18 UTC (rev 834)
@@ -29,6 +29,12 @@
 #include <stdlib.h>
 #include <windows.h>
 
+#ifdef HAVE_LIB_GLIB
+#include <glib.h>
+#endif				/* #ifdef HAVE_LIB_GLIB */
+
+#include <libspectrum.h>
+
 #include "display.h"
 #include "fuse.h"
 #include "keyboard.h"

Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog	2016-11-04 00:30:18 UTC (rev 834)
@@ -423,5 +423,5 @@
 	* libspectrum separated from Fuse just before the 0.5.0 release of
 	  Fuse; see Fuse's ChangeLog for changes up to this point
 
-$Id: ChangeLog 5815 2016-10-02 11:27:20Z fredm $
+$Id: ChangeLog 5827 2016-10-18 11:43:10Z fredm $
 

Modified: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am	2016-11-04 00:30:18 UTC (rev 834)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 2001-2016 Philip Kendall
 
-## $Id: Makefile.am 5810 2016-09-24 07:02:20Z sbaldovi $
+## $Id: Makefile.am 5827 2016-10-18 11:43:10Z fredm $
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by

Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/libspectrum/README	2016-11-04 00:30:18 UTC (rev 834)
@@ -69,4 +69,4 @@
 Philip Kendall <phi...@sh...>
 2nd October, 2016
 
-$Id: README 5815 2016-10-02 11:27:20Z fredm $
+$Id: README 5827 2016-10-18 11:43:10Z fredm $

Modified: vendor/fuse-emulator/current/libspectrum/configure.ac
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.ac	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/libspectrum/configure.ac	2016-11-04 00:30:18 UTC (rev 834)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Copyright (c) 1999-2013 Philip Kendall
 
-dnl $Id: configure.ac 5806 2016-09-24 04:13:08Z fredm $
+dnl $Id: configure.ac 5827 2016-10-18 11:43:10Z fredm $
 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by

Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt	2016-11-04 00:30:18 UTC (rev 834)
@@ -1868,4 +1868,4 @@
 
 Write `data' to register `reg' of the IDE channel `chn'.
 
-$Id: libspectrum.txt 5808 2016-09-24 04:23:35Z fredm $
+$Id: libspectrum.txt 5827 2016-10-18 11:43:10Z fredm $

Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog	2016-11-01 10:40:56 UTC (rev 833)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog	2016-11-04 00:30:18 UTC (rev 834)
@@ -1128,3 +1128,5 @@
          since libspectrum 1.2.2 (Sergio).
 20161002 ChangeLog,README,doc/libspectrum.3: update release dates for 1.3.0
          (Fred).
+20161018 ChangeLog,Makefile.am,README,configure.ac,doc/{libspectrum.3,
+         libspectrum.txt}: merge changes from 1.3.0 release (Fred).

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



