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

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

Revision: 822
          http://sourceforge.net/p/fuse-for-macosx/code/822
Author:   fredm
Date:     2016-08-23 04:00:11 +0000 (Tue, 23 Aug 2016)
Log Message:
-----------
Merge up to vendor release 1.2.2.

Modified Paths:
--------------
    trunk/FuseGenerator/English.lproj/InfoPlist.strings
    trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
    trunk/FuseGenerator/Info.plist
    trunk/FuseGenerator/libspectrum.h
    trunk/FuseImporter/English.lproj/InfoPlist.strings
    trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
    trunk/FuseImporter/GetMetadataForFile.h
    trunk/FuseImporter/Info.plist
    trunk/FuseImporter/libspectrum.h
    trunk/fuse/ChangeLog
    trunk/fuse/Makefile.am
    trunk/fuse/README
    trunk/fuse/configure.ac
    trunk/fuse/debugger/breakpoint.c
    trunk/fuse/fusepb/English.lproj/InfoPlist.strings
    trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
    trunk/fuse/fusepb/Info-Fuse.plist
    trunk/fuse/fusepb/config.h
    trunk/fuse/fusepb/controllers/FuseController.m
    trunk/fuse/fusepb/libspectrum.h
    trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex
    trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
    trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html
    trunk/fuse/fusepb/resources/Fuse Help/html/formats.html
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/lib/compressed/disk_plus3.szx
    trunk/fuse/lib/uncompressed/disk_plus3.szx
    trunk/fuse/machines/specplus3.c
    trunk/fuse/man/fuse.1
    trunk/fuse/peripherals/Makefile.am
    trunk/fuse/peripherals/disk/disk.c
    trunk/fuse/peripherals/disk/disk.h
    trunk/fuse/peripherals/disk/upd_fdc.c
    trunk/fuse/sound/coreaudiosound.c
    trunk/fuse/tape.c
    trunk/fuse/ui/gtk/fileselector.c
    trunk/fuse/ui/options.dat
    trunk/fuse/ui/widget/browse.c
    trunk/fuse/ui/win32/fileselector.c
    trunk/fuse/utils.c
    trunk/libspectrum/Info.plist
    trunk/libspectrum/config.h
    trunk/libspectrum/libspectrum/ChangeLog
    trunk/libspectrum/libspectrum/Makefile.am
    trunk/libspectrum/libspectrum/README
    trunk/libspectrum/libspectrum/configure.ac
    trunk/libspectrum/libspectrum/doc/libspectrum.3
    trunk/libspectrum/libspectrum/doc/libspectrum.txt
    trunk/libspectrum/libspectrum/hacking/ChangeLog
    trunk/libspectrum/libspectrum/internals.h
    trunk/libspectrum/libspectrum/libspectrum.c
    trunk/libspectrum/libspectrum/libspectrum.h.in
    trunk/libspectrum/libspectrum/pzx_read.c
    trunk/libspectrum/libspectrum/tape.c
    trunk/libspectrum/libspectrum/tape_block.c
    trunk/libspectrum/libspectrum/tape_block.h
    trunk/libspectrum/libspectrum/test/Makefile.am
    trunk/libspectrum/libspectrum/test/test.c
    trunk/libspectrum/libspectrum/test/test.h
    trunk/libspectrum/libspectrum/tzx_write.c
    trunk/libspectrum/libspectrum/utilities.c
    trunk/libspectrum/libspectrum/zlib.c
    trunk/libspectrum/libspectrum.h
    trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj

Added Paths:
-----------
    trunk/fuse/peripherals/disk/trdos.c
    trunk/fuse/peripherals/disk/trdos.h
    trunk/libspectrum/libspectrum/test/no-pilot-gdb.tzx
    trunk/libspectrum/libspectrum/test/test_edges.c
    trunk/libspectrum/libspectrum/test/zero-tail.pzx
    trunk/libspectrum/libspectrum/zip.c
    trunk/libspectrum/libspectrum/zip.h

Removed Paths:
-------------
    trunk/fuse/m4/glib-2.0.m4
    trunk/fuse/m4/libxml.m4
    trunk/libspectrum/libspectrum/test/test15.c

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

Modified: trunk/FuseGenerator/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)

Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj	2016-08-23 04:00:11 UTC (rev 822)
@@ -16,6 +16,8 @@
 		B63944FB0D18C7C30059DAA5 /* tape_accessors.txt in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B2E0D162B910036CC54 /* tape_accessors.txt */; };
 		B63944FC0D18C7C30059DAA5 /* snap_accessors.txt in Sources */ = {isa = PBXBuildFile; fileRef = B6D30B2C0D162B810036CC54 /* snap_accessors.txt */; };
 		B63945090D18CA120059DAA5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B63945080D18CA120059DAA5 /* Cocoa.framework */; };
+		B64AC83B1D6B2D5C0024E7FE /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = B64AC8391D6B2D5C0024E7FE /* zip.c */; };
+		B64AC83C1D6B2D5C0024E7FE /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = B64AC83A1D6B2D5C0024E7FE /* zip.h */; };
 		B67F1E790E93A39800246616 /* garray.c in Sources */ = {isa = PBXBuildFile; fileRef = B67F1E780E93A39800246616 /* garray.c */; };
 		B67F1E7B0E93A3AF00246616 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = B67F1E7A0E93A3AF00246616 /* memory.c */; };
 		B6D30AE60D1627ED0036CC54 /* bzip2.c in Sources */ = {isa = PBXBuildFile; fileRef = B6D30AE50D1627ED0036CC54 /* bzip2.c */; };
@@ -111,6 +113,8 @@
 		B63944A90D18B0430059DAA5 /* LibspectrumSCRExtractor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LibspectrumSCRExtractor.m; sourceTree = "<group>"; };
 		B63944CB0D18C1CD0059DAA5 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; };
 		B63945080D18CA120059DAA5 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		B64AC8391D6B2D5C0024E7FE /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zip.c; path = ../../libspectrum/libspectrum/zip.c; sourceTree = "<group>"; };
+		B64AC83A1D6B2D5C0024E7FE /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zip.h; path = ../../libspectrum/libspectrum/zip.h; sourceTree = "<group>"; };
 		B67F1E780E93A39800246616 /* garray.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = garray.c; path = ../../../libspectrum/libspectrum/myglib/garray.c; sourceTree = "<group>"; };
 		B67F1E7A0E93A3AF00246616 /* memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = memory.c; path = ../../libspectrum/libspectrum/memory.c; sourceTree = "<group>"; };
 		B6D30AE30D1627C90036CC54 /* libspectrum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libspectrum.h; path = ../libspectrum.h; sourceTree = "<group>"; };
@@ -283,6 +287,8 @@
 				B6D30B170D1629C20036CC54 /* z80.c */,
 				B6D30B180D1629C20036CC54 /* z80em.c */,
 				B6D30B190D1629C20036CC54 /* zlib.c */,
