disable fl_update_focus calls on WIN32 and __APPLE_ since they are not defined there

5 files changed, 24 insertions, 13 deletions

diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile
index 911d9a3c9dc..5d9e7a569db 100644
--- a/x11/fltk13/Makefile
+++ b/x11/fltk13/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2015/12/13 17:48:04 richard Exp $
+# $NetBSD: Makefile,v 1.22 2016/01/26 08:47:28 dbj Exp $
 
 DISTNAME=	fltk-1.3.3-source
+PKGREVISION=	1
 PKGNAME=	${DISTNAME:S/-source//}
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=	x11
diff --git a/x11/fltk13/buildlink3.mk b/x11/fltk13/buildlink3.mk
index 92bb4b9b08f..435487cce84 100644
--- a/x11/fltk13/buildlink3.mk
+++ b/x11/fltk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/04/25 14:25:04 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2016/01/26 08:47:28 dbj Exp $
 
 BUILDLINK_TREE+=	fltk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	fltk
 FLTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.3.0
-BUILDLINK_ABI_DEPENDS.fltk?=	fltk>=1.3.2nb5
+BUILDLINK_ABI_DEPENDS.fltk?=	fltk>=1.3.3nb1
 BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk13
 BUILDLINK_FILES.fltk+=		include/Fl/*
 
diff --git a/x11/fltk13/distinfo b/x11/fltk13/distinfo
index cd24f5a8f1f..a9163bd057b 100644
--- a/x11/fltk13/distinfo
+++ b/x11/fltk13/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 03:28:29 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/01/26 08:47:28 dbj Exp $
 
 SHA1 (fltk-1.3.3-source.tar.gz) = 873aac49b277149e054b9740378e2ca87b0bd435
 RMD160 (fltk-1.3.3-source.tar.gz) = a1736ec7da1ff751153e09bc5b5136d2fa95c18b
@@ -13,9 +13,9 @@ SHA1 (patch-ad) = 01a25d7265784572fbd0c7d2c6f029d45333ad21
 SHA1 (patch-ae) = 88da94679399b3a8710c23b7f41a7debc8bc92b8
 SHA1 (patch-af) = a4154e31fca9ecf125922a84ac39771bc71dcb0f
 SHA1 (patch-ag) = 61e6d166d0910e02558bacea629f7fb736f7304c
-SHA1 (patch-src_Fl.cxx) = cbd014ab18b1ebcb32a7d249d5dd09caf3547e05
+SHA1 (patch-src_Fl.cxx) = 169ed990645180694b7cce5baad72a28ac4fcb7a
 SHA1 (patch-src_Fl_cocoa.mm) = 878038c611623b5337634e43d756bfb291872b18
-SHA1 (patch-src_Fl_grab.cxx) = 21666c5b577c9f346b506a1c79c9a56ff30f886a
+SHA1 (patch-src_Fl_grab.cxx) = 08e2ddabf55c7de46558681ec651acc134182e01
 SHA1 (patch-src_Fl_x.cxx) = ca7e4b98c52a84d0bc23ecf33fc30f94c0d16d35
 SHA1 (patch-src_xutf8_imKStoUCS.c) = 55ba2343b6f021bba03f67410078ae419b3354be
 SHA1 (patch-test_Makefile) = 5c3ad88366f45af1580690af938d54cd81b6beb7
diff --git a/x11/fltk13/patches/patch-src_Fl.cxx b/x11/fltk13/patches/patch-src_Fl.cxx
index e425a4bbd4f..c81fddcda20 100644
--- a/x11/fltk13/patches/patch-src_Fl.cxx
+++ b/x11/fltk13/patches/patch-src_Fl.cxx
@@ -1,24 +1,28 @@
-$NetBSD: patch-src_Fl.cxx,v 1.1 2015/07/21 21:36:41 markd Exp $
+$NetBSD: patch-src_Fl.cxx,v 1.2 2016/01/26 08:47:28 dbj Exp $
 
 part of tigervnc.patch from archlinux package. 
 
 --- src/Fl.cxx.orig	2014-10-08 12:47:20.000000000 +0000
 +++ src/Fl.cxx
-@@ -70,6 +70,8 @@ void fl_cleanup_dc_list(void);
+@@ -70,6 +70,10 @@ void fl_cleanup_dc_list(void);
  extern double fl_mac_flush_and_wait(double time_to_wait);
  #endif // WIN32
  
++#if !defined(WIN32) && !defined(__APPLE__)
 +extern void fl_update_focus(void);
++#endif
 +
  //
  // Globals...
  //
-@@ -982,6 +984,8 @@ void Fl::focus(Fl_Widget *o) {
+@@ -982,6 +986,10 @@ void Fl::focus(Fl_Widget *o) {
        fl_oldfocus = p;
      }
      e_number = old_event;
++#if !defined(WIN32) && !defined(__APPLE__)
 +    // let the platform code do what it needs
 +    fl_update_focus();
++#endif
    }
  }
  
diff --git a/x11/fltk13/patches/patch-src_Fl_grab.cxx b/x11/fltk13/patches/patch-src_Fl_grab.cxx
index 90bb6e63468..8fb498350b9 100644
--- a/x11/fltk13/patches/patch-src_Fl_grab.cxx
+++ b/x11/fltk13/patches/patch-src_Fl_grab.cxx
@@ -1,30 +1,36 @@
-$NetBSD: patch-src_Fl_grab.cxx,v 1.1 2015/07/21 21:36:41 markd Exp $
+$NetBSD: patch-src_Fl_grab.cxx,v 1.2 2016/01/26 08:47:28 dbj Exp $
 
 part of tigervnc.patch from archlinux package. 
 
 --- src/Fl_grab.cxx.orig	2012-03-23 16:47:53.000000000 +0000
 +++ src/Fl_grab.cxx
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,9 @@
  // override_redirect, it does similar things on WIN32.
  
  extern void fl_fix_focus(); // in Fl.cxx
++#if !defined(WIN32) && !defined(__APPLE__)
 +extern void fl_update_focus(void);
++#endif
  
  #ifdef WIN32
  // We have to keep track of whether we have captured the mouse, since
-@@ -80,6 +81,7 @@ void Fl::grab(Fl_Window* win) {
+@@ -80,6 +83,9 @@ void Fl::grab(Fl_Window* win) {
  #endif
      }
      grab_ = win;
++#if !defined(WIN32) && !defined(__APPLE__)
 +    fl_update_focus();
++#endif
    } else {
      if (grab_) {
  #ifdef WIN32
-@@ -98,6 +100,7 @@ void Fl::grab(Fl_Window* win) {
+@@ -98,6 +104,9 @@ void Fl::grab(Fl_Window* win) {
        XFlush(fl_display);
  #endif
        grab_ = 0;
++#if !defined(WIN32) && !defined(__APPLE__)
 +      fl_update_focus();
++#endif
        fl_fix_focus();
      }
    }