Fuse 1.3.5:

Emulation core improvements:
* Disable tape traps when playing/recording RZX files

Miscellaneous improvements:
* Fix typo in LOG disk format
* Replace old ticket numbers from Trac to Allura
* WidgetUI: Fix memory leak in file selector
* Fix allocator sizeof operand mismatch and remove dead assignment
* Remove prototypes of old plus3 disk functions
* Increase allocated memory to keep GCC7 happy

10 files changed, 66 insertions, 59 deletions

diff --git a/emulators/fuse-emulator/Makefile b/emulators/fuse-emulator/Makefile
index 3769cacfd42..55908669282 100644
--- a/emulators/fuse-emulator/Makefile
+++ b/emulators/fuse-emulator/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2017/02/12 06:25:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2017/05/26 19:35:48 adam Exp $
 
-DISTNAME=	fuse-1.1.1
+DISTNAME=	fuse-1.3.5
 PKGNAME=	${DISTNAME:S/fuse/fuse-emulator/}
-PKGREVISION=	11
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
diff --git a/emulators/fuse-emulator/PLIST b/emulators/fuse-emulator/PLIST
index 96ff4340300..ad422f12cec 100644
--- a/emulators/fuse-emulator/PLIST
+++ b/emulators/fuse-emulator/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/01/17 14:27:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/05/26 19:35:48 adam Exp $
 bin/fuse
 man/man1/fuse.1
 share/fuse/128-0.rom
@@ -7,8 +7,9 @@ share/fuse/48.rom
 share/fuse/cassette.bmp
 share/fuse/disciple.rom
 share/fuse/disk_plus3.szx
+${PLIST.sdl}share/fuse/fuse.font
 share/fuse/keyboard.scr
-share/fuse/menu_data.ui
+${PLIST.gtk}share/fuse/menu_data.ui
 share/fuse/microdrive.bmp
 share/fuse/plus2-0.rom
 share/fuse/plus2-1.rom
diff --git a/emulators/fuse-emulator/distinfo b/emulators/fuse-emulator/distinfo
index d0b06b58e86..b575acc8284 100644
--- a/emulators/fuse-emulator/distinfo
+++ b/emulators/fuse-emulator/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.1 2016/01/17 14:27:38 wiz Exp $
+$NetBSD: distinfo,v 1.2 2017/05/26 19:35:48 adam Exp $
 
-SHA1 (fuse-1.1.1.tar.gz) = 92dc42bf9e8d26c42858059d59d522255041ab5d
-RMD160 (fuse-1.1.1.tar.gz) = 5bb00bf401050101fe2da3ec9a7f9ccc3069e82c
-SHA512 (fuse-1.1.1.tar.gz) = 67d12c56057a13121d8a5c073002dd2168268894669bdb50f3aba977cb1f53afa48774bfcb438a627a5afdbd2288248d4449e57d744e17b9e3eba00970685a14
-Size (fuse-1.1.1.tar.gz) = 1881332 bytes
-SHA1 (patch-aa) = 68d610ec43b220400e7781ae84327926c9d5c498
-SHA1 (patch-ac) = 356002f998673f4a5ac2a78285e3bd7b1139be64
-SHA1 (patch-ad) = bdd8fab4de20b906128d3c19b9faffcbc6781e50
-SHA1 (patch-configure) = 7108d14dec459121301f93bf797671408861beb3
-SHA1 (patch-screenshot.c) = e09bf2cd264bf66bed57a41b623c1fa20e216c6b
+SHA1 (fuse-1.3.5.tar.gz) = 9bd104e7acd45847a1816882e59c0a77f3f4b507
+RMD160 (fuse-1.3.5.tar.gz) = 5aa1e5266ce55ea4176cdb3d0de71c43b4e119ee
+SHA512 (fuse-1.3.5.tar.gz) = 4176d4245f64c50ce6b36954eb142a2303650cfd9f34bd245eaa65fee72b04a09df4a8764c020c4948c08fbd379c0f410607a6a7809a2dc13d5330b6de4f292a
+Size (fuse-1.3.5.tar.gz) = 1635381 bytes
+SHA1 (patch-configure) = 0b8b90751bd34efcee5c1bd9e4cb8687e972b127
+SHA1 (patch-sound_osssound.c) = e83d80c984592b4e52faccbea35cdc9b54b71933
+SHA1 (patch-ui_gtk_gtkmouse.c) = 95cd6a5515bfad7a118ddb0c3b2f36ba0b08d9ed
+SHA1 (patch-ui_gtk_gtkui.c) = 4789f241793ab9449d5df3b019b48607d4d24e9c
diff --git a/emulators/fuse-emulator/options.mk b/emulators/fuse-emulator/options.mk
index 12e586d85d6..934b686beed 100644
--- a/emulators/fuse-emulator/options.mk
+++ b/emulators/fuse-emulator/options.mk
@@ -1,17 +1,21 @@
-# $NetBSD: options.mk,v 1.1 2016/01/17 14:27:38 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2017/05/26 19:35:48 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fuse
-PKG_SUPPORTED_OPTIONS=	sdl gtk
+PKG_SUPPORTED_OPTIONS=	gtk sdl
 PKG_SUGGESTED_OPTIONS=	gtk
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		gtk sdl
+
 .if !empty(PKG_OPTIONS:Mgtk)