+				B64AC8391D6B2D5C0024E7FE /* zip.c */,
+				B64AC83A1D6B2D5C0024E7FE /* zip.h */,
 				B6D30B1A0D1629C20036CC54 /* zxs.c */,
 			);
 			path = libspectrum;
@@ -328,6 +334,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B64AC83C1D6B2D5C0024E7FE /* zip.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -419,6 +426,7 @@
 				B6D30AEC0D16280E0036CC54 /* creator.c in Sources */,
 				B6D30AED0D16280E0036CC54 /* crypto.c in Sources */,
 				B6D30AEE0D16280E0036CC54 /* csw.c in Sources */,
+				B64AC83B1D6B2D5C0024E7FE /* zip.c in Sources */,
 				B6D30AEF0D16280E0036CC54 /* dck.c in Sources */,
 				B6D30AF40D1628470036CC54 /* ide.c in Sources */,
 				B6D30AF60D1628470036CC54 /* libspectrum.c in Sources */,
@@ -484,13 +492,13 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/QuickLook;
+				LLVM_LTO = YES;
 				OTHER_LDFLAGS = (
 					"-lbz2",
 					"-lz",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "net.sourceforge.projects.fuse-emulator.quicklookgenerator";
 				PRODUCT_NAME = FuseGenerator;
-				VALID_ARCHS = "ppc x86_64 i386";
 				WRAPPER_EXTENSION = qlgenerator;
 				ZERO_LINK = YES;
 			};
@@ -509,13 +517,13 @@
 				GCC_WARN_UNUSED_VALUE = YES;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/QuickLook;
+				LLVM_LTO = YES;
 				OTHER_LDFLAGS = (
 					"-lbz2",
 					"-lz",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "net.sourceforge.projects.fuse-emulator.quicklookgenerator";
 				PRODUCT_NAME = FuseGenerator;
-				VALID_ARCHS = "ppc x86_64 i386";
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",

Modified: trunk/FuseGenerator/Info.plist
===================================================================
--- trunk/FuseGenerator/Info.plist	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/FuseGenerator/Info.plist	2016-08-23 04:00:11 UTC (rev 822)
@@ -59,7 +59,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1</string>
 	<key>CFBundleVersion</key>
-	<string>1.2</string>
+	<string>1.2.2</string>
 	<key>CFPlugInDynamicRegisterFunction</key>
 	<string></string>
 	<key>CFPlugInDynamicRegistration</key>

Modified: trunk/FuseGenerator/libspectrum.h
===================================================================
--- trunk/FuseGenerator/libspectrum.h	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/FuseGenerator/libspectrum.h	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,7 +1,7 @@
 /* libspectrum.h: the library for dealing with ZX Spectrum emulator files
    Copyright (c) 2001-2015 Philip Kendall, Darren Salt, Fredrick Meunier
 
-   $Id: libspectrum.h.in 5422 2016-04-29 12:54:59Z fredm $
+   $Id: libspectrum.h.in 5733 2016-08-14 12:45:40Z 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
@@ -421,6 +421,10 @@
 
   LIBSPECTRUM_ID_DISK_D80,		/* .d80/.d40 Didaktik disk image */
 
+  /* Below here, present only in 1.2.2 and later */
+
+  LIBSPECTRUM_ID_COMPRESSED_ZIP,	/* zip compressed file */
+
   LIBSPECTRUM_ID_SCREEN_SCR,		/* .scr screen file */
 
 } libspectrum_id_t;

Modified: trunk/FuseImporter/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)

Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj	2016-08-23 04:00:11 UTC (rev 822)
@@ -20,6 +20,8 @@
 		B69709730827C03F00904D8F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B69709720827C03F00904D8F /* Foundation.framework */; };
 		B69709CD082829BC00904D8F /* LibspectrumMetadataImporter.h in Headers */ = {isa = PBXBuildFile; fileRef = B69709CB082829BC00904D8F /* LibspectrumMetadataImporter.h */; };
 		B69709CE082829BC00904D8F /* LibspectrumMetadataImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = B69709CC082829BC00904D8F /* LibspectrumMetadataImporter.m */; };
+		B69D8D491D6B2FB70031BAFC /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = B69D8D471D6B2FB70031BAFC /* zip.c */; };
+		B69D8D4A1D6B2FB70031BAFC /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = B69D8D481D6B2FB70031BAFC /* zip.h */; };
 		B6ACE4F2082BE15800B40758 /* GetMetadataForFile.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACE4F1082BE15800B40758 /* GetMetadataForFile.h */; };
 		B6BF29F90A5FFCC200D16624 /* ghash.c in Sources */ = {isa = PBXBuildFile; fileRef = B6BF29F80A5FFCC200D16624 /* ghash.c */; };
 		B6BF29FD0A5FFCD700D16624 /* gslist.c in Sources */ = {isa = PBXBuildFile; fileRef = B6BF29FC0A5FFCD700D16624 /* gslist.c */; };
@@ -126,6 +128,8 @@
 		B69709720827C03F00904D8F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		B69709CB082829BC00904D8F /* LibspectrumMetadataImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LibspectrumMetadataImporter.h; sourceTree = "<group>"; };
 		B69709CC082829BC00904D8F /* LibspectrumMetadataImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LibspectrumMetadataImporter.m; sourceTree = "<group>"; };
+		B69D8D471D6B2FB70031BAFC /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zip.c; path = ../../libspectrum/libspectrum/zip.c; sourceTree = "<group>"; };
+		B69D8D481D6B2FB70031BAFC /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zip.h; path = ../../libspectrum/libspectrum/zip.h; sourceTree = "<group>"; };
 		B6ACE4F1082BE15800B40758 /* GetMetadataForFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetMetadataForFile.h; sourceTree = "<group>"; };
 		B6BF29F80A5FFCC200D16624 /* ghash.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ghash.c; sourceTree = "<group>"; };
 		B6BF29FC0A5FFCD700D16624 /* gslist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gslist.c; sourceTree = "<group>"; };
@@ -274,6 +278,8 @@
 				B6BF2A170A5FFD0100D16624 /* z80.c */,
 				B639B7920A6BB2C100927E24 /* z80em.c */,
 				B6BF2A180A5FFD0100D16624 /* zlib.c */,
+				B69D8D471D6B2FB70031BAFC /* zip.c */,
+				B69D8D481D6B2FB70031BAFC /* zip.h */,
 				B6BF2A190A5FFD0100D16624 /* zxs.c */,
 			);
 			path = libspectrum;
@@ -297,6 +303,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B69709CD082829BC00904D8F /* LibspectrumMetadataImporter.h in Headers */,
+				B69D8D4A1D6B2FB70031BAFC /* zip.h in Headers */,
 				B6ACE4F2082BE15800B40758 /* GetMetadataForFile.h in Headers */,
 				B6BF2A1B0A5FFD0100D16624 /* config.h in Headers */,
 				B6BF2A200A5FFD0100D16624 /* internals.h in Headers */,
@@ -420,6 +427,7 @@
 				B6BF2A350A5FFD0100D16624 /* zxs.c in Sources */,
 				B639B7930A6BB2C100927E24 /* z80em.c in Sources */,
 				B62C1CD00B761515000BA4E0 /* symbol_table.c in Sources */,
