diff options
author | ryoon <ryoon> | 2013-06-09 16:09:35 +0000 |
---|---|---|
committer | ryoon <ryoon> | 2013-06-09 16:09:35 +0000 |
commit | e1e1e1ec83b661da239be3bd96238ddaaade04ea (patch) | |
tree | 675da817cf7cc650cbdc5419097e14951e7ab6d4 /x11/fltk13 | |
parent | 30c7776a50d1502ef53924ba62e26adec4201f2b (diff) | |
download | pkgsrc-e1e1e1ec83b661da239be3bd96238ddaaade04ea.tar.gz |
Update to 1.3.2
* Update MASTER_SITES.
Changelog:
CHANGES IN FLTK 1.3.2
- Removed unnecessary drawing calls (STR #2898)
- Fixed regression in FLTK 1.3.1 for unbundled Mac OS FLTK applications that
did not appear in dock nor have a menu bar (STR #2890).
- Fl_Table::clear() now calls table->clear() for consistency. (STR #2889)
- Fixed Fl_Scroll widget that fails under Mac OS X 10.8 and retina display (STR #2887).
- Prevents scrollbars from drawing when widget is sized too small to be visible (STR #2886).
- Documented how to make a Mac OS X FLTK application launchable by dropping files on its icon.
- Fixed a Mac-specific issue appeared with OS 10.8 (Mountain Lion): long delay before
opening when the application is started by dragging a file on the application icon.
- Fixed use of PNG image from im-memory data (STR #2884).
- Added static Fl_RGB_Image::max_size(size_t) to limit the maximum memory size allowed to
RGB images (STR #2881).
Diffstat (limited to 'x11/fltk13')
-rw-r--r-- | x11/fltk13/Makefile | 9 | ||||
-rw-r--r-- | x11/fltk13/distinfo | 12 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-af | 7 | ||||
-rw-r--r-- | x11/fltk13/patches/patch-test_Makefile | 70 |
4 files changed, 64 insertions, 34 deletions
diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile index 8596b702f82..08a833ad2ef 100644 --- a/x11/fltk13/Makefile +++ b/x11/fltk13/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2013/06/04 22:17:18 tron Exp $ +# $NetBSD: Makefile,v 1.13 2013/06/09 16:09:35 ryoon Exp $ -DISTNAME= fltk-1.3.0-source +DISTNAME= fltk-1.3.2-source PKGNAME= ${DISTNAME:S/-source//} VERS= ${DISTNAME:S/fltk-//:S/-source//} -PKGREVISION= 12 CATEGORIES= x11 -MASTER_SITES= http://ftp.easysw.com/pub/fltk/${VERS}/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \ - ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/ +MASTER_SITES= http://fltk.org/pub/fltk/${VERS}/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.fltk.org/ diff --git a/x11/fltk13/distinfo b/x11/fltk13/distinfo index cf988515780..c042d561e1c 100644 --- a/x11/fltk13/distinfo +++ b/x11/fltk13/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.2 2012/04/19 21:09:29 joerg Exp $ +$NetBSD: distinfo,v 1.3 2013/06/09 16:09:35 ryoon Exp $ -SHA1 (fltk-1.3.0-source.tar.gz) = 720f2804be6132ebae9909d4e74dedcc00b39d25 -RMD160 (fltk-1.3.0-source.tar.gz) = dea1eb42ae1b81efa22a54198956211367e2945a -Size (fltk-1.3.0-source.tar.gz) = 4111004 bytes +SHA1 (fltk-1.3.2-source.tar.gz) = 25071d6bb81cc136a449825bfd574094b48f07fb +RMD160 (fltk-1.3.2-source.tar.gz) = 5d697cb582cb80a1eca50c35696731eea5591768 +Size (fltk-1.3.2-source.tar.gz) = 4260874 bytes SHA1 (patch-FL_Fl_Widget.H) = 718b1f0a5e61e728c093ef4b52c2be3675a7c0d1 SHA1 (patch-aa) = 777b293800af60ac508968946bcb9bc448c1ea00 SHA1 (patch-ab) = 2c50743af303ac4a153f14061271d99d589f6e86 SHA1 (patch-ac) = 9ab9a8ab5d2fd54ff0fcdeb7e2486aa3b83be5de SHA1 (patch-ad) = 01a25d7265784572fbd0c7d2c6f029d45333ad21 SHA1 (patch-ae) = e043676f7e111e343bccd6e49f83d11a018fa431 -SHA1 (patch-af) = dc14ca1e0ba878ef2e94a9947c1409165a925e5c +SHA1 (patch-af) = a4154e31fca9ecf125922a84ac39771bc71dcb0f SHA1 (patch-ag) = 87e890ac44b864c224855611942d58dd0ba4b2c9 -SHA1 (patch-test_Makefile) = 9256cea83cf83bef6ad8253c3af14783eb37b4d3 +SHA1 (patch-test_Makefile) = 708decc3be69a9a4db82ab6fe473cf3417c969f2 diff --git a/x11/fltk13/patches/patch-af b/x11/fltk13/patches/patch-af index a9630c1f918..50577b096e6 100644 --- a/x11/fltk13/patches/patch-af +++ b/x11/fltk13/patches/patch-af @@ -1,13 +1,14 @@ -$NetBSD: patch-af,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ +$NetBSD: patch-af,v 1.2 2013/06/09 16:09:35 ryoon Exp $ ---- makeinclude.in.orig 2010-12-23 14:24:29.000000000 +0000 +--- makeinclude.in.orig 2012-12-05 14:53:03.000000000 +0000 +++ makeinclude.in -@@ -147,19 +147,19 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ +@@ -138,20 +138,20 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ .o$(EXEEXT): echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(OSX_ONLY) ../fltk-config --post $@ .c.o: echo Compiling $<... diff --git a/x11/fltk13/patches/patch-test_Makefile b/x11/fltk13/patches/patch-test_Makefile index 02517716eb1..a9b0c54b539 100644 --- a/x11/fltk13/patches/patch-test_Makefile +++ b/x11/fltk13/patches/patch-test_Makefile @@ -1,8 +1,9 @@ -$NetBSD: patch-test_Makefile,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ +$NetBSD: patch-test_Makefile,v 1.2 2013/06/09 16:09:35 ryoon Exp $ ---- test/Makefile.orig 2011-02-06 14:08:08.000000000 +0000 +--- test/Makefile.orig 2012-12-05 14:53:03.000000000 +0000 +++ test/Makefile -@@ -299,10 +296,10 @@ buttons$(EXEEXT): buttons.o +@@ -295,19 +295,19 @@ buttons$(EXEEXT): buttons.o + blocks$(EXEEXT): blocks.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS) @@ -15,14 +16,17 @@ $NetBSD: patch-test_Makefile,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS) $(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS -@@ -311,5 +308,5 @@ clock$(EXEEXT): clock.o + clock$(EXEEXT): clock.o + colbrowser$(EXEEXT): colbrowser.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ colbrowser.o $(LINKFLTKFORMS) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ color_chooser$(EXEEXT): color_chooser.o -@@ -321,9 +318,9 @@ curve$(EXEEXT): curve.o +@@ -318,18 +318,18 @@ curve$(EXEEXT): curve.o + demo$(EXEEXT): demo.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS) @@ -32,126 +36,154 @@ $NetBSD: patch-test_Makefile,v 1.1.1.1 2011/12/01 16:35:13 is Exp $ echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) device.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ doublebuffer$(EXEEXT): doublebuffer.o -@@ -331,5 +328,5 @@ doublebuffer$(EXEEXT): doublebuffer.o + editor$(EXEEXT): editor.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ fast_slow$(EXEEXT): fast_slow.o -@@ -338,5 +335,5 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu +@@ -337,21 +337,21 @@ fast_slow.cxx: fast_slow.fl ../fluid/flu + file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME) echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ fonts$(EXEEXT): fonts.o -@@ -344,5 +341,5 @@ fonts$(EXEEXT): fonts.o + forms$(EXEEXT): forms.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ hello$(EXEEXT): hello.o -@@ -350,5 +347,5 @@ hello$(EXEEXT): hello.o + help$(EXEEXT): help.o $(IMGLIBNAME) echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ iconize$(EXEEXT): iconize.o -@@ -365,5 +362,5 @@ input_choice$(EXEEXT): input_choice.o +@@ -367,14 +367,14 @@ input_choice$(EXEEXT): input_choice.o + keyboard$(EXEEXT): keyboard_ui.o keyboard.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ keyboard_ui.o: keyboard_ui.h keyboard_ui.cxx: keyboard_ui.fl ../fluid/fluid$(EXEEXT) -@@ -371,5 +368,5 @@ keyboard_ui.cxx: keyboard_ui.fl ../fluid + label$(EXEEXT): label.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ line_style$(EXEEXT): line_style.o -@@ -379,5 +376,5 @@ list_visuals$(EXEEXT): list_visuals.o +@@ -383,7 +383,7 @@ list_visuals$(EXEEXT): list_visuals.o + mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ mandelbrot_ui.o: mandelbrot_ui.h mandelbrot_ui.cxx: mandelbrot_ui.fl ../fluid/fluid$(EXEEXT) -@@ -391,5 +388,5 @@ minimum$(EXEEXT): minimum.o +@@ -396,14 +396,14 @@ minimum$(EXEEXT): minimum.o + native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME) echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) native-filechooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ navigation$(EXEEXT): navigation.o -@@ -397,5 +394,5 @@ navigation$(EXEEXT): navigation.o + output$(EXEEXT): output.o $(FLLIBNAME) echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ overlay$(EXEEXT): overlay.o -@@ -407,5 +404,5 @@ pixmap$(EXEEXT): pixmap.o +@@ -414,7 +414,7 @@ pixmap$(EXEEXT): pixmap.o + pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME) echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ preferences$(EXEEXT): preferences.o -@@ -430,5 +427,5 @@ subwindow$(EXEEXT): subwindow.o +@@ -438,7 +438,7 @@ subwindow$(EXEEXT): subwindow.o + sudoku: sudoku.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS) $(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS -@@ -466,5 +463,5 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME) + sudoku.exe: sudoku.o sudoku.rc +@@ -474,7 +474,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME) + # OpenGL demos... CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ \ + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ \ CubeMain.o CubeView.o CubeViewUI.o \ $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -@@ -476,29 +473,29 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f + $(OSX_ONLY) ../fltk-config --post $@ +@@ -485,37 +485,37 @@ CubeViewUI.cxx: CubeViewUI.fl ../fluid/f + cube$(EXEEXT): cube.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ cube.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ fractals$(EXEEXT): fractals.o fracviewer.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fractals.o fracviewer.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ fullscreen$(EXEEXT): fullscreen.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ fullscreen.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ glpuzzle$(EXEEXT): glpuzzle.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ glpuzzle.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ gl_overlay$(EXEEXT): gl_overlay.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -+ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) ++ $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ gl_overlay.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ shape$(EXEEXT): shape.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ cairo_test$(EXEEXT): cairo_test.o echo Linking $@... - $(CXX) $(ARCHFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS) + $(OSX_ONLY) ../fltk-config --post $@ # |