[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[837] trunk/fuse

[<fr...@us...>]

Revision: 837
          http://sourceforge.net/p/fuse-for-macosx/code/837
Author:   fredm
Date:     2016-11-04 00:53:08 +0000 (Fri, 04 Nov 2016)
Log Message:
-----------
Merge up to vendor last SVN trunk (r5829) prior to git migration.

Revision Links:
--------------
    http://sourceforge.net/p/fuse-for-macosx/code/5829

Modified Paths:
--------------
    trunk/fuse/ChangeLog
    trunk/fuse/README
    trunk/fuse/configure.ac
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/settings.pl
    trunk/fuse/ui/win32/win32keyboard.c

Property Changed:
----------------
    trunk/fuse/

Index: trunk/fuse
===================================================================
--- trunk/fuse	2016-11-04 00:44:22 UTC (rev 836)
+++ trunk/fuse	2016-11-04 00:53:08 UTC (rev 837)

Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
 /vendor/fuse-emulator/0.10.0/fuse:556-557
 /vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-828
+/vendor/fuse-emulator/current/fuse:530-836
 /vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
 /vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog	2016-11-04 00:44:22 UTC (rev 836)
+++ trunk/fuse/ChangeLog	2016-11-04 00:53:08 UTC (rev 837)
@@ -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: trunk/fuse/README
===================================================================
--- trunk/fuse/README	2016-11-04 00:44:22 UTC (rev 836)
+++ trunk/fuse/README	2016-11-04 00:53:08 UTC (rev 837)
@@ -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: trunk/fuse/configure.ac
===================================================================
--- trunk/fuse/configure.ac	2016-11-04 00:44:22 UTC (rev 836)
+++ trunk/fuse/configure.ac	2016-11-04 00:53:08 UTC (rev 837)
@@ -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: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2016-11-04 00:44:22 UTC (rev 836)
+++ trunk/fuse/hacking/ChangeLog	2016-11-04 00:53:08 UTC (rev 837)
@@ -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: trunk/fuse/settings.pl
===================================================================
--- trunk/fuse/settings.pl	2016-11-04 00:44:22 UTC (rev 836)
+++ trunk/fuse/settings.pl	2016-11-04 00:53:08 UTC (rev 837)
@@ -3,7 +3,7 @@
 # settings.pl: generate settings.c from settings.dat
 # Copyright (c) 2002-2015 Philip Kendall, Fredrick Meunier
 
-# $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

Modified: trunk/fuse/ui/win32/win32keyboard.c
===================================================================
--- trunk/fuse/ui/win32/win32keyboard.c	2016-11-04 00:44:22 UTC (rev 836)
+++ trunk/fuse/ui/win32/win32keyboard.c	2016-11-04 00:53:08 UTC (rev 837)
@@ -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"

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