+				B69D8D491D6B2FB70031BAFC /* zip.c in Sources */,
 				B61617260C1CE2980009ADF9 /* csw.c in Sources */,
 				B616172A0C1CE2A50009ADF9 /* wav.c in Sources */,
 				B61E31AF0E925C66008097AC /* memory.c in Sources */,
@@ -475,6 +483,7 @@
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/Spotlight;
 				LIBRARY_STYLE = Bundle;
+				LLVM_LTO = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-lbz2",
@@ -509,6 +518,7 @@
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/Spotlight;
 				LIBRARY_STYLE = Bundle;
+				LLVM_LTO = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-lbz2",
@@ -542,6 +552,7 @@
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = /Library/Spotlight;
 				LIBRARY_STYLE = Bundle;
+				LLVM_LTO = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-lbz2",
@@ -582,6 +593,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -609,6 +621,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				SDKROOT = macosx;
 			};
@@ -634,6 +647,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				SDKROOT = macosx;
 			};

Modified: trunk/FuseImporter/GetMetadataForFile.h
===================================================================
--- trunk/FuseImporter/GetMetadataForFile.h	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/FuseImporter/GetMetadataForFile.h	2016-08-23 04:00:11 UTC (rev 822)
@@ -22,7 +22,7 @@
 */
 
 #ifndef GETMETADATAFORFILE_H
-#define GETMETADATAFOR_FILE_H
+#define GETMETADATAFORFILE_H
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFPlugInCOM.h>

Modified: trunk/FuseImporter/Info.plist
===================================================================
--- trunk/FuseImporter/Info.plist	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/FuseImporter/Info.plist	2016-08-23 04:00:11 UTC (rev 822)
@@ -57,7 +57,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.2</string>
+	<string>1.2.2</string>
 	<key>CFPlugInDynamicRegisterFunction</key>
 	<string></string>
 	<key>CFPlugInDynamicRegistration</key>

Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/FuseImporter/libspectrum.h	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,7 +1,7 @@
 /* libspectrum.h: the library for dealing with ZX Spectrum emulator files
    Copyright (c) 2001-2015 Philip Kendall, Darren Salt, Fredrick Meunier
 
-   $Id: libspectrum.h.in 5422 2016-04-29 12:54:59Z fredm $
+   $Id: libspectrum.h.in 5733 2016-08-14 12:45:40Z 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
@@ -421,6 +421,10 @@
 
   LIBSPECTRUM_ID_DISK_D80,		/* .d80/.d40 Didaktik disk image */
 
+  /* Below here, present only in 1.2.2 and later */
+
+  LIBSPECTRUM_ID_COMPRESSED_ZIP,	/* zip compressed file */
+
   LIBSPECTRUM_ID_SCREEN_SCR,		/* .scr screen file */
 
 } libspectrum_id_t;

Index: trunk/fuse
===================================================================
--- trunk/fuse	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse	2016-08-23 04:00:11 UTC (rev 822)

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-816
+/vendor/fuse-emulator/current/fuse:530-821
 /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-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/ChangeLog	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,3 +1,29 @@
+2016-08-21  Philip Kendall  <phi...@sh...>
+
+        * Fuse 1.2.2 released.
+
+        * New features:
+          * Support loading first tape, snapshot, dock cartridge or RZX file
+            found inside .zip files (Patrik Rak and Sergio Baldoví).
+          * Support auto-booting TR-DOS disk images without a boot file (thanks,
+            windale, BogDan Vatra and Fredrick Meunier) (Sergio Baldoví).
+
+        * Emulation core improvements:
+          * Change microphone state when 0 tstate pulses do not have the no edge
+            flag set (Fredrick Meunier).
+
+        * Machine specific improvements:
+          * Fix +3 disk autoload (thanks, windale and BogDan Vatra) (Sergio
+            Baldoví and Fredrick Meunier).
+          * Fix floppy drive selection when resetting a +3 (thanks, windale and
+            BogDan Vatra) (Sergio Baldoví).
+
+        * Miscellaneous improvements:
+          * WidgetUI: Use description for tape blocks where available (Fredrick
+            Meunier).
+          * Use pkg-config to detect libpng and libxml2 (Alberto Garcia).
+          * Various minor bugfixes.
+
 2016-07-17  Philip Kendall  <phi...@sh...>
 
         * Fuse 1.2.1 released.
@@ -1325,4 +1351,4 @@
 
 	* Version 0.1.0 released.
 
-$Id: ChangeLog 5686 2016-07-17 10:37:50Z fredm $
+$Id: ChangeLog 5761 2016-08-21 05:10:02Z fredm $

Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/Makefile.am	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 1999-2015 Philip Kendall
 
-## $Id: Makefile.am 5677 2016-07-09 13:58:02Z fredm $
+## $Id: Makefile.am 5735 2016-08-14 13:02:21Z 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
@@ -133,9 +133,7 @@
 	     keysyms.pl \
 	     m4/ax_create_stdint_h.m4 \
 	     m4/ax_pthread.m4 \
-	     m4/glib-2.0.m4 \
 	     m4/gtk-2.0.m4 \
-	     m4/libxml.m4 \
 	     m4/pkg.m4 \
 	     m4/sdl.m4 \
 	     menu_data.dat \

Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/README	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.2.1
+The Free Unix Spectrum Emulator (Fuse) 1.2.2
 ============================================
 
 Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -108,6 +108,6 @@
 <http://www.worldofspectrum.org/forums/>.
 
 Philip Kendall <phi...@sh...>
-17th July, 2016
+21st August, 2016
 
-$Id: README 5686 2016-07-17 10:37:50Z fredm $
+$Id: README 5761 2016-08-21 05:10:02Z fredm $

Modified: trunk/fuse/configure.ac
===================================================================
--- trunk/fuse/configure.ac	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/configure.ac	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 5686 2016-07-17 10:37:50Z fredm $
+dnl $Id: configure.ac 5761 2016-08-21 05:10:02Z 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
@@ -20,12 +20,12 @@
 dnl E-mail: phi...@sh...
 
 dnl Package version
-m4_define([fuse_version], [1.2.1])
+m4_define([fuse_version], [1.2.2])
 
 dnl Product full version
 m4_define([fuse_major_version], [1])
 m4_define([fuse_minor_version], [2])
-m4_define([fuse_micro_version], [1])
+m4_define([fuse_micro_version], [2])
 m4_define([fuse_nano_version],  [0])
 m4_define([fuse_full_version], [fuse_major_version.fuse_minor_version.fuse_micro_version.fuse_nano_version])
 m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
@@ -507,40 +507,17 @@
 libpng=yes)
 AC_MSG_RESULT($libpng)
 if test "$libpng" = yes; then
-  AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
-  if test -n "$LIBPNG_CONFIG"; then
-    PNG_CFLAGS=`libpng-config --cflags`
-    PNG_LIBS=`libpng-config --ldflags`
-    AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng])
-  else
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"
-    ac_save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$PNG_LIBS $LDFLAGS"
+  PKG_CHECK_MODULES(
+    [PNG],
+    [libpng],
+    [AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng])],
+    [AC_MSG_WARN([libpng not found - saving screenshots disabled])]
+  )
+fi
 
-    AC_CHECK_LIB( png, png_write_png,
-      [AC_CHECK_HEADER(
-        png.h,
-        [AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
-        [AC_CHECK_HEADERS(libpng/png.h,
-                     [CPPFLAGS="$ac_save_CPPFLAGS $PNG_CFLAGS/libpng"
-                      AC_DEFINE([USE_LIBPNG], 1, [Defined if we're going to be using the installed libpng]) PNG_LIBS='-lpng -lm -lz'],
-                     [AC_MSG_WARN(png.h not found - saving screenshots disabled)
-                      PNG_LIBS='']
-        )],
-      )],
-      [AC_MSG_WARN(png_write_png not found - saving screenshots disabled)
-       PNG_LIBS='']
-    )
+AC_SUBST(PNG_CFLAGS)
+AC_SUBST(PNG_LIBS)
 
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LDFLAGS="$ac_save_LDFLAGS"
-  fi
-
-  AC_SUBST(PNG_CFLAGS)
-  AC_SUBST(PNG_LIBS)
-fi
-
 dnl Check if a version of libasound which supplies pcm is available
 AC_MSG_CHECKING(whether ALSA requested)
 AC_ARG_WITH(alsa,
@@ -595,7 +572,7 @@
 
 dnl Check if CoreAudio is available
 AC_CHECK_HEADER(
-  CoreAudio/AudioHardware.h,
+  AudioToolbox/AudioToolbox.h,
   [coreaudio_available=yes],,
 )
 
@@ -632,7 +609,7 @@
   SOUND_LIBADD='sound/sunsound.$(OBJEXT)' SOUND_LIBS=''
   AC_MSG_RESULT(OpenBSD)
 elif test "$coreaudio_available" = yes; then
-  SOUND_LIBADD='sound/coreaudiosound.$(OBJEXT)' SOUND_LIBS='-framework CoreAudio -framework AudioUnit -framework CoreServices' sound_fifo=yes
+  SOUND_LIBADD='sound/coreaudiosound.$(OBJEXT)' SOUND_LIBS='-framework CoreAudio -framework AudioUnit' sound_fifo=yes
   AC_MSG_RESULT(CoreAudio)
 elif test "$wii" = yes; then
   SOUND_LIBADD='sound/wiisound.$(OBJEXT)' SOUND_LIBS='' sound_fifo=yes
@@ -737,11 +714,17 @@
   libxml2=yes)
 AC_MSG_RESULT($libxml2)
 if test "$libxml2" = yes; then
-  AM_PATH_XML2(2.0.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))
+  PKG_CHECK_MODULES(
+    [XML],
+    [libxml-2.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])]
+  )
 fi
 
+AC_SUBST(XML_CFLAGS)
+AC_SUBST(XML_LIBS)
+
 dnl Work out which timer routines to use
 AC_MSG_CHECKING(which timer routines to use)
 if test "$UI" = sdl; then

Modified: trunk/fuse/debugger/breakpoint.c
===================================================================
--- trunk/fuse/debugger/breakpoint.c	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/debugger/breakpoint.c	2016-08-23 04:00:11 UTC (rev 822)
@@ -136,8 +136,8 @@
 
 int
 debugger_breakpoint_add_time( debugger_breakpoint_type type,
-			      libspectrum_dword breakpoint_tstates, size_t ignore,
-			      debugger_breakpoint_life life,
+			      libspectrum_dword breakpoint_tstates,
+                              size_t ignore, debugger_breakpoint_life life,
 			      debugger_expression *condition )
 {
   debugger_breakpoint_value value;

Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)

Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj	2016-08-23 04:00:11 UTC (rev 822)
@@ -199,6 +199,8 @@
 		B69BE5411660E02500C5D0CE /* w5100_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE53E1660E02500C5D0CE /* w5100_socket.c */; };
 		B69BE5421660E02500C5D0CE /* w5100.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE53F1660E02500C5D0CE /* w5100.c */; };
 		B69BE5451660E04000C5D0CE /* spectranet.c in Sources */ = {isa = PBXBuildFile; fileRef = B69BE5431660E04000C5D0CE /* spectranet.c */; };
+		B69D8D4D1D6B34490031BAFC /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = B69D8D4B1D6B34490031BAFC /* zip.c */; };
+		B69D8D501D6B388A0031BAFC /* trdos.c in Sources */ = {isa = PBXBuildFile; fileRef = B69D8D4E1D6B388A0031BAFC /* trdos.c */; };
 		B6A6F0960B3C108C000B88E9 /* coreaudiosound.c in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F0950B3C108C000B88E9 /* coreaudiosound.c */; };
 		B6A6F0DA0B3D141B000B88E9 /* cocoaui.m in Sources */ = {isa = PBXBuildFile; fileRef = B6A6F0D90B3D141B000B88E9 /* cocoaui.m */; };
 		B6A6F0EE0B3D5F9E000B88E9 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6A6F0ED0B3D5F9E000B88E9 /* CoreAudio.framework */; };
@@ -570,6 +572,10 @@
 		B69BE5401660E02500C5D0CE /* w5100.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = w5100.h; sourceTree = "<group>"; };
 		B69BE5431660E04000C5D0CE /* spectranet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = spectranet.c; sourceTree = "<group>"; };
 		B69BE5441660E04000C5D0CE /* spectranet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spectranet.h; sourceTree = "<group>"; };
+		B69D8D4B1D6B34490031BAFC /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zip.c; path = ../../../libspectrum/libspectrum/zip.c; sourceTree = "<group>"; };
+		B69D8D4C1D6B34490031BAFC /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zip.h; path = ../../../libspectrum/libspectrum/zip.h; sourceTree = "<group>"; };
+		B69D8D4E1D6B388A0031BAFC /* trdos.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = trdos.c; sourceTree = "<group>"; };
+		B69D8D4F1D6B388A0031BAFC /* trdos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trdos.h; sourceTree = "<group>"; };
 		B6A6F0950B3C108C000B88E9 /* coreaudiosound.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = coreaudiosound.c; path = sound/coreaudiosound.c; sourceTree = "<group>"; };
 		B6A6F0D90B3D141B000B88E9 /* cocoaui.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = cocoaui.m; sourceTree = "<group>"; };
 		B6A6F0ED0B3D5F9E000B88E9 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
@@ -1239,6 +1245,8 @@
 				B631B9FE10257CA400BE1EE1 /* opus.h */,
 				B6CA2A2A0C33F8C10003CF90 /* plusd.c */,
 				B6CA2A2B0C33F8C10003CF90 /* plusd.h */,
+				B69D8D4E1D6B388A0031BAFC /* trdos.c */,
+				B69D8D4F1D6B388A0031BAFC /* trdos.h */,
 				B665FD470DD25D8900D21C79 /* upd_fdc.c */,
 				B665FD480DD25D8900D21C79 /* upd_fdc.h */,
 				B6CE3A0E0CD21617005ACDC8 /* wd_fdc.c */,
@@ -1322,6 +1330,8 @@
 				B6DCBBB7114FA0E700DC9A11 /* z80.c */,
 				B6DCBBB8114FA0E700DC9A11 /* z80em.c */,
 				B6DCBBB9114FA0E700DC9A11 /* zlib.c */,
+				B69D8D4B1D6B34490031BAFC /* zip.c */,
+				B69D8D4C1D6B34490031BAFC /* zip.h */,
 				B6DCBBBA114FA0E700DC9A11 /* zxs.c */,
 			);
 			name = libspectrum;
@@ -1835,6 +1845,7 @@
 				B684A19E0E93A8CD00A5B097 /* event.c in Sources */,
 				B684A1A00E93A8D700A5B097 /* variable.c in Sources */,
 				B684A1A20E93A8FC00A5B097 /* file.c in Sources */,
+				B69D8D501D6B388A0031BAFC /* trdos.c in Sources */,
 				B6374FA50F178298003CE6E2 /* timer.c in Sources */,
 				B64BD10C0FF6EE4E000B82AE /* timer.c in Sources */,
 				B64BD1140FF6EE77000B82AE /* dir.c in Sources */,
@@ -1894,6 +1905,7 @@
 				B69BE53C1660E01000C5D0CE /* am29f010.c in Sources */,
 				B69BE5411660E02500C5D0CE /* w5100_socket.c in Sources */,
 				B69BE5421660E02500C5D0CE /* w5100.c in Sources */,
+				B69D8D4D1D6B34490031BAFC /* zip.c in Sources */,
 				B69BE5451660E04000C5D0CE /* spectranet.c in Sources */,
 				B6B274061672AC8C00FC209B /* paths.c in Sources */,
 			);

Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/fusepb/Info-Fuse.plist	2016-08-23 04:00:11 UTC (rev 822)
@@ -582,11 +582,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>FUSE</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -643,6 +643,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>Timex Sinclair Cartridge Image</string>
+			<key>UTTypeIconFile</key>
+			<string>dck</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.dck</string>
 			<key>UTTypeReferenceURL</key>
@@ -662,6 +664,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum Hard Disk File</string>
+			<key>UTTypeIconFile</key>
+			<string>hdf</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.hdf</string>
 			<key>UTTypeReferenceURL</key>
@@ -681,6 +685,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum +3 Disk Image</string>
+			<key>UTTypeIconFile</key>
+			<string>dsk</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.dsk</string>
 			<key>UTTypeReferenceURL</key>
@@ -700,6 +706,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum DISCiPLE/+D Disk Image</string>
+			<key>UTTypeIconFile</key>
+			<string>blank</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.mgt</string>
 			<key>UTTypeReferenceURL</key>
@@ -719,6 +727,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum Recording</string>
+			<key>UTTypeIconFile</key>
+			<string>rzx</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.rzx</string>
 			<key>UTTypeReferenceURL</key>
@@ -738,6 +748,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum TR-DOS Disk Image</string>
+			<key>UTTypeIconFile</key>
+			<string>scl</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.scl</string>
 			<key>UTTypeTagSpecification</key>
@@ -755,6 +767,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum Screen Image</string>
+			<key>UTTypeIconFile</key>
+			<string>scr</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.scr</string>
 			<key>UTTypeReferenceURL</key>
@@ -774,6 +788,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum Multi Level Snapshot</string>
+			<key>UTTypeIconFile</key>
+			<string>slt</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.slt</string>
 			<key>UTTypeReferenceURL</key>
@@ -793,6 +809,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum SNA Snapshot</string>
+			<key>UTTypeIconFile</key>
+			<string>sna</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.sna</string>
 			<key>UTTypeReferenceURL</key>
@@ -812,6 +830,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum SP Snapshot</string>
+			<key>UTTypeIconFile</key>
+			<string>sp</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.sp</string>
 			<key>UTTypeTagSpecification</key>
@@ -829,6 +849,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum SZX Snapshot</string>
+			<key>UTTypeIconFile</key>
+			<string>szx</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.szx</string>
 			<key>UTTypeReferenceURL</key>
@@ -848,6 +870,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum SNP Snapshot</string>
+			<key>UTTypeIconFile</key>
+			<string>snp</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.snp</string>
 			<key>UTTypeTagSpecification</key>
@@ -865,6 +889,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum TAP Tape Image</string>
+			<key>UTTypeIconFile</key>
+			<string>tap</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.tap</string>
 			<key>UTTypeReferenceURL</key>
@@ -884,6 +910,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum TR-DOS Disk Image</string>
+			<key>UTTypeIconFile</key>
+			<string>trd</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.trd</string>
 			<key>UTTypeReferenceURL</key>
@@ -903,6 +931,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum TZX Tape Image</string>
+			<key>UTTypeIconFile</key>
+			<string>tzx</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.tzx</string>
 			<key>UTTypeReferenceURL</key>
@@ -922,6 +952,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum Z80 Snapshot</string>
+			<key>UTTypeIconFile</key>
+			<string>z80</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.z80</string>
 			<key>UTTypeReferenceURL</key>
@@ -941,6 +973,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum ZXS Snapshot</string>
+			<key>UTTypeIconFile</key>
+			<string>zxs</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.zxs</string>
 			<key>UTTypeTagSpecification</key>
@@ -958,6 +992,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum Microdrive Cartridge Image</string>
+			<key>UTTypeIconFile</key>
+			<string>mdr</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.mdr</string>
 			<key>UTTypeReferenceURL</key>
@@ -977,6 +1013,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum DISCiPLE/+D Disk Image</string>
+			<key>UTTypeIconFile</key>
+			<string>blank</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.img</string>
 			<key>UTTypeReferenceURL</key>
@@ -996,6 +1034,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum RAW Tape Image</string>
+			<key>UTTypeIconFile</key>
+			<string>raw</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.raw</string>
 			<key>UTTypeTagSpecification</key>
@@ -1013,6 +1053,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum Opus Discovery Disk Image</string>
+			<key>UTTypeIconFile</key>
+			<string>blank</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.opd</string>
 			<key>UTTypeReferenceURL</key>
@@ -1032,6 +1074,8 @@
 			</array>
 			<key>UTTypeDescription</key>
 			<string>ZX Spectrum Opus Discovery Disk Image</string>
+			<key>UTTypeIconFile</key>
+			<string>blank</string>
 			<key>UTTypeIdentifier</key>
 			<string>net.sourceforge.projects.fuse-emulator.opu</string>
 			<key>UTTypeReferenceURL</key>

Modified: trunk/fuse/fusepb/config.h
===================================================================
--- trunk/fuse/fusepb/config.h	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/fusepb/config.h	2016-08-23 04:00:11 UTC (rev 822)
@@ -8,7 +8,7 @@
 #define FUSE_COPYRIGHT "(c) 1999-2016 Philip Kendall and others"
 
 /* Define version information for win32 executables */
-#define FUSE_RC_VERSION 1,2,1,0
+#define FUSE_RC_VERSION 1,2,2,0
 
 /* Define to 1 if you have the `dirname' function. */
 #define HAVE_DIRNAME 1
@@ -167,7 +167,7 @@
 /* #undef USE_WIDGET */
 
 /* Version number of package */
-#define VERSION "1.2.1"
+#define VERSION "1.2.2"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2016-08-23 04:00:11 UTC (rev 822)
@@ -226,7 +226,8 @@
     [super init];
     singleton = self;
 
-    NSArray *compressedFileTypes = @[@"gz", @"GZ", @"bz2", @"BZ2"];
+    NSArray *compressedFileTypes = @[@"gz", @"GZ", @"bz2", @"BZ2", @"zip",
+                                     @"ZIP"];
 
     snapFileTypes = [NSMutableArray arrayWithObjects:@"mgtsnp", @"MGTSNP",
                       @"slt", @"SLT", @"sna", @"SNA", @"sp", @"SP", @"szx",

Modified: trunk/fuse/fusepb/libspectrum.h
===================================================================
--- trunk/fuse/fusepb/libspectrum.h	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/fusepb/libspectrum.h	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,7 +1,7 @@
 /* libspectrum.h: the library for dealing with ZX Spectrum emulator files
    Copyright (c) 2001-2015 Philip Kendall, Darren Salt, Fredrick Meunier
 
-   $Id: libspectrum.h.in 5422 2016-04-29 12:54:59Z fredm $
+   $Id: libspectrum.h.in 5733 2016-08-14 12:45:40Z 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
@@ -435,6 +435,10 @@
 
   LIBSPECTRUM_ID_DISK_D80,		/* .d80/.d40 Didaktik disk image */
 
+  /* Below here, present only in 1.2.2 and later */
+
+  LIBSPECTRUM_ID_COMPRESSED_ZIP,	/* zip compressed file */
+
   LIBSPECTRUM_ID_SCREEN_SCR,		/* .scr screen file */
 
 } libspectrum_id_t;

Modified: trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex
===================================================================
(Binary files differ)

Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html	2016-08-23 04:00:11 UTC (rev 822)
@@ -12,6 +12,57 @@
       <!-- AppleSegStart="What's New In Fuse?" --><a name="What's New In
         Fuse?" id="What's New In Fuse?"></a><!-- AppleSegDescription="This section describes the changes for version 1.2.1 of the Fuse emulator." --></font><br>
     <h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
+          Fuse For Mac OS X 1.2.2</font></font></h2>
+    <ul>
+      <li><font face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+            Grande,Helvetica,Arial">New features</font>:</font></li>
+      <li style="list-style-type: none; list-style-image: none;
+        list-style-position: outside;">
+        <ul>
+          <li><font face="Lucida Grande,Helvetica,Arial">Support loading
+              first tape, snapshot, dock cartridge or input recording (RZX)
+              file found inside .zip files (Patrik Rak and Sergio
+              Baldoví).</font></li>
+          <li><font face="Lucida Grande,Helvetica,Arial">Support
+              auto-booting TR-DOS disk images without a boot file
+              (thanks, windale, BogDan Vatra and Fredrick Meunier)
+              (Sergio Baldoví).</font></li>
+        </ul>
+      </li>
+      <li style="list-style-type: none; list-style-image: none;
+        list-style-position: outside;"><br>
+      </li>
+      <li><font face="Lucida Grande,Helvetica,Arial">Emulation core
+          improvements:</font></li>
+      <li style="list-style-type: none; list-style-image: none;
+        list-style-position: outside;">
+        <ul>
+          <li><font face="Lucida Grande,Helvetica,Arial">Change
+              microphone state when 0 tstate pulses do not have the no
+              edge flag set (Fredrick Meunier).</font></li>
+        </ul>
+      </li>
+      <li style="list-style-type: none; list-style-image: none;
+        list-style-position: outside;"><br>
+      </li>
+      <li><font face="Lucida Grande,Helvetica,Arial">Machine specific
+          improvements:</font></li>
+      <li style="list-style-type: none; list-style-image: none;
+        list-style-position: outside;">
+        <ul>
+          <li><font face="Lucida Grande,Helvetica,Arial">Fix +3 disk
+              autoload (thanks, windale and BogDan Vatra) (Sergio
+              Baldoví and Fredrick Meunier).</font></li>
+          <li><font face="Lucida Grande,Helvetica,Arial">Fix floppy
+              drive selection when resetting a +3 (thanks, windale and
+              BogDan Vatra) (Sergio Baldoví).</font></li>
+        </ul>
+        <br>
+      </li>
+      <li><font face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+            Grande,Helvetica,Arial">Various other minor bugfixes.</font></font></li>
+    </ul>
+    <h2><font><font face="Lucida Grande,Helvetica,Arial">What's new in
           Fuse For Mac OS X 1.2.1</font></font></h2>
     <ul>
       <li><font face="Lucida Grande,Helvetica,Arial">Emulation core

Modified: trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/compressed.html	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,24 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head>
-<!-- AppleSegStart="Compressed Files" -->
-  <title>Compressed Files</title>
-</head>
-<body>
-<font face="Lucida Grande,Helvetica,Arial"><a name="Compressed Files"></a><!-- AppleSegDescription="This section describes Fuses support of compressed files." --></font>
-<div class="refsect1" xml:lang="en" lang="en">
-<h2><font face="Lucida Grande,Helvetica,Arial">Compressed
-Files</font></h2>
-</div>
-<p>
-<font face="Lucida Grande,Helvetica,Arial">Snapshots, tape images, dock
-cartridges and input recording files
-can be read from files compressed with
-<span class="emphasis"><em>bzip2</em></span> or
-<span class="emphasis"><em>gzip</em></span> just as if they were
-uncompressed. There is currently no support for reading compressed +3,
-+D or Beta disk
-images.</font></p>
-<!-- AppleSegEnd -->
-</body>
+  <head>
+
+    <meta http-equiv="content-type" content="text/html; charset=windows-1252">
+    <!-- AppleSegStart="Compressed Files" -->
+    <title>Compressed Files</title>
+  </head>
+  <body>
+    <font face="Lucida Grande,Helvetica,Arial"><a name="Compressed
+        Files"></a><!-- AppleSegDescription="This section describes Fuses support of compressed files." --></font>
+    <div class="refsect1" xml:lang="en" lang="en">
+      <h2><font face="Lucida Grande,Helvetica,Arial">Compressed
+          Files</font></h2>
+    </div>
+    <p>
+      <font face="Lucida Grande,Helvetica,Arial">Snapshots, tape images,
+        dock
+        cartridges and input recording files
+        (RZX) can be read from files compressed with
+        <span class="emphasis"><em>bzip2</em></span>,<em> </em><span
+          class="emphasis"><em>gzip</em></span> or <i>zip</i> just as
+        if they were
+        uncompressed. In the zip case, only the first supported file
+        found inside the archive is loaded. There is currently no
+        support for reading compressed +3,
+        +D, Opus or Beta disk
+        images.</font></p>
+    <!-- AppleSegEnd -->
+  </body>
 </html>

Modified: trunk/fuse/fusepb/resources/Fuse Help/html/formats.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/formats.html	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/formats.html	2016-08-23 04:00:11 UTC (rev 822)
@@ -11,32 +11,28 @@
     <div class="refsect1" xml:lang="en" lang="en">
       <h2><font face="Lucida Grande,Helvetica,Arial">Disk File Formats</font></h2>
     </div>
-    <p>
-      <font face="Lucida Grande,Helvetica,Arial">Fuse supports several
-        disk
-        image formats in its +D, Didaktik, DISCiPLE, Opus and Beta 128 emulation.<br>
+    <p> <font face="Lucida Grande,Helvetica,Arial">Fuse supports
+        several disk image formats in its +D, Didaktik, DISCiPLE, Opus
+        and Beta 128 emulation.<br>
         The following are supported for reading:</font></p>
     <p><font face="Lucida Grande,Helvetica,Arial">.UDI<br>
       </font></p>
     <div style="margin-left: 40px;"><font face="Lucida
-        Grande,Helvetica,Arial">Ultra Disk Image; for
-        specification details please see <a
+        Grande,Helvetica,Arial">Ultra Disk Image; for specification
+        details please see <a
           href="http://faqwiki.zxnet.co.uk/wiki/UDI_format">http://faqwiki.zxnet.co.uk/wiki/UDI_format</a>.</font><font
         face="Lucida Grande,Helvetica,Arial"> This is the only image
-        format
-        which can store all the relevant information</font><font
+        format which can store all the relevant information</font><font
         face="Lucida Grande,Helvetica,Arial"> of the recorded data on a
         magnetic disk, so it can be used for any <span
           style="font-style: italic;">non standard</span> disk format.
-        Fuse can
-        store and read both MFM and FM formatted disk data in/from this
-        container.</font><br>
+        Fuse can store and read both MFM and FM formatted disk data
+        in/from this container.</font><br>
     </div>
     <p><font face="Lucida Grande,Helvetica,Arial">.FDI<br>
       </font></p>
     <div style="margin-left: 40px;"><font face="Lucida
-        Grande,Helvetica,Arial">UKV Spectrum Debugger disk image
-        format.</font><br>
+        Grande,Helvetica,Arial">UKV Spectrum Debugger disk image format.</font><br>
     </div>
     <p><font face="Lucida Grande,Helvetica,Arial">.MGT<br>
         .IMG<br>
@@ -47,22 +43,27 @@
     <p><font face="Lucida Grande,Helvetica,Arial">.SAD<br>
       </font></p>
     <div style="margin-left: 40px;"><font face="Lucida
-        Grande,Helvetica,Arial">For compatibility with SAM
-        Coup&eacute; disk images using these formats. Note that SAM
-        Coup&eacute;
-        `.DSK' images share the same format as `.MGT'.</font><br>
+        Grande,Helvetica,Arial">For compatibility with SAM Coup&eacute; disk
+        images using these formats. Note that SAM Coup&eacute; `.DSK' images
+        share the same format as `.MGT'.</font><br>
     </div>
     <p><font face="Lucida Grande,Helvetica,Arial">.D80<br>
         .D40<br>
-    </font></p>
+      </font></p>
     <div style="margin-left: 40px;"><font face="Lucida
-        Grande,Helvetica,Arial">Didaktik 80 and Didaktik 40 file formats.</font><br>
+        Grande,Helvetica,Arial">Didaktik 80 and Didaktik 40 file
+        formats.</font><br>
     </div>
     <p><font face="Lucida Grande,Helvetica,Arial">.TRD<br>
       </font></p>
     <div style="margin-left: 40px;"><font face="Lucida
-        Grande,Helvetica,Arial">TR-DOS disk image; for detailed
-        information please see</font><br>
+        Grande,Helvetica,Arial">TR-DOS disk image. TRD and SCL sectors
+        are loaded interleaved, therefore<font face="Lucida
+          Grande,Helvetica,Arial"> </font>you might experience problems
+        when <font face="Lucida Grande,Helvetica,Arial">these images
+          are used </font>with TR-DOS ROMs that use the turbo<font
+          face="Lucida Grande,Helvetica,Arial"> </font>format
+        (sequential sectors); for detailed information please see</font><br>
       <a
 href="http://web.archive.org/web/20070808150548/http://www.ramsoft.bbk.org/tech/tr-info.zip"><font
           face="Lucida Grande,Helvetica,Arial">http://web.archive.org/web/20070808150548/http://www.ramsoft.bbk.org/tech/tr-info.zip</font></a><br>
@@ -70,35 +71,32 @@
     <p><font face="Lucida Grande,Helvetica,Arial">.SCL<br>
       </font></p>
     <div style="margin-left: 40px;"><font face="Lucida
-        Grande,Helvetica,Arial">A simple archive format for
-        TR-DOS disk files. For specification please see</font><br>
-    <a
-        href="http://www.zx-modules.de/fileformats/sclformat.html"><font
-            face="Lucida Grande,Helvetica,Arial">http://www.zx-modules.de/fileformats/sclformat.html</font></a><br>
+        Grande,Helvetica,Arial">A simple archive format for TR-DOS disk
+        files. For specification please see</font><br>
+      <a href="http://www.zx-modules.de/fileformats/sclformat.html"><font
+          face="Lucida Grande,Helvetica,Arial">http://www.zx-modules.de/fileformats/sclformat.html</font></a><br>
     </div>
     <p><font face="Lucida Grande,Helvetica,Arial">.TD0<br>
       </font></p>
     <div style="margin-left: 40px;"><font face="Lucida
-        Grande,Helvetica,Arial">Teledisk image format; Fuse
-        supports only files not created with "Advanced Compression".
-        Detailed
+        Grande,Helvetica,Arial">Teledisk image format; Fuse supports
+        only files not created with "Advanced Compression". Detailed
         description found in <a
           href="http://www.classiccmp.org/dunfield/img54306/td0notes.txt"><span
             style="text-decoration: underline;"></span>http://www.classiccmp.org/dunfield/img54306/td0notes.txt</a>
-        and <a href="https://web.archive.org/web/20130116072335/http://www.fpns.net/willy/wteledsk.htm">https://web.archive.org/web/20130116072335/http://www.fpns.net/willy/wteledsk.htm</a>.</font><br>
+        and <a
+href="https://web.archive.org/web/20130116072335/http://www.fpns.net/willy/wteledsk.htm">https://web.archive.org/web/20130116072335/http://www.fpns.net/willy/wteledsk.htm</a>.</font><br>
     </div>
     <p><font face="Lucida Grande,Helvetica,Arial">.DSK<br>
       </font></p>
     <div style="margin-left: 40px;"><font face="Lucida
-        Grande,Helvetica,Arial">CPC disk image format; Fuse
-        supports the plain old and the new extended CPC format too.
-        Further
+        Grande,Helvetica,Arial">CPC disk image format; Fuse supports the
+        plain old and the new extended CPC format too. Further
         information please see the </font><font face="Lucida
-        Grande,Helvetica,Arial"><span class="emphasis"><em>The
-            .DSK Format</em></span></font> <font face="Lucida
-        Grande,Helvetica,Arial">section and the CPCEMU manual
-        section 7.7.1 <a
-          href="http://www.cpc-emu.org/linux/cpcemu_e.txt">http://www.cpc-emu.org/linux/cpcemu_e.txt</a>
+        Grande,Helvetica,Arial"><span class="emphasis"><em>The .DSK
+            Format</em></span></font> <font face="Lucida
+        Grande,Helvetica,Arial">section and the CPCEMU manual section
+        7.7.1 <a href="http://www.cpc-emu.org/linux/cpcemu_e.txt">http://www.cpc-emu.org/linux/cpcemu_e.txt</a>
         or <a href="http://www.cpctech.org.uk/docs/extdsk.html">http://www.cpctech.org.uk/docs/extdsk.html</a>.</font><br>
     </div>
     <p><font face="Lucida Grande,Helvetica,Arial">.OPD<br>
@@ -109,23 +107,19 @@
     </div>
     <br>
     <p><font face="Lucida Grande,Helvetica,Arial">Fuse supports the <span
-          style="font-style: italic;">.UDI, .FDI, .MGT, .IMG, .SAD,
-          .D80 .D40 .TRD, .SCL,
-          .OPD, .OPU and .DSK</span> (only the old CPC format)</font><font
-        face="Lucida Grande,Helvetica,Arial"> formats for writing.</font></p>
+          style="font-style: italic;">.UDI, .FDI, .MGT, .IMG, .SAD, .D80
+          .D40 .TRD, .SCL, .OPD, .OPU and .DSK</span> (only the old CPC
+        format)</font><font face="Lucida Grande,Helvetica,Arial">
+        formats for writing.</font></p>
     <p><font face="Lucida Grande,Helvetica,Arial"><span
           style="font-style: italic;"></span></font><font face="Lucida
-        Grande,Helvetica,Arial">You can save disk images with any
-        output format, just select the appropriate type from the disk
-        save
+        Grande,Helvetica,Arial">You can save disk images with any output
+        format, just select the appropriate type from the disk save
         dialog.</font></p>
     <p><font face="Lucida Grande,Helvetica,Arial">Not all image formats
-        can
-        store all disk image information. You cannot save a disk image
-        with an
-        inappropriate format that loses some information (e.g. variable
-        track
-        length or sector length).<br>
+        can store all disk image information. You cannot save a disk
+        image with an inappropriate format that loses some information
+        (e.g. variable track length or sector length).<br>
         <br>
       </font></p>
     <!-- AppleSegEnd -->

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/hacking/ChangeLog	2016-08-23 04:00:11 UTC (rev 822)
@@ -5178,7 +5178,7 @@
 20160526 debugger/commandl.l,man/fuse.1: allow strings with escaped spaces in
          the debugger (bug #337) (Sergio).
 20160528 ChangeLog: add even more recent changes (Fred).
-20160528 deugger/system_variable.c: include file (thanks, Fred) (Phil).
+20160528 debugger/system_variable.c: include file (thanks, Fred) (Phil).
 20160529 Makefile.am,lib/Makefile.am,z80/Makefile.am: distribute
          m4/ax_create_stdint_h.m4,lib/tests/success.d80.bz2 and z80/tests/README
          (Sergio).
@@ -5368,3 +5368,42 @@
          (Fred).
 20160717 ChangeLog,README,configure.ac,man/fuse.1: update release dates and mark
          this release as 1.2.1 (Fred).
+20160719 z80/{z80_debugger_variables.c,z80_internals.h}: include header for
+         z80_debugger_variables_init() definition (Fred).
+20160719 debugger/breakpoint.[ch]: rename local argument shadowing global
+         variable (Fred).
+20160719 ui/widget/browse.c: use description for tape blocks where available
+         (Fred).
+20160726 configure.ac,sound/coreaudiosound.c: remove lingering references to
+         deprecated Carbon APIs (Fred).
+20160731 Makefile.am,m4/glib-2.0.m4: remove the unused (since r5349) glib-2.0.m4
+         file (from patch #375) (Alberto Garcia).
+20160801 ui/{gtk,win32}/fileselector.c: add ".zip" to the file filters in
+         open file dialogs (thanks, Phil) (Sergio).
+20160807 utils.c: remove redundant whitespace (Fred).
+20160807 machines/specplus3.c: fix +3 disk autoload (part of bug #356) 
+         (thanks, windale and BogDan Vatra) (Fred).
+20160807 peripherals/disk/upd_fdc.c: fix floppy drive selection when resetting a
+         +3 (part of bug #356) (thanks, windale and BogDan Vatra) (Sergio).
+20160807 lib/{compressed,uncompressed}/disk_plus3.szx: update disk_plus3.szx to
+         set PC = 0x08E8 as the proper entry point for "Loader" menu option
+         (part of bug #356) (thanks, windale and BogDan Vatra) (Sergio).
+20160812 tape.c: change microphone state when 0 tstate pulses do not have the no
+         edge flag set (Fred).
+20160812 Makefile.am,configure.ac,m4/libxml.m4: use pkg-config to detect libpng
+         and libxml2 (more from patch #375) (Alberto Garcia).
+20160816 ChangeLog,README,configure.ac,man/fuse.1: bump versions to 1.2.2(-pre1)
+         (Fred).
+20160816 man/fuse.1,peripherals/{Makefile.am,disk/{disk.[ch],trdos.[ch]}}:
+         insert a boot loader in TRD/SCL disk images when autoload is enabled
+         (part of feature request #90) (thanks, windale, BogDan and Fred)
+         (Sergio).
+20160817 ChangeLog: tweak zip support description (disks are not supported)
+         (Sergio).
+20160817 man/fuse.1: document zip compression support (Sergio).
+20160817 ui/gtk/fileselector.c: add ".png" to the file filters in save file
+         dialogs and check the support for ".svg" files (Sergio).
+20160820 ui/options.dat: fix mnemonics in drives setup to avoid collisions
+         (Sergio).
+20160821 ChangeLog,README,configure.ac,man/fuse.1: update release dates and mark
+         this release as 1.2.2 (Fred).

Modified: trunk/fuse/lib/compressed/disk_plus3.szx
===================================================================
(Binary files differ)

Modified: trunk/fuse/lib/uncompressed/disk_plus3.szx
===================================================================
(Binary files differ)

Deleted: trunk/fuse/m4/glib-2.0.m4
===================================================================
--- trunk/fuse/m4/glib-2.0.m4	2016-08-22 12:00:26 UTC (rev 821)
+++ trunk/fuse/m4/glib-2.0.m4	2016-08-23 04:00:11 UTC (rev 822)
@@ -1,214 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-# Taken from Glib 2.4.2 by PAK 2004/07/06
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest     ...
 
[truncated message content]