-CONFIGURE_ARGS+=	--with-gtk2
-.include "../../x11/gtk2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gtk3
+PLIST.gtk=		yes
+.include "../../x11/gtk3/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=	--with-sdl
+PLIST.sdl=		yes
 .include "../../devel/SDL/buildlink3.mk"
 .endif
diff --git a/emulators/fuse-emulator/patches/patch-ad b/emulators/fuse-emulator/patches/patch-ad
deleted file mode 100644
index 3243d5f321e..00000000000
--- a/emulators/fuse-emulator/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2016/01/17 14:27:38 wiz Exp $
-
---- ui/gtk/Makefile.in.orig	2013-05-24 20:56:08.000000000 +0000
-+++ ui/gtk/Makefile.in
-@@ -314,7 +314,7 @@ libuigtk_la_SOURCES = binary.c browse.c 
- 	gtkmouse.c gtkui.c keysyms.c memory.c menu_data.c options.c \
- 	picture.c pixmaps.c pokefinder.c pokemem.c rollback.c roms.c \
- 	statusbar.c stock.c $(am__append_1)
--libuigtk_la_LIBADD = @GTK_LIBS@ -lX11 
-+libuigtk_la_LIBADD = @GTK_LIBS@
- BUILT_SOURCES = keysyms.c \
- 		menu_data.c \
- 		menu_data.ui \
diff --git a/emulators/fuse-emulator/patches/patch-configure b/emulators/fuse-emulator/patches/patch-configure
index c397c30ad30..0e4d374e1f1 100644
--- a/emulators/fuse-emulator/patches/patch-configure
+++ b/emulators/fuse-emulator/patches/patch-configure
@@ -1,15 +1,14 @@
-$NetBSD: patch-configure,v 1.1 2016/01/17 14:27:38 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2017/05/26 19:35:48 adam Exp $
 
-Fix unportable test(1) construct.
+Do not assume GTK requires linking against X11.
 
---- configure.orig	2013-06-14 20:38:14.000000000 +0000
+--- configure.orig	2017-05-26 17:54:18.000000000 +0000
 +++ configure
-@@ -17868,7 +17868,7 @@ if test "$desktopdir" = yes; then
- else
-   DESKTOP_DATADIR="$datadir"
+@@ -15004,7 +15004,6 @@ $as_echo "$as_me: WARNING: GTK+ not foun
+ $as_echo "#define UI_GTK 1" >>confdefs.h
+ 
+     UI=gtk;
+-    LIBS="$LIBS -lX11";
+   fi
  fi
-- if test "$desktopdir" == yes; then
-+ if test "$desktopdir" = yes; then
-   DESKTOP_DATADIR_TRUE=
-   DESKTOP_DATADIR_FALSE='#'
- else
+ 
diff --git a/emulators/fuse-emulator/patches/patch-screenshot.c b/emulators/fuse-emulator/patches/patch-screenshot.c
deleted file mode 100644
index 35dbdbc0363..00000000000
--- a/emulators/fuse-emulator/patches/patch-screenshot.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-screenshot.c,v 1.1 2016/01/17 14:27:38 wiz Exp $
-
-Include Zlib header.
-
---- screenshot.c.orig	2013-05-16 20:26:23.000000000 +0000
-+++ screenshot.c
-@@ -47,6 +47,7 @@
- 
- #ifdef USE_LIBPNG
- 
-+#include <zlib.h>
- #include <png.h>
- #ifdef HAVE_ZLIB_H
- #include <zlib.h>
diff --git a/emulators/fuse-emulator/patches/patch-aa b/emulators/fuse-emulator/patches/patch-sound_osssound.c
index c6ada9fb84b..7fd1ed53eea 100644
--- a/emulators/fuse-emulator/patches/patch-aa
+++ b/emulators/fuse-emulator/patches/patch-sound_osssound.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2016/01/17 14:27:38 wiz Exp $
+$NetBSD: patch-sound_osssound.c,v 1.1 2017/05/26 19:35:48 adam Exp $
+
+Use correct OSS device across platforms.
 
 --- sound/osssound.c.orig	2007-12-21 17:43:10.000000000 +0100
 +++ sound/osssound.c
diff --git a/emulators/fuse-emulator/patches/patch-ui_gtk_gtkmouse.c b/emulators/fuse-emulator/patches/patch-ui_gtk_gtkmouse.c
new file mode 100644
index 00000000000..b1e9bac22ba
--- /dev/null
+++ b/emulators/fuse-emulator/patches/patch-ui_gtk_gtkmouse.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-ui_gtk_gtkmouse.c,v 1.1 2017/05/26 19:35:48 adam Exp $
+
+Fix for a case when GTK has been compiled with Quartz support.
+
+--- ui/gtk/gtkmouse.c.orig	2017-05-26 17:42:26.000000000 +0000
++++ ui/gtk/gtkmouse.c
+@@ -31,8 +31,10 @@
+ #include "ui/ui.h"
+ 
+ /* For XWarpPointer *only* - see below */
++#ifndef GDK_WINDOWING_QUARTZ
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
++#endif
+ 
+ static GdkCursor *nullpointer = NULL;
+ 
+@@ -48,8 +50,10 @@ gtkmouse_reset_pointer( void )
+    */
+   GdkWindow *window = gtk_widget_get_window( gtkui_drawing_area );
+ 
++#ifndef GDK_WINDOWING_QUARTZ
+   XWarpPointer( GDK_WINDOW_XDISPLAY( window ), None, 
+                 GDK_WINDOW_XID( window ), 0, 0, 0, 0, 128, 128 );
++#endif
+ }
+ 
+ gboolean
diff --git a/emulators/fuse-emulator/patches/patch-ac b/emulators/fuse-emulator/patches/patch-ui_gtk_gtkui.c
index dde6188b444..bdd5c7e880d 100644
--- a/emulators/fuse-emulator/patches/patch-ac
+++ b/emulators/fuse-emulator/patches/patch-ui_gtk_gtkui.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2016/01/17 14:27:38 wiz Exp $
+$NetBSD: patch-ui_gtk_gtkui.c,v 1.1 2017/05/26 19:35:48 adam Exp $
+
+Fix for a case when GTK has been compiled with Quartz support.
 
 --- ui/gtk/gtkui.c.orig	2010-12-20 20:17:04.000000000 +0000
 +++ ui/gtk/gtkui.c