diff options
-rw-r--r-- | x11/fltk13/Makefile | 5 | ||||
-rw-r--r-- | x11/fltk13/PLIST | 3 | ||||
-rw-r--r-- | x11/fltk13/distinfo | 33 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-FL_Enumerations.H | 53 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-FL_Fl_Widget.H | 60 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-aa | 8 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-ab | 50 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-ac | 8 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-ad | 6 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-ae | 8 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-af | 6 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-ag | 48 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-src_Fl.cxx | 28 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx | 15 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-src_Fl_cocoa.mm | 15 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-src_Fl_grab.cxx | 36 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-src_Fl_x.cxx | 45 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c | 28 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-test_Makefile | 38 |
19 files changed, 79 insertions, 414 deletions
diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile index d49b9807b8b..9cde2b631aa 100644 --- a/x11/fltk13/Makefile +++ b/x11/fltk13/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2018/03/12 11:15:49 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2018/07/13 04:24:39 dbj Exp $ -DISTNAME= fltk-1.3.3-source -PKGREVISION= 4 +DISTNAME= fltk-1.3.4-source PKGNAME= ${DISTNAME:S/-source//} VERS= ${DISTNAME:S/fltk-//:S/-source//} CATEGORIES= x11 diff --git a/x11/fltk13/PLIST b/x11/fltk13/PLIST index cfd98d782b9..98a8ce8a089 100644 --- a/x11/fltk13/PLIST +++ b/x11/fltk13/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.4 2015/12/29 06:02:25 dholland Exp $ +@comment $NetBSD: PLIST,v 1.5 2018/07/13 04:24:39 dbj Exp $ bin/fltk-config bin/fluid +include/FL/abi-version.h include/FL/Enumerations.H ${PLIST.cs}include/FL/Enumerations.h include/FL/Fl.H diff --git a/x11/fltk13/distinfo b/x11/fltk13/distinfo index 0e33cf22514..2b306fdafe3 100644 --- a/x11/fltk13/distinfo +++ b/x11/fltk13/distinfo @@ -1,22 +1,13 @@ -$NetBSD: distinfo,v 1.9 2016/12/16 00:08:03 joerg Exp $ +$NetBSD: distinfo,v 1.10 2018/07/13 04:24:39 dbj Exp $ -SHA1 (fltk-1.3.3-source.tar.gz) = 873aac49b277149e054b9740378e2ca87b0bd435 -RMD160 (fltk-1.3.3-source.tar.gz) = a1736ec7da1ff751153e09bc5b5136d2fa95c18b -SHA512 (fltk-1.3.3-source.tar.gz) = 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d -Size (fltk-1.3.3-source.tar.gz) = 4986376 bytes -SHA1 (patch-FL_Enumerations.H) = 88fd3fc95e361604b3ec735fcf23865db02152e2 -SHA1 (patch-FL_Fl_Widget.H) = c2a80956ba2245a9addb53ca974d658020c5525d -SHA1 (patch-aa) = 777b293800af60ac508968946bcb9bc448c1ea00 -SHA1 (patch-ab) = fa941f28b2c17577a8473313f4906e8724183906 -SHA1 (patch-ac) = 9ab9a8ab5d2fd54ff0fcdeb7e2486aa3b83be5de -SHA1 (patch-ad) = 01a25d7265784572fbd0c7d2c6f029d45333ad21 -SHA1 (patch-ae) = 88da94679399b3a8710c23b7f41a7debc8bc92b8 -SHA1 (patch-af) = a4154e31fca9ecf125922a84ac39771bc71dcb0f -SHA1 (patch-ag) = 61e6d166d0910e02558bacea629f7fb736f7304c -SHA1 (patch-src_Fl.cxx) = 169ed990645180694b7cce5baad72a28ac4fcb7a -SHA1 (patch-src_Fl__Tree__Item.cxx) = 39c0c4cbb905caef8cb2ff4159fa12c42ed890d6 -SHA1 (patch-src_Fl_cocoa.mm) = 878038c611623b5337634e43d756bfb291872b18 -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 +SHA1 (fltk-1.3.4-source.tar.gz) = 3c58770d2920a219d07641fa403de2c8c57bb7f0 +RMD160 (fltk-1.3.4-source.tar.gz) = a660ec3b18e89426c2edb76818bbfcec6a6f5890 +SHA512 (fltk-1.3.4-source.tar.gz) = 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2 +Size (fltk-1.3.4-source.tar.gz) = 5284217 bytes +SHA1 (patch-aa) = 335993d2e6b232b0539e583fb2463bafdffbb9b3 +SHA1 (patch-ac) = 4ee251d11b3840f525f473fe6c320e4d16ac95e1 +SHA1 (patch-ad) = 5a17f8fb46ce65b4795618d6aa22f445b55f6aa8 +SHA1 (patch-ae) = 4952426cd6ecc67921779de95f68835aa3bdaa9c +SHA1 (patch-af) = 4c2b772cc8bd6729aeb94ee4e871c2d982356616 +SHA1 (patch-ag) = 2339189b49551d27a8246d9efd9fed4b26732dde +SHA1 (patch-test_Makefile) = a2e47c0c21983b8906898eea3f19b19c2f09386c diff --git a/x11/fltk13/patches/patch-FL_Enumerations.H b/x11/fltk13/patches/patch-FL_Enumerations.H deleted file mode 100644 index 05773b44001..00000000000 --- a/x11/fltk13/patches/patch-FL_Enumerations.H +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-FL_Enumerations.H,v 1.1 2015/07/21 21:36:41 markd Exp $ - -part of tigervnc.patch from archlinux package. - ---- FL/Enumerations.H.orig 2014-10-15 21:00:20.000000000 +0000 -+++ FL/Enumerations.H -@@ -909,27 +909,27 @@ inline Fl_Color fl_color_cube(int r, int - /* FIXME: We should renumber these, but that will break the ABI */ - enum Fl_Cursor { - FL_CURSOR_DEFAULT = 0, /**< the default cursor, usually an arrow. */ -- FL_CURSOR_ARROW = 35, /**< an arrow pointer. */ -- FL_CURSOR_CROSS = 66, /**< crosshair. */ -- FL_CURSOR_WAIT = 76, /**< busy indicator (e.g. hourglass). */ -- FL_CURSOR_INSERT = 77, /**< I-beam. */ -- FL_CURSOR_HAND = 31, /**< pointing hand. */ -- FL_CURSOR_HELP = 47, /**< question mark pointer. */ -- FL_CURSOR_MOVE = 27, /**< 4-pointed arrow or hand. */ -+ FL_CURSOR_ARROW = 1, /**< an arrow pointer. */ -+ FL_CURSOR_CROSS = 2, /**< crosshair. */ -+ FL_CURSOR_WAIT = 3, /**< busy indicator (e.g. hourglass). */ -+ FL_CURSOR_INSERT = 4, /**< I-beam. */ -+ FL_CURSOR_HAND = 5, /**< pointing hand. */ -+ FL_CURSOR_HELP = 6, /**< question mark pointer. */ -+ FL_CURSOR_MOVE = 7, /**< 4-pointed arrow or hand. */ - - /* Resize indicators */ -- FL_CURSOR_NS = 78, /**< up/down resize. */ -- FL_CURSOR_WE = 79, /**< left/right resize. */ -- FL_CURSOR_NWSE = 80, /**< diagonal resize. */ -- FL_CURSOR_NESW = 81, /**< diagonal resize. */ -- FL_CURSOR_N = 70, /**< upwards resize. */ -- FL_CURSOR_NE = 69, /**< upwards, right resize. */ -- FL_CURSOR_E = 49, /**< rightwards resize. */ -- FL_CURSOR_SE = 8, /**< downwards, right resize. */ -- FL_CURSOR_S = 9, /**< downwards resize. */ -- FL_CURSOR_SW = 7, /**< downwards, left resize. */ -- FL_CURSOR_W = 36, /**< leftwards resize. */ -- FL_CURSOR_NW = 68, /**< upwards, left resize. */ -+ FL_CURSOR_NS = 101, /**< up/down resize. */ -+ FL_CURSOR_WE = 102, /**< left/right resize. */ -+ FL_CURSOR_NWSE = 103, /**< diagonal resize. */ -+ FL_CURSOR_NESW = 104, /**< diagonal resize. */ -+ FL_CURSOR_NE = 110, /**< upwards, right resize. */ -+ FL_CURSOR_N = 111, /**< upwards resize. */ -+ FL_CURSOR_NW = 112, /**< upwards, left resize. */ -+ FL_CURSOR_E = 113, /**< rightwards resize. */ -+ FL_CURSOR_W = 114, /**< leftwards resize. */ -+ FL_CURSOR_SE = 115, /**< downwards, right resize. */ -+ FL_CURSOR_S = 116, /**< downwards resize. */ -+ FL_CURSOR_SW = 117, /**< downwards, left resize. */ - - FL_CURSOR_NONE =255 /**< invisible. */ - }; diff --git a/x11/fltk13/patches/patch-FL_Fl_Widget.H b/x11/fltk13/patches/patch-FL_Fl_Widget.H deleted file mode 100644 index beb55a95785..00000000000 --- a/x11/fltk13/patches/patch-FL_Fl_Widget.H +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-FL_Fl_Widget.H,v 1.2 2015/07/21 21:36:41 markd Exp $ - -Fl_X tries to access protected members of Fl_Widget. - -and part of tigervnc.patch from archlinux package. - ---- FL/Fl_Widget.H.orig 2014-09-08 08:55:49.000000000 +0000 -+++ FL/Fl_Widget.H -@@ -99,6 +99,7 @@ struct FL_EXPORT Fl_Label { - */ - class FL_EXPORT Fl_Widget { - friend class Fl_Group; -+ friend class Fl_X; - - Fl_Group* parent_; - Fl_Callback* callback_; -@@ -172,6 +173,7 @@ protected: - COPIED_TOOLTIP = 1<<17, ///< the widget tooltip is internally copied, its destruction is handled by the widget - FULLSCREEN = 1<<18, ///< a fullscreen window (Fl_Window) - MAC_USE_ACCENTS_MENU = 1<<19, ///< On the Mac OS platform, pressing and holding a key on the keyboard opens an accented-character menu window (Fl_Input_, Fl_Text_Editor) -+ SIMPLE_KEYBOARD = 1<<20, ///< the widget wants simple, consistent keypresses and not advanced input (like character composition and CJK input) - // (space for more flags) - USERFLAG3 = 1<<29, ///< reserved for 3rd party extensions - USERFLAG2 = 1<<30, ///< reserved for 3rd party extensions -@@ -789,6 +791,35 @@ public: - */ - void set_active() {flags_ &= ~INACTIVE;} - -+ /** -+ Returns if the widget sees a simplified keyboard model or not. -+ -+ Normally widgets get a full-featured keyboard model that is geared -+ towards text input. This includes support for compose sequences and -+ advanced input methods, commonly used for asian writing system. This -+ system however has downsides in that extra graphic can be presented -+ to the user and that a physical key press doesn't correspond directly -+ to a FLTK event. -+ -+ Widgets that need a direct correspondence between actual key events -+ and those seen by the widget can swith to the simplified keyboard -+ model. -+ -+ \retval 0 if the widget uses the normal keyboard model -+ \see set_changed(), clear_changed() -+ */ -+ unsigned int simple_keyboard() const {return flags_&SIMPLE_KEYBOARD;} -+ -+ /** Marks a widget to use the simple keyboard model. -+ \see changed(), clear_changed() -+ */ -+ void set_simple_keyboard() {flags_ |= SIMPLE_KEYBOARD;} -+ -+ /** Marks a widget to use the normal keyboard model. -+ \see changed(), set_changed() -+ */ -+ void set_normal_keyboard() {flags_ &= ~SIMPLE_KEYBOARD;} -+ - /** Gives the widget the keyboard focus. - Tries to make this widget be the Fl::focus() widget, by first sending - it an FL_FOCUS event, and if it returns non-zero, setting diff --git a/x11/fltk13/patches/patch-aa b/x11/fltk13/patches/patch-aa index fb9d55b0d77..7f1e1e64c6c 100644 --- a/x11/fltk13/patches/patch-aa +++ b/x11/fltk13/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2011/12/01 16:35:12 is Exp $ +$NetBSD: patch-aa,v 1.2 2018/07/13 04:24:39 dbj Exp $ ---- Makefile.orig 2011-02-15 15:29:03.000000000 +0000 +--- Makefile.orig 2016-09-30 11:33:14.000000000 +0000 +++ Makefile -@@ -27,7 +27,7 @@ +@@ -18,7 +18,7 @@ include makeinclude @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2011/12/01 16:35:12 is Exp $ all: makeinclude fltk-config for dir in $(DIRS); do\ -@@ -35,6 +35,14 @@ all: makeinclude fltk-config +@@ -26,6 +26,14 @@ all: makeinclude fltk-config (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ done diff --git a/x11/fltk13/patches/patch-ab b/x11/fltk13/patches/patch-ab deleted file mode 100644 index 0fee29e8b7a..00000000000 --- a/x11/fltk13/patches/patch-ab +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2015/07/21 21:36:41 markd Exp $ - ---- configure.in.orig 2014-10-30 14:07:58.000000000 +0000 -+++ configure.in -@@ -157,6 +157,7 @@ AC_SUBST(IMGLIBNAME) - AC_SUBST(CAIROLIBNAME) - AC_SUBST(LIBEXT) - AC_SUBST(LIBNAME) -+AC_SUBST(LIBTOOL) - AC_SUBST(LINKFLTK) - AC_SUBST(LINKFLTKFORMS) - AC_SUBST(LINKFLTKGL) -@@ -185,6 +186,15 @@ fi - AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support [[default=yes]]]) - - AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [[default=no]]]) -+AC_ARG_ENABLE(libtool, [ --enable-libtool=LIBTOOL_PATH -+ turn on building with libtool [default=no]],[ -+if eval "test x$enable_libtool != xno"; then -+ LIBTOOL="$enable_libtool" -+ enable_shared=no -+else -+ LIBTOOL="" -+fi]) -+ - if test x$enable_shared = xyes; then - PICFLAG=1 - SHAREDSUFFIX="" -@@ -358,6 +368,21 @@ else - LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" - fi - -+if test "x$LIBTOOL" != "x"; then -+ LINKFLTK="../src/libfltk.la" -+ if test "x$LINKFLTKGL" != "x"; then -+ LINKFLTKGL="../src/libfltk_gl.la" -+ fi -+ if test "x$LINKFLTKIMG" != "x"; then -+ LINKFLTKIMG="../src/libfltk_images.la" -+ fi -+ LINKSHARED="-lfltk_images -lfltk_forms -lfltk" -+ DSONAME="libfltk.la" -+ FLDSONAME="libfltk_forms.la" -+ GLDSONAME="libfltk_gl.la" -+ IMGDSONAME="libfltk_images.la" -+fi -+ - AC_SUBST(DSOCOMMAND) - AC_SUBST(DSOFLAGS) - AC_SUBST(DSOLINK) diff --git a/x11/fltk13/patches/patch-ac b/x11/fltk13/patches/patch-ac index 8817f44050e..5914cd321c1 100644 --- a/x11/fltk13/patches/patch-ac +++ b/x11/fltk13/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ +$NetBSD: patch-ac,v 1.2 2018/07/13 04:24:39 dbj Exp $ ---- configure.orig 2011-06-16 15:50:44.000000000 +0000 +--- configure.orig 2016-11-11 16:04:30.000000000 +0000 +++ configure -@@ -1999,7 +1999,22 @@ if test "${enable_shared+set}" = set; th +@@ -3816,7 +3816,22 @@ if test "${enable_shared+set}" = set; th enableval=$enable_shared; fi @@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ PICFLAG=1 SHAREDSUFFIX="" FLUID="fluid-shared" -@@ -2138,6 +2153,20 @@ else +@@ -4051,6 +4066,20 @@ else LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" fi diff --git a/x11/fltk13/patches/patch-ad b/x11/fltk13/patches/patch-ad index 40facf5c2e8..44e9d5ba13a 100644 --- a/x11/fltk13/patches/patch-ad +++ b/x11/fltk13/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ +$NetBSD: patch-ad,v 1.2 2018/07/13 04:24:39 dbj Exp $ ---- documentation/Makefile.orig 2011-01-05 23:00:33.000000000 +0000 +--- documentation/Makefile.orig 2015-06-16 13:18:28.000000000 +0000 +++ documentation/Makefile -@@ -92,11 +92,6 @@ install: $(MANPAGES) +@@ -88,11 +88,6 @@ install: $(MANPAGES) $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ fi echo "Installing man pages in $(DESTDIR)$(mandir) ..." diff --git a/x11/fltk13/patches/patch-ae b/x11/fltk13/patches/patch-ae index af8c504f002..7457e85aaa2 100644 --- a/x11/fltk13/patches/patch-ae +++ b/x11/fltk13/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2015/07/21 21:36:41 markd Exp $ +$NetBSD: patch-ae,v 1.3 2018/07/13 04:24:39 dbj Exp $ ---- fluid/Makefile.orig 2013-09-21 17:23:09.000000000 +0000 +--- fluid/Makefile.orig 2016-07-17 19:51:54.000000000 +0000 +++ fluid/Makefile -@@ -48,7 +48,7 @@ all: $(FLUID) fluid$(EXEEXT) +@@ -50,7 +50,7 @@ all: $(FLUID) fluid$(EXEEXT) fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ $(IMGLIBNAME) echo Linking $@... @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.2 2015/07/21 21:36:41 markd Exp $ $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ -@@ -70,7 +70,7 @@ include makedepend +@@ -72,7 +72,7 @@ include makedepend install: all echo "Installing FLUID in $(DESTDIR)$(bindir)..." -$(INSTALL_DIR) $(DESTDIR)$(bindir) diff --git a/x11/fltk13/patches/patch-af b/x11/fltk13/patches/patch-af index 50577b096e6..f474355115b 100644 --- a/x11/fltk13/patches/patch-af +++ b/x11/fltk13/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2013/06/09 16:09:35 ryoon Exp $ +$NetBSD: patch-af,v 1.3 2018/07/13 04:24:39 dbj Exp $ ---- makeinclude.in.orig 2012-12-05 14:53:03.000000000 +0000 +--- makeinclude.in.orig 2015-03-25 20:06:54.000000000 +0000 +++ makeinclude.in -@@ -138,20 +138,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ +@@ -150,20 +150,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ .o$(EXEEXT): echo Linking $@... diff --git a/x11/fltk13/patches/patch-ag b/x11/fltk13/patches/patch-ag index c5f556a61ae..e3a167a61c1 100644 --- a/x11/fltk13/patches/patch-ag +++ b/x11/fltk13/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2015/07/21 21:36:41 markd Exp $ +$NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $ ---- src/Makefile.orig 2014-10-30 16:05:22.000000000 +0000 +--- src/Makefile.orig 2015-03-25 20:06:54.000000000 +0000 +++ src/Makefile -@@ -234,6 +234,10 @@ $(LIBNAME): $(OBJECTS) +@@ -237,6 +237,10 @@ $(LIBNAME): $(OBJECTS) $(LIBCOMMAND) $@ $(OBJECTS) $(RANLIB) $@ @@ -10,10 +10,10 @@ $NetBSD: patch-ag,v 1.2 2015/07/21 21:36:41 markd Exp $ + echo $(CXX) $@ ... + ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) + - libfltk.so.1.3: $(OBJECTS) + libfltk.so.$(FL_DSO_VERSION): $(OBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) -@@ -270,6 +274,10 @@ $(FLLIBNAME): $(FLOBJECTS) +@@ -273,6 +277,10 @@ $(FLLIBNAME): $(FLOBJECTS) $(LIBCOMMAND) $@ $(FLOBJECTS) $(RANLIB) $@ @@ -21,10 +21,10 @@ $NetBSD: patch-ag,v 1.2 2015/07/21 21:36:41 markd Exp $ + echo $(CXX) $@ ... + ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) + - libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 + libfltk_forms.so.$(FL_DSO_VERSION): $(FLOBJECTS) libfltk.so.$(FL_DSO_VERSION) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) -@@ -306,6 +314,10 @@ $(GLLIBNAME): $(GLOBJECTS) +@@ -309,6 +317,10 @@ $(GLLIBNAME): $(GLOBJECTS) $(LIBCOMMAND) $@ $(GLOBJECTS) $(RANLIB) $@ @@ -32,10 +32,10 @@ $NetBSD: patch-ag,v 1.2 2015/07/21 21:36:41 markd Exp $ + echo $(CXX) $@ ... + ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) + - libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 + libfltk_gl.so.$(FL_DSO_VERSION): $(GLOBJECTS) libfltk.so.$(FL_DSO_VERSION) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(LDLIBS) $(GLDLIBS) -@@ -342,6 +354,10 @@ $(IMGLIBNAME): $(IMGOBJECTS) +@@ -345,6 +357,10 @@ $(IMGLIBNAME): $(IMGOBJECTS) $(LIBCOMMAND) $@ $(IMGOBJECTS) $(RANLIB) $@ @@ -43,46 +43,46 @@ $NetBSD: patch-ag,v 1.2 2015/07/21 21:36:41 markd Exp $ + echo $(CXX) $@ ... + ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:9 $(LDLIBS) + - libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 + libfltk_images.so.$(FL_DSO_VERSION): $(IMGOBJECTS) libfltk.so.$(FL_DSO_VERSION) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk $(LDLIBS) -@@ -568,6 +584,9 @@ install: $(LIBNAME) $(DSONAME) \ +@@ -570,6 +586,9 @@ install: $(LIBNAME) $(DSONAME) \ + $(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \ $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \ fi - $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) + if test x$(DSONAME) = xlibfltk.la; then\ + ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \ + fi - if test x$(DSONAME) = xlibfltk.so.1.3; then\ + $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME) + if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\ $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\ - $(INSTALL_LIB) libfltk.so.1.3 $(DESTDIR)$(libdir); \ -@@ -587,6 +606,9 @@ install: $(LIBNAME) $(DSONAME) \ +@@ -590,6 +609,9 @@ install: $(LIBNAME) $(DSONAME) \ $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\ $(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \ fi + if test x$(FLDSONAME) = xlibfltk_forms.la; then\ + ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_forms.la $(DESTDIR)$(libdir); \ + fi - if test x$(DSONAME) = xcygfltknox-1.3.dll; then\ + if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\ $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\ $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \ -@@ -604,6 +626,9 @@ install: $(LIBNAME) $(DSONAME) \ - $(INSTALL_LIB) libfltk_forms.so.1.3 $(DESTDIR)$(libdir); \ - $(LN) libfltk_forms.so.1.3 $(DESTDIR)$(libdir)/libfltk_forms.so;\ +@@ -607,6 +629,9 @@ install: $(LIBNAME) $(DSONAME) \ + $(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ + $(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\ fi + if test x$(GLDSONAME) = xlibfltk_gl.la; then\ + ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \ + fi - if test x$(FLDSONAME) = xlibfltk_forms.sl.1.3; then\ + if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\ $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\ - $(INSTALL_LIB) libfltk_forms.sl.1.3 $(DESTDIR)$(libdir); \ -@@ -661,6 +686,9 @@ install: $(LIBNAME) $(DSONAME) \ + $(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ +@@ -664,6 +689,9 @@ install: $(LIBNAME) $(DSONAME) \ $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\ $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \ fi + if test x$(IMGDSONAME) = xlibfltk_images.la; then\ + ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk_images.la $(DESTDIR)$(libdir); \ + fi - if test x$(IMGDSONAME) = xlibfltk_images.so.1.3; then\ + if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\ $(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\ - $(INSTALL_LIB) libfltk_images.so.1.3 $(DESTDIR)$(libdir); \ + $(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \ diff --git a/x11/fltk13/patches/patch-src_Fl.cxx b/x11/fltk13/patches/patch-src_Fl.cxx deleted file mode 100644 index c81fddcda20..00000000000 --- a/x11/fltk13/patches/patch-src_Fl.cxx +++ /dev/null @@ -1,28 +0,0 @@ -$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,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 +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__Tree__Item.cxx b/x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx deleted file mode 100644 index 72c9a025ab4..00000000000 --- a/x11/fltk13/patches/patch-src_Fl__Tree__Item.cxx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Fl__Tree__Item.cxx,v 1.1 2016/12/16 00:08:03 joerg Exp $ - -Ordering a pointer with 0 doesn't make sense, so check for failing deparent. - ---- src/Fl_Tree_Item.cxx.orig 2016-12-10 23:21:18.934820703 +0000 -+++ src/Fl_Tree_Item.cxx -@@ -549,7 +549,7 @@ int Fl_Tree_Item::move(Fl_Tree_Item *ite - } else { // different parent? - if ( to > to_parent->children() ) // try to prevent a reparent() error - return -4; -- if ( from_parent->deparent(from) < 0 ) // deparent self from current parent -+ if ( !from_parent->deparent(from) ) // deparent self from current parent - return -5; - if ( to_parent->reparent(this, to) < 0 ) { // reparent self to new parent at position 'to' - to_parent->reparent(this, 0); // failed? shouldn't happen, reparent at 0 diff --git a/x11/fltk13/patches/patch-src_Fl_cocoa.mm b/x11/fltk13/patches/patch-src_Fl_cocoa.mm deleted file mode 100644 index 4242ea9b7cd..00000000000 --- a/x11/fltk13/patches/patch-src_Fl_cocoa.mm +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Fl_cocoa.mm,v 1.1 2015/07/21 21:36:41 markd Exp $ - -part of tigervnc.patch from archlinux package. - ---- src/Fl_cocoa.mm.orig 2014-11-02 21:06:07.000000000 +0000 -+++ src/Fl_cocoa.mm -@@ -724,7 +724,7 @@ void Fl::remove_timeout(Fl_Timeout_Handl - return NO; // prevent the caption to be redrawn as active on click - // when another modal window is currently the key win - -- return !(w->tooltip_window() || w->menu_window()); -+ return !w->tooltip_window(); - } - - - (BOOL)canBecomeMainWindow diff --git a/x11/fltk13/patches/patch-src_Fl_grab.cxx b/x11/fltk13/patches/patch-src_Fl_grab.cxx deleted file mode 100644 index 8fb498350b9..00000000000 --- a/x11/fltk13/patches/patch-src_Fl_grab.cxx +++ /dev/null @@ -1,36 +0,0 @@ -$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,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 +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 +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(); - } - } diff --git a/x11/fltk13/patches/patch-src_Fl_x.cxx b/x11/fltk13/patches/patch-src_Fl_x.cxx deleted file mode 100644 index b08a3acb55a..00000000000 --- a/x11/fltk13/patches/patch-src_Fl_x.cxx +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-src_Fl_x.cxx,v 1.1 2015/07/21 21:36:41 markd Exp $ - -part of tigervnc.patch from archlinux package. - ---- src/Fl_x.cxx.orig 2014-10-29 20:25:46.000000000 +0000 -+++ src/Fl_x.cxx -@@ -666,6 +666,30 @@ void Fl::disable_im() { - fl_xim_deactivate(); - } - -+extern Fl_Window *fl_xfocus; -+ -+void fl_update_focus(void) -+{ -+ Fl_Widget *focus; -+ -+ focus = Fl::grab(); -+ if (!focus) -+ focus = Fl::focus(); -+ if (!focus) -+ return; -+ -+ if (focus->simple_keyboard()) { -+ fl_xim_deactivate(); -+ } else { -+ // fl_xfocus should always be set if something has focus, but let's -+ // play it safe -+ if (!fl_xfocus || !fl_xid(fl_xfocus)) -+ return; -+ -+ fl_xim_activate(fl_xid(fl_xfocus)); -+ } -+} -+ - void fl_open_display() { - if (fl_display) return; - -@@ -2211,6 +2235,7 @@ int Fl_X::ewmh_supported() { - static int result = -1; - - if (result == -1) { -+ fl_open_display(); - result = 0; - unsigned long nitems; - unsigned long *words = 0; diff --git a/x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c b/x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c deleted file mode 100644 index f13cecee514..00000000000 --- a/x11/fltk13/patches/patch-src_xutf8_imKStoUCS.c +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-src_xutf8_imKStoUCS.c,v 1.1 2015/07/21 21:36:41 markd Exp $ - -part of tigervnc.patch from archlinux package. - ---- src/xutf8/imKStoUCS.c.orig 2014-08-21 14:03:52.000000000 +0000 -+++ src/xutf8/imKStoUCS.c -@@ -266,6 +266,12 @@ static unsigned short const keysym_to_un - 0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac /* 0x20a8-0x20af */ - }; - -+static unsigned short const keysym_to_unicode_fe50_fe60[] = { -+ 0x0300, 0x0301, 0x0302, 0x0303, 0x0304, 0x0306, 0x0307, 0x0308, /* 0xfe50-0xfe57 */ -+ 0x030a, 0x030b, 0x030c, 0x0327, 0x0328, 0x1da5, 0x3099, 0x309a, /* 0xfe58-0xfe5f */ -+ 0x0323 /* 0xfe60-0xfe67 */ -+}; -+ - static unsigned int - KeySymToUcs4(KeySym keysym) - { -@@ -315,6 +321,8 @@ KeySymToUcs4(KeySym keysym) - return keysym_to_unicode_1e9f_1eff[keysym - 0x1e9f]; - else if (keysym > 0x209f && keysym < 0x20ad) - return keysym_to_unicode_20a0_20ac[keysym - 0x20a0]; -+ else if (keysym > 0xfe4f && keysym < 0xfe61) -+ return keysym_to_unicode_fe50_fe60[keysym - 0xfe50]; - else - return 0; - } diff --git a/x11/fltk13/patches/patch-test_Makefile b/x11/fltk13/patches/patch-test_Makefile index 04e1caf75da..bb670147e39 100644 --- a/x11/fltk13/patches/patch-test_Makefile +++ b/x11/fltk13/patches/patch-test_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ +$NetBSD: patch-test_Makefile,v 1.4 2018/07/13 04:24:39 dbj Exp $ ---- test/Makefile.orig 2014-09-26 23:58:05.000000000 +0000 +--- test/Makefile.orig 2016-09-03 08:14:43.000000000 +0000 +++ test/Makefile -@@ -302,19 +302,19 @@ buttons$(EXEEXT): buttons.o +@@ -308,19 +308,19 @@ buttons$(EXEEXT): buttons.o blocks$(EXEEXT): blocks.o echo Linking $@... @@ -23,14 +23,17 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS) $(OSX_ONLY) ../fltk-config --post $@ - - color_chooser$(EXEEXT): color_chooser.o -@@ -325,18 +325,18 @@ curve$(EXEEXT): curve.o + $(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources + $(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/ +@@ -333,21 +333,21 @@ curve$(EXEEXT): curve.o demo$(EXEEXT): demo.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ + $(OSX_ONLY) mkdir -p demo.app/Contents/Resources + $(OSX_ONLY) cp -f demo.menu demo.app/Contents/Resources/ device$(EXEEXT): device.o $(IMGLIBNAME) echo Linking $@... @@ -45,9 +48,9 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(OSX_ONLY) ../fltk-config --post $@ + $(OSX_ONLY) cp -f ../ide/Xcode4/plists/editor-Info.plist editor.app/Contents/Info.plist - fast_slow$(EXEEXT): fast_slow.o -@@ -344,21 +344,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu +@@ -356,21 +356,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME) echo Linking $@... @@ -70,9 +73,9 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ - $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(OSX_ONLY) ../fltk-config --post $@ - - icon$(EXEEXT): icon.o -@@ -376,14 +376,14 @@ input_choice$(EXEEXT): input_choice.o + $(OSX_ONLY) mkdir -p help.app/Contents/Resources + $(OSX_ONLY) cp -f help-test.html help.app/Contents/Resources/ +@@ -390,14 +390,14 @@ input_choice$(EXEEXT): input_choice.o keyboard$(EXEEXT): keyboard_ui.o keyboard.o echo Linking $@... @@ -89,7 +92,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ $(OSX_ONLY) ../fltk-config --post $@ line_style$(EXEEXT): line_style.o -@@ -392,7 +392,7 @@ list_visuals$(EXEEXT): list_visuals.o +@@ -406,7 +406,7 @@ list_visuals$(EXEEXT): list_visuals.o mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o echo Linking $@... @@ -98,7 +101,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ $(OSX_ONLY) ../fltk-config --post $@ mandelbrot_ui.o: mandelbrot_ui.h mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT) -@@ -405,14 +405,14 @@ minimum$(EXEEXT): minimum.o +@@ -419,7 +419,7 @@ minimum$(EXEEXT): minimum.o native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME) echo Linking $@... @@ -107,6 +110,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ $(OSX_ONLY) ../fltk-config --post $@ navigation$(EXEEXT): navigation.o +@@ -428,7 +428,7 @@ offscreen$(EXEEXT): offscreen.o output$(EXEEXT): output.o $(FLLIBNAME) echo Linking $@... @@ -115,7 +119,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ $(OSX_ONLY) ../fltk-config --post $@ overlay$(EXEEXT): overlay.o -@@ -423,7 +423,7 @@ pixmap$(EXEEXT): pixmap.o +@@ -439,7 +439,7 @@ pixmap$(EXEEXT): pixmap.o pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME) echo Linking $@... @@ -124,7 +128,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ $(OSX_ONLY) ../fltk-config --post $@ preferences$(EXEEXT): preferences.o -@@ -447,13 +447,13 @@ subwindow$(EXEEXT): subwindow.o +@@ -463,13 +463,13 @@ subwindow$(EXEEXT): subwindow.o sudoku: sudoku.o echo Linking $@... @@ -140,7 +144,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ symbols$(EXEEXT): symbols.o -@@ -485,7 +485,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME) +@@ -501,7 +501,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME) # OpenGL demos... CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o echo Linking $@... @@ -149,7 +153,7 @@ $NetBSD: patch-test_Makefile,v 1.3 2015/07/21 21:36:41 markd Exp $ CubeMain.o CubeView.o CubeViewUI.o \ $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) $(OSX_ONLY) ../fltk-config --post $@ -@@ -496,37 +496,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f +@@ -512,37 +512,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f cube$(EXEEXT): cube.o echo Linking $@... |