head 1.13; access; symbols pkgsrc-2024Q4:1.12.0.20 pkgsrc-2024Q4-base:1.12 pkgsrc-2024Q3:1.12.0.18 pkgsrc-2024Q3-base:1.12 pkgsrc-2024Q2:1.12.0.16 pkgsrc-2024Q2-base:1.12 pkgsrc-2024Q1:1.12.0.14 pkgsrc-2024Q1-base:1.12 pkgsrc-2023Q4:1.12.0.12 pkgsrc-2023Q4-base:1.12 pkgsrc-2023Q3:1.12.0.10 pkgsrc-2023Q3-base:1.12 pkgsrc-2023Q2:1.12.0.8 pkgsrc-2023Q2-base:1.12 pkgsrc-2023Q1:1.12.0.6 pkgsrc-2023Q1-base:1.12 pkgsrc-2022Q4:1.12.0.4 pkgsrc-2022Q4-base:1.12 pkgsrc-2022Q3:1.12.0.2 pkgsrc-2022Q3-base:1.12 pkgsrc-2022Q2:1.11.0.98 pkgsrc-2022Q2-base:1.11 pkgsrc-2022Q1:1.11.0.96 pkgsrc-2022Q1-base:1.11 pkgsrc-2021Q4:1.11.0.94 pkgsrc-2021Q4-base:1.11 pkgsrc-2021Q3:1.11.0.92 pkgsrc-2021Q3-base:1.11 pkgsrc-2021Q2:1.11.0.90 pkgsrc-2021Q2-base:1.11 pkgsrc-2021Q1:1.11.0.88 pkgsrc-2021Q1-base:1.11 pkgsrc-2020Q4:1.11.0.86 pkgsrc-2020Q4-base:1.11 pkgsrc-2020Q3:1.11.0.84 pkgsrc-2020Q3-base:1.11 pkgsrc-2020Q2:1.11.0.80 pkgsrc-2020Q2-base:1.11 pkgsrc-2020Q1:1.11.0.60 pkgsrc-2020Q1-base:1.11 pkgsrc-2019Q4:1.11.0.82 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.11.0.78 pkgsrc-2019Q3-base:1.11 pkgsrc-2019Q2:1.11.0.76 pkgsrc-2019Q2-base:1.11 pkgsrc-2019Q1:1.11.0.74 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.72 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.70 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.68 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.66 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.11.0.64 pkgsrc-2017Q4-base:1.11 pkgsrc-2017Q3:1.11.0.62 pkgsrc-2017Q3-base:1.11 pkgsrc-2017Q2:1.11.0.58 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.56 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.54 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.52 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.50 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.48 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.11.0.46 pkgsrc-2015Q4-base:1.11 pkgsrc-2015Q3:1.11.0.44 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.11.0.42 pkgsrc-2015Q2-base:1.11 pkgsrc-2015Q1:1.11.0.40 pkgsrc-2015Q1-base:1.11 pkgsrc-2014Q4:1.11.0.38 pkgsrc-2014Q4-base:1.11 pkgsrc-2014Q3:1.11.0.36 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.34 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.32 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.30 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.28 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.26 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.24 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.22 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.20 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.18 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.16 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.14 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.12 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.10 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.8 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.6 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.4 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.2 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.10.0.12 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.10 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.10.0.8 pkgsrc-2009Q3-base:1.10 pkgsrc-2009Q2:1.10.0.6 pkgsrc-2009Q2-base:1.10 pkgsrc-2009Q1:1.10.0.4 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.10.0.2 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.9.0.26 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.24 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.22 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.20 pkgsrc-2008Q1:1.9.0.18 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.16 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.14 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.12 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.10 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.8 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.6 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.4 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.2 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.8.0.8 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.6 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.4 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.2 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.7.0.2 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.6.0.6 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.13 date 2025.01.31.12.22.44; author micha; state dead; branches; next 1.12; commitid WdzQjQ7XVnt2oDHF; 1.12 date 2022.07.27.18.42.42; author wiz; state Exp; branches; next 1.11; commitid ymF2UfszebIp3zND; 1.11 date 2010.04.09.13.35.42; author obache; state Exp; branches; next 1.10; 1.10 date 2008.11.10.19.03.15; author adam; state Exp; branches; next 1.9; 1.9 date 2006.01.22.11.11.34; author wiz; state Exp; branches; next 1.8; 1.8 date 2005.03.19.15.26.18; author ben; state Exp; branches; next 1.7; 1.7 date 2004.10.21.08.29.45; author adam; state Exp; branches; next 1.6; 1.6 date 2004.02.18.05.07.34; author ben; state Exp; branches; next 1.5; 1.5 date 2003.12.01.16.35.51; author ben; state Exp; branches; next 1.4; 1.4 date 2001.05.26.06.37.46; author jlam; state Exp; branches; next 1.3; 1.3 date 2000.08.04.03.38.15; author jlam; state Exp; branches; next 1.2; 1.2 date 99.10.31.03.00.36; author jlam; state Exp; branches; next 1.1; 1.1 date 99.05.06.07.23.28; author sakamoto; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.05.06.07.23.28; author sakamoto; state Exp; branches; next ; desc @@ 1.13 log @x11/fltk: Update to 1.4.1 Part of FLTK 1.4 transition (Step 1). - Switch to Github - Add license - Take maintainership Changes in FLTK 1.4.1 Released: Dec 12 2024 FLTK 1.4.1 is a maintenance release with bug fixes and improvements. Bug Fixes - Fix rounding issues with Fl_RGB_Image::draw() + window scaling (#1128) - Fix fullscreen regression on macOS( #1129) - Fix fl_draw_image sometimes crashes when window is scaled (#1134) - Fix: Can't control scale of Fl_Copy_Surface dimensions on Linux (#1135) - Improve output of 'fltk-options -h' and 'fltk-options -L*' - Windows: Fix rescale bug while window is maximized or fullscreen - Fix graphical glitches on 101 DPI screen (#1138) - Fix changed flag for radio buttons (#1146) - Fix Fl_Scroll with real *_BOX draws over scrollbars at non-default scales (#1149) - Fix drawing bugs on Windows at very large scales (#1144) - Fix button down state when triggered by shortcut (#1145) - Give access to some Fl_Text_Display member variables (#1153) - Fix: Mouse hover + Enter key selects inactive menu items (#1159) - Fix hang/infinite loop on submenu with all inactive/invisible items (#1158) - Fix triggering callback for inactive menu items (#1159) - Fix inconsistencies with Tab/Backspace handling in menus (#1157) - Fix Fl_Menu_Item::measure() width calculation (#1164) - Fix drawing issue for checkbox buttons with bad box type (#1130) - Fix: Window can be moved while menu is open (#1166) Image libraries - Update bundled libpng to version 1.6.44 Fixes and Improvements in Fluid: - Fix autodocs file leak and memory leak - Fix autodoc image memory allocation - Fix project modflags when adding shell commands - Avoid generating undo on spurious relayout events (#1152) - Minor improvements to buffer handling (#1152) - Clear cached browser values and cached pointers (#1152) - Fix default settings tab - Avoid trailing spaces in empty comment lines (#1161) - Command line arguments '-v' and '--version' show fltk version - Command line argument '--help' shows brief usage information Optional ABI changes: these require configure or CMake option to define FL_ABI_VERSION = 10401 - Increase clipping stack size from 10 to 64 entries (#1139) - Fix potential (likely false positive) compiler warning in Fl_Help_View Documentation Improvements - Update build instructions in README.Unix.txt (#67) - Update README.Windows.txt - Update README.CMake.txt for cross-building (#1154) - Document that fl_scroll() doesn't work OK with non-integral scaling factors - Add details about fl_override_scale() and clip - Clarify use of Fl_Tabs::client_area() - Fix Makefile example in chapter "FLTK Basics" Improvements and minor Fixes in Test and Demo Programs - MSVC: Fix array allocation in test/fltk-versions (#1131) - Enable building the CubeView demo w/o requiring '' - Use a constant frame rate (25 fps) in test/cube demo - Add comment linking source code to related information in issue #1149 - Improve timer statistics in test/cube demo - glpuzzle: fix timer and trackball max speed, make smoother animation at 72fps Technical Details and Build Procedure Improvements - Fix FL_EXPORT qualifiers - Fix compiler warnings - Remove unnecessary friend declaration - Restore building with configure --disable-print (#1147) - macOS: Improve procedure to construct best link command - Fix: Building with FLTK_BUILD_GL=0 fails on systems without opengl installed (#1151) - Don't link to libgtk when using package libdecor-0-dev - Update makesrcdist for releases on GitHub (1.4.1 and higher) - Update CHANGES.txt for release 1.4.1 Changes in FLTK 1.4.0 Released: Nov 17 2024 Bug Fixes: - Windows: Fix "fullscreen_off does not correctly preserve window size" (#1116) - Fix rounding issues with Fl_RGB_Image::draw() + Fl_Copy_Surface (#1120, #1124) - Windows: Fix "Keyboard shortcut (alt+letter) does not work in input widget" (#1122) - macOS: Fix Alt-modifier handling in Fl_Shorcut_Button - Windows: Fix flicker/animation when transitioning from fullscreen to maximized - Wayland: protect against rounding errors in copy_region() Documentation and other Improvements: - Revert gtk+ specific "chevron style" arrow drawing (#1117) - Update CREDITS.txt - Improve 'test/fltk-versions' demo program @ text @$NetBSD: patch-ac,v 1.12 2022/07/27 18:42:42 wiz Exp $ --- configure.orig 2009-12-27 15:24:34.000000000 +0000 +++ configure @@@@ -1323,6 +1323,8 @@@@ Optional Features: --enable-debug turn on debugging default=no --enable-gl turn on OpenGL support default=yes --enable-shared turn on shared libraries default=no + --enable-libtool=LIBTOOL_PATH + turn on building with libtool [default=no] --enable-threads enable multi-threading support --enable-quartz use Quartz instead of Quickdraw (default=no) --disable-largefile omit support for large files @@@@ -1898,7 +1900,22 @@@@ if test "${enable_shared+set}" = set; th enableval=$enable_shared; fi -if test x$enable_shared = xyes; then + +# Check whether --enable-libtool or --disable-libtool was given. +if test "${enable_libtool+set}" = set; then + enableval="$enable_libtool" + +if test x$enable_libtool != xno; then + LIBTOOL="$enable_libtool" + enable_shared=no +else + LIBTOOL="" +fi +fi + + +if test "$enable_shared" = "yes"; then + PICFLAG=1 SHAREDSUFFIX="" FLUID="fluid-shared" @@@@ -2018,8 +2035,20 @@@@ else LINKSHARED="../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 @@@@ -8794,13 +8823,13 @@@@ fi syspnglib_ok=no syspnginc_ok=no if test x$enable_localpng != xyes; then - { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 -echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for png_read_info in -lpng16" >&5 +echo $ECHO_N "checking for png_read_info in -lpng16... $ECHO_C" >&6; } if test "${ac_cv_lib_png_png_read_info+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng $LIBS" +LIBS="-lpng16 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@@ -9161,19 +9190,19 @@@@ echo "$as_me: WARNING: Cannot find syste else PNGINC="" PNG="" - IMAGELIBS="-lpng $IMAGELIBS" - STATICIMAGELIBS="-lpng $STATICIMAGELIBS" + IMAGELIBS="-lpng16 $IMAGELIBS" + STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS" cat >>confdefs.h <<\_ACEOF #define HAVE_LIBPNG 1 _ACEOF - { echo "$as_me:$LINENO: checking for png_get_valid in -lpng" >&5 -echo $ECHO_N "checking for png_get_valid in -lpng... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for png_get_valid in -lpng16" >&5 +echo $ECHO_N "checking for png_get_valid in -lpng16... $ECHO_C" >&6; } if test "${ac_cv_lib_png_png_get_valid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng $LIBS" +LIBS="-lpng16 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@@ -9235,13 +9264,13 @@@@ _ACEOF fi - { echo "$as_me:$LINENO: checking for png_set_tRNS_to_alpha in -lpng" >&5 -echo $ECHO_N "checking for png_set_tRNS_to_alpha in -lpng... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for png_set_tRNS_to_alpha in -lpng16" >&5 +echo $ECHO_N "checking for png_set_tRNS_to_alpha in -lpng16... $ECHO_C" >&6; } if test "${ac_cv_lib_png_png_set_tRNS_to_alpha+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng $LIBS" +LIBS="-lpng16 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @ 1.12 log @fltk: fix png library name. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.11 2010/04/09 13:35:42 obache Exp $ @ 1.11 log @Update fltk to 1.1.10. Based on patch from Tim Larson by PR#43061. CHANGES IN FLTK 1.1.10 - Widgets now remove stale entries from the default callback queue when they are deleted (STR #2302) - Fixed selection bug in Fl_Int_Input (STR #2292) - Fixed character set conversion functions (STR #2268) - Fixed image lib configure and fltk-config issues by backporting the image lib and zlib configure code from FLTK 1.3 (STR #2203) - Updated the bundled libpng to v1.2.40 (released Sep. 10, 2009) - Fixed Fl_Choice contrast with light-on-dark settings (STR #2219) - Added Xft2 font lookup table (STR #2215) - Fixed X server "lock", if a modal dialog window is opened while a menu is active (STR #1986) - Updated mirror sites in documentation (STR #2220) - Setting a default font for Xft (STR #2216) - Temporarily limited builds to 32-bit on OX S to stay compatible to Snow Leopard - Fixed Windows compile bug with "#define USE_COLORMAP 0" (STR #2241) - Fixed glibc 2.10 compiler problems (Fedora 11 and others) with scandir() and strchr() (STR #2222) - Fixed OpenGL shared context handling (STR #2135) - Fixed gray-scale images with alpha channel (STR #2105) - Fixed unexpected shortcut behavior for Win32 (STR #2199) - Added cast to Fl_Color in all Fluid code (STR #2206) - Fixed wrong identifier for special keys combined with modifier (STR #2196) - Fixed documentation for Fl_Progress (STR #2209) - Fix for multiple popups, when dragging and calling fl_alert() and friends from the callback (STR #2159) - Avoiding crashes for recursive common dialogs (this does not fix the issue at hand yet) (STR 2150) - Fluid printing used wrong colors under Windows (STR #2195) - Fixed bad system menu hadling in OS X (STR #2153) - Fixed File Input mouse pointer dragging (STR #2181) - Added Fl_Scroll::bbox() documentation (STR #1893) - Fixed static linking of image libraries (STR #1962) - Fixed callback would not be called when shortcut was used with radio and toggle buttons in default FL_RELEASE mode. - Fixed a problem with TrackMouseEvent() (Windows only) that would generate wrong FL_LEAVE events with subwindows. TrackMouseEvent is now enabled by default (it was disabled for GNU compilers). It can be disabled by defining NO_TRACK_MOUSE. Improved test/subwindow.cxx (STR #2079) - Fixed RGB colors for round box (STR #2097) - Fixed documentation (added missing COMCTRL32.LIB dependency) - Fl_Group::clip_children() is now public (STR #2017) - Fixed first modifier key event (STR #1952) - Fixed wrong default value of Fl_Spinner in Fluid (STR #1991) - Fixed Fluid textcolor output (STR #1992) - Added clarification to Fl_GL_Window mode function (STR #1945) - Fl_Group and Fl_Scroll now resize themselves before resizing their children (STR #2032) - Fixed adding an idle handler during a draw() call (STR #1950) - Improved stability of fl_read_image (STR #2021) - Fixed menu position close to screen border (STR #2057) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.10 2008/11/10 19:03:15 adam Exp $ d61 59 @ 1.10 log @Changes 1.1.9: - Improved color contrast in secondary selection blocks of Fl_Text_Display - Fixed regression in callback handling - Fixed wrong relative path when absolute path has a trailing slash in fl_filename_relative - Fixed multiple selction of files and directories in Fl_File_Chooser - Fixed MSWindows crash when selecting umlauts in Fl_Help_View Changes 1.1.8: - Documentation fixes - Fixed library path in Makefile - Fixed image read for partial regions on X11 - Fixed KDE/Gnome icon paths - Fixed Tab key to wrap around menu bars - Fixed possible timer leak in Scrollbar - Added documentation about the potential limitations of Fl::grab on newer operating systems - Fixed lockout when mixing popups and alerts - Fixed recursion crash in event handling - Fixed missing return code in 'fltk-config' - Fixed inconsistencies with CHANGED flags - Fixed message sent to hidden widgets - Fixed width calculation in Fl_Help_View - Fixed offset bug in OS X pixmap code - Fixed potential buffer overrun in Fl_Preferences - More... @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2008-04-27 10:28:21.000000000 +0200 d5 1 a5 1 @@@@ -1318,6 +1319,8 @@@@ Optional Features: d14 1 a14 1 @@@@ -1870,7 +1873,22 @@@@ if test "${enable_shared+set}" = set; th d38 1 a38 1 @@@@ -1990,8 +2008,20 @@@@ else @ 1.9 log @Update to 1.1.7, ok jlam@@: FLTK 1.1.7 fixes many bugs, adds some new example programs, and adds many new improvements to the FLUID software including multi-level undo, syntax highlighting in all code fields, widget alignment and sizing guides, dialog templates, widget subclasses, and printing and testing of user interfaces within FLUID. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $ d3 1 a3 1 --- configure.orig 2006-01-18 02:30:52.000000000 +0000 d5 1 a5 1 @@@@ -856,6 +856,8 @@@@ Optional Features: d14 3 a16 2 @@@@ -1412,7 +1414,22 @@@@ if test "${enable_shared+set}" = set; th enableval="$enable_shared" a17 1 fi; d38 1 a38 1 @@@@ -1524,8 +1541,20 @@@@ else a60 38 @@@@ -11073,26 +11102,9 @@@@ esac -case "$uname" in - *BSD* | Darwin*) - # *BSD - CAT1EXT=0 - CAT3EXT=0 - CAT6EXT=0 - ;; - IRIX*) - # SGI IRIX - CAT1EXT=z - CAT3EXT=z - CAT6EXT=z - ;; - *) - # All others - CAT1EXT=1 - CAT3EXT=3 - CAT6EXT=3 - ;; -esac +CAT1EXT=1 +CAT3EXT=3 +CAT6EXT=6 @@@@ -12034,6 +12048,7 @@@@ s,@@GLLIBNAME@@,$GLLIBNAME,;t t s,@@IMGLIBNAME@@,$IMGLIBNAME,;t t s,@@LIBEXT@@,$LIBEXT,;t t s,@@LIBNAME@@,$LIBNAME,;t t +s,@@LIBTOOL@@,$LIBTOOL,;t t s,@@LINKFLTK@@,$LINKFLTK,;t t s,@@LINKFLTKFORMS@@,$LINKFLTKFORMS,;t t s,@@LINKFLTKGL@@,$LINKFLTKGL,;t t @ 1.8 log @Originally fltk used different file names for the man pages depending on the platform. I followed the documentation that is now in pkgsrc.txt and put the default names in PLIST, and the NetBSD names in PLIST.NetBSD. The PLIST handling does not actually work this way, and it will be cleaner to use the same file names for man pages regardless of platform. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2004-11-23 12:35:43.000000000 -0800 d5 1 a5 1 @@@@ -855,6 +855,8 @@@@ Optional Features: d13 2 a14 2 --enable-localjpeg use local JPEG library, default=auto @@@@ -1377,7 +1379,22 @@@@ if test "${enable_shared+set}" = set; th d38 2 a39 2 @@@@ -1478,6 +1495,20 @@@@ else LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk" d42 2 d61 1 a61 1 @@@@ -9148,23 +9179,8 @@@@ esac d70 1 d76 1 d82 1 d87 1 d91 1 a91 10 @@@@ -9230,7 +9246,7 @@@@ echo "${ECHO_T}yes" >&6 ;; esac - CXX="$CC" +# CXX="$CC" # Show all standard warnings + unused variables, conversion errors, # and inlining problems when compiling... @@@@ -10120,6 +10136,7 @@@@ s,@@GLLIBNAME@@,$GLLIBNAME,;t t d97 1 a98 1 s,@@LINKFLTKIMG@@,$LINKFLTKIMG,;t t @ 1.7 log @Changes 1.1.5rc1: - Documentation updates (STR #186, STR #245, STR #250, STR #277, STR #281, STR #328, STR #338) - fl_scroll() did not handle scrolling from off-screen on WIN32 (STR #315) - Fl_File_Chooser did not allow manual entry of a drive letter (STR #339) - Fl_Menu now uses the boxtype to redraw the menu background (STR #204) - Fl_Scroll now shows the background image when a framed box type is used and the Fl_Scroll is a direct decendent of a window (STR #205) - Added a new_directory_tooltip string pointer to allow localization of the file chooser's new directory button (STR #340) - Added Fl_Menu_::find_item() method (STR #316) - The Fl_Widget copy operator definitions were not conditionally compiled properly (STR #329) - FLUID's Layout functionality did not move child widgets when laying out group widgets (STR #319) - FLUID's Layout->Center In Group functionality did not properly handle widgets that were children of a Fl_Window widget (STR #318) - The Fl_Text_Display destructor did not remove the predelete callback associated with the current buffer (STR #332) - Fixed several bugs in the MacOS X Fl::add_fd() handling (STR #333, STR #337) @ text @d3 1 a3 1 --- configure.orig 2004-10-19 20:01:57.000000000 +0000 d59 27 a85 1 @@@@ -9204,7 +9235,7 @@@@ echo "${ECHO_T}yes" >&6 d94 1 a94 1 @@@@ -10094,6 +10125,7 @@@@ s,@@GLLIBNAME@@,$GLLIBNAME,;t t @ 1.6 log @Update from FLTK 1.0.11 to FLTK 1.1.4. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2003/12/01 16:35:51 ben Exp $ d3 1 a3 1 --- configure.orig 2003-09-08 12:18:58.000000000 -0700 d5 1 a5 1 @@@@ -838,6 +838,8 @@@@ Optional Features: d12 3 a14 3 --enable-xft turn on Xft support default=no --enable-xdbe turn on Xdbe support default=no @@@@ -1294,7 +1296,22 @@@@ if test "${enable_shared+set}" = set; th d38 1 a38 1 @@@@ -1395,6 +1412,20 @@@@ else d59 1 a59 1 @@@@ -8919,7 +8950,7 @@@@ echo "${ECHO_T}yes" >&6 d66 3 a68 4 # Show all standard warnings + unused variables when compiling... OPTIM="-Wall -Wunused $OPTIM" @@@@ -9753,6 +9784,7 @@@@ s,@@GLDEMOS@@,$GLDEMOS,;t t s,@@GLLIBNAME@@,$GLLIBNAME,;t t d70 1 @ 1.5 log @Force the use of a C++ compiler to compile C++ source files in a more clean manner, from feedback in PR 23252. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2001-05-07 07:53:14.000000000 -0700 d5 4 a8 4 @@@@ -18,6 +18,9 @@@@ ac_help="$ac_help ac_help="$ac_help --enable-shared turn on shared libraries [default=no]" ac_help="$ac_help d10 5 a14 18 + turn on building with libtool [default=no]" +ac_help="$ac_help --with-x use the X Window System" # Initialize some variables set by options. @@@@ -562,6 +565,9 @@@@ fi LIBNAME="libfltk.a" +LIBRARY="../lib/\$(LIBNAME)" +LIBFLTK="../lib/\$(LIBNAME)" +LINKFLTK="-L../lib -lfltk" if test "$RANLIB" != ":"; then LIBCOMMAND="ar cr" else @@@@ -600,8 +606,23 @@@@ fi # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then d16 3 a18 2 + : +fi d23 2 a24 3 -if eval "test x$enable_shared = xyes"; then +if eval "test x$enable_libtool != xno"; then d34 6 a39 6 PICFLAG=1 case $uname in SunOS* | UNIX_S*) @@@@ -638,8 +659,13 @@@@ if eval "test x$enable_shared = xyes"; t ;; esac a40 1 -fi d43 12 a54 4 + LIBNAME="libfltk.la" + LIBRARY="\$(LIBNAME)" + LIBFLTK="../src/\$(LIBNAME)" + LINKFLTK="../src/\$(LIBNAME)" a56 12 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@@@ -3072,7 +3098,7 @@@@ MAKEDEPEND="\$(CXX) -M" if test -n "$GXX"; then # Use gcc instead of c++ or g++, since we don't need the C++ # library to depend on... - CXX="$CC" +# CXX="$CC" CFLAGS="-Wall $CFLAGS" CXXFLAGS="-Wall $CXXFLAGS" if test -z "$DEBUGFLAG"; then @@@@ -3220,6 +3246,10 @@@@ CXXFLAGS="$DEBUGFLAG $CXXFLAGS" d59 3 d63 2 a64 17 + + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@@@ -3369,7 +3399,11 @@@@ s%@@CAT3EXT@@%$CAT3EXT%g s%@@DSONAME@@%$DSONAME%g s%@@DSOCOMMAND@@%$DSOCOMMAND%g s%@@LIBNAME@@%$LIBNAME%g +s%@@LIBRARY@@%$LIBRARY%g +s%@@LIBFLTK@@%$LIBFLTK%g +s%@@LINKFLTK@@%$LINKFLTK%g s%@@LIBCOMMAND@@%$LIBCOMMAND%g +s%@@LIBTOOL@@%$LIBTOOL%g s%@@MAKEDEPEND@@%$MAKEDEPEND%g d66 10 a75 1 CEOF @ 1.4 log @Update fltk to 1.0.11. Changes from version 1.0.10 include bugfixes and: - Added new const const pointer versions of pixmap functions to eliminate an annoying pointer warning message that was generated by the Sun and other C++ compilers. - Eliminated all "var hides class::var" warnings. - Eliminated all "string literal converted to char *" warnings. - The file chooser buttons use user_data() rather than the label to decide what to do, allowing the label to be somewhat cleaner. - Fl_has_idle only tested N-1 callbacks and missed one. - Fl_Gl_Window has a new method to allow you to get and set the context: void Fl_Gl_Window::context(void*, int destroy = 0) void* Fl_Gl_Window::context() const; Return or set a pointer to the GLContext that this window is using. This is a system-dependent structure, but it is portable to copy the context from one window to another. You can also set it to NULL, which will force FLTK to recreate the context the next time make_current() is called, this is useful for getting around bugs in OpenGL implementations. If destroy_flag is true the context will be destroyed by fltk when the window is destroyed, or when the mode() is changed, or the next time context(x) is called. - Added Fl::add_check(...), Fl::remove_check, and Fl::has_check. These are similar to idle callbacks but are only called just before it waits for new events. They can be used to watch for changes in global state and respond to them. - Added simple FLTK and FLUID manual pages. @ text @d3 1 a3 1 --- configure.orig Mon May 7 10:53:14 2001 d5 1 a5 1 @@@@ -18,6 +18,9 @@@@ d15 1 a15 1 @@@@ -562,6 +565,9 @@@@ d25 1 a25 1 @@@@ -600,8 +606,23 @@@@ d50 1 a50 1 @@@@ -638,13 +659,18 @@@@ d65 10 a74 7 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:648: checking for $ac_word" >&5 +echo "configure:674: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -3220,6 +3246,10 @@@@ d85 1 a85 1 @@@@ -3369,7 +3399,11 @@@@ @ 1.3 log @Update fltk to 1.0.9. Changes from version 1.0.7 include many bug fixes, better modal behaviour, and better portability. Find Mesa headers when xpkgwedge is installed. @ text @d3 91 a93 51 --- src/Makefile.orig Mon Jun 5 17:21:03 2000 +++ src/Makefile Thu Aug 3 23:13:08 2000 @@@@ -152,7 +152,13 @@@@ OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) -all: $(LIBRARY) $(DSONAME) +all: libfltk.la + +libfltk.la: $(OBJECTS) + $(CXX) -o $@@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib \ + -version-info $(FLTK_MAJOR):$(FLTK_MINOR) + $(RM) -f $(LIBRARY) + echo timestamp > $(LIBRARY) $(LIBRARY): $(OBJECTS) echo $(LIBCOMMAND) $@@ ... @@@@ -174,7 +180,14 @@@@ ################################################################ -install: $(LIBRARY) $(DSONAME) +install: install-la install-includes + +install-la: libfltk.la + echo "Installing libraries..." + $(BSD_INSTALL_DATA_DIR) $(libdir) + $(LIBTOOL) $(BSD_INSTALL_DATA) libfltk.la $(libdir) + +install-lib: $(LIBRARY) $(DSONAME) echo "Installing libraries..." -mkdir -p $(libdir) rm -f $(libdir)/$(LIBNAME) @@@@ -192,13 +205,11 @@@@ chmod 755 $(libdir)/libfltk.sl.1; \ ln -s libfltk.sl.1 $(libdir)/libfltk.sl;\ fi + +install-includes: echo "Installing include files..." - -mkdir -p $(includedir) - rm -rf $(includedir)/FL - mkdir $(includedir)/FL - cp ../FL/*.[hH] $(includedir)/FL - -chmod 755 $(includedir)/FL - -chmod 644 $(includedir)/FL/* + $(BSD_INSTALL_DATA_DIR) $(includedir)/FL + $(BSD_INSTALL_DATA) ../FL/* $(includedir)/FL cd $(includedir)/FL;\ for file in *.H; do\ ln -s $$file "`basename $$file H`h";\ @ 1.2 log @* Update fltk to 1.0.6. Changes from 1.0.3: CHANGES SINCE FLTK 1.0.5 - Fl_win32.cxx defined WM_MOUSE_LEAVE instead of WM_MOUSELEAVE. - Fl_get_key_win32.cxx needed to include - gl_draw_pixmap.cxx needed a pointer cast for ANSI C++. - Fl_Repeat_Button didn't always delete its timeout. - Now keep track of the current OpenGL context; this provides significant performance improvements for OpenGL applications with a single context. CHANGES SINCE FLTK 1.0.4 - Fl_Roller didn't handle a width and height of 0. - filename_list() fix for FreeBSD. - Fixed RPM install docos - needed "--install" option... - Fl_Browser_ wouldn't draw the vertical scrollbar right away if it added a horizontal one which covered the last line. - Fl_Tabs problems - single-character labels don't show up (problem in measure_tabs() or measure_label() methods?), and doesn't clear top tab area before drawing tabs. - Fl_Browser needs a destructor. - fl_draw_label() quoted characters between 0x80 and 0xa0, which caused problems for some programs using the WinANSI character set. - FLUID didn't handle declared class destructors. - Fixed another WIN32 cut/paste bug. - Fl_Tabs didn't work properly when there was only 1 tab. - Fl_Menu::add() didn't delete the old array. - Fl_Repeat_Button didn't delete its timeout when disabled. - fl_draw() would crash if no font was set (now defaults to a 14-pixel Helvetica font) - Can't forward declare classes; need to check for "class ", "struct ", "union ", etc. See Bill's message - Added #pragma around xlib.h for IRIX - FL_KEYBOARD events have the correct x/y when sent to child X windows. Note that if you worked around this bug by adjusting the x/y yourself you will have to change your code. In addition all events have the correct x/y when sent to the grab() widget. And the code to do all this was simplified a lot. - The XPM code didn't handle named colors with spaces in the names. - Pressing ESCape closed the window with pointer focus, even if there was a modal window open (now closes the modal window). - Fluid no longer produces trigraphs accidentally in the image data. - Fluid uses string constant concatenation to produce shorter image data. - The Fl_Group deletion code crashed if there was exactly one child widget. - Simulated overlays in single-buffered Fl_Gl_Windows now draw correctly (though very slowly as it requires the entire window to be redrawn to erase the overlay). This fix ported our Digital Domain programs better to systems with no overlay hardware. - Added support for extern "C" declarations in FLUID. - Added Fl_Pack support to FLUID. - Fixed the order of #include's in FLUID generated header files. - Fixed detection of vsnprintf and snprintf under HP-UX 10.20 once and for all. - The checkers demo did not compile with GCC 2.95 - FLUID didn't output virtual destructors properly. - Added inline "make_visible()" method to Fl_Browser. - Fl::wait() now returns immediately if any timeouts are called. - 16-bit XPM files are now properly handled. - Fl_Window::resize() was missing FL_EXPORT (caused problems with Windows DLLs) - FLUID was writing extern declarations twice. - New FLUID arrow key functionality: arrows move by one pixel, shift+arrow resizes, ctrl+arrow steps by grid CHANGES SINCE FLTK 1.0.3 - Documentation updates - Fl_Browser::bottomline(size) didn't scroll to the bottom if the second-to-last line was visible. - fl_wait() didn't poll FDs properly for WIN32. - Fixed DLL definitions for BC++. - FLUID now handles nested classes properly. - The "connect" demo now does a wait() for the PPP process so that you aren't left with a lot of zombie processes. - Fixed the FLTK colormap to use FF instead of F4 for full intensity values. - Minor change to scrollbar drawing code to match other toolkits. - New selections would cancel themselves out in WIN32. - The header file links were broken in the IRIX distributions. - fl_elapsed() now always uses GetClockTick() for WIN32. - fl_display is now initialized to GetModuleHandle(NULL) - this fixes problems people had with Cygwin and MingW32. - WinMain() is no longer compiled in with Cygwin and MingW32; it wasn't being used for those compilers anyways. - Added Solaris compiler options to configure script. - Fl_Value_Input wouldn't update properly if you set the value from a callback. - Fl_Tile wouldn't resize if the resizeable widget was the last child. - Was missing #include and #include in several files, which caused problems on some platforms. - Fixed another case where Fl_Browser_ could get in an infinite resizing loop. - Fl_win32.cxx now includes to export missing DLL symbols. - Fluid didn't handle member functions that include the scope operator. - Fl_Chart was dividing by 0 if there were no data samples or if they were all the same (min == max). @ text @d3 3 a5 8 --- src/Makefile.orig Mon Apr 26 08:36:17 1999 +++ src/Makefile Sat Oct 30 00:30:16 1999 @@@@ -146,30 +146,24 @@@@ include ../makeinclude -LIBRARY = ../lib/$(LIBNAME) +LIBRARY = $(LIBNAME) d10 7 a16 1 +all: $(LIBRARY) d19 2 a20 22 - @@echo $(LIBCOMMAND) $@@ ... - @@$(LIBCOMMAND) $@@ $(OBJECTS) - @@$(RANLIB) $@@ - -libfltk.so.1 libfltk.sl.1: $(OBJECTS) - @@echo $(DSOCOMMAND) $@@ ... - @@$(DSOCOMMAND) $@@ $(OBJECTS) + $(LIBTOOL) --cplusplus --mode=link $(CXX) -o $@@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info $(FLTK_MAJOR):$(FLTK_MINOR) .SUFFIXES: .cxx .h .o .cxx.o : - $(CXX) -I.. $(CXXFLAGS) -c $< + $(LIBTOOL) --mode=compile $(CXX) -I.. $(CXXFLAGS) -c $< .c.o : - $(CC) -I.. $(CFLAGS) -c -o $@@ $< + $(LIBTOOL) --mode=compile $(CC) -I.. $(CFLAGS) -c $< clean : - -@@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap + -@@ rm -f *.o *.do $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap @@touch makedepend d22 1 a22 2 depend: @@@@ -180,28 +174,11 @@@@ d24 5 a28 18 install: $(LIBRARY) $(DSONAME) @@echo "Installing libraries..." - @@-mkdir -p $(libdir) - @@rm -f $(libdir)/$(LIBNAME) - @@-cp $(LIBRARY) $(libdir) - @@-chmod 644 $(libdir)/$(LIBNAME) - @@if test "$(DSONAME)" = libfltk.so.1; then\ - rm -f $(libdir)/libfltk.so*;\ - cp libfltk.so.1 $(libdir); \ - chmod 755 $(libdir)/libfltk.so.1; \ - ln -s $(libdir)/libfltk.so.1 $(libdir)/libfltk.so;\ - fi - @@if test "$(DSONAME)" = libfltk.sl.1; then\ - rm -f $(libdir)/libfltk.sl*;\ - cp libfltk.sl.1 $(libdir); \ - chmod 755 $(libdir)/libfltk.sl.1; \ - ln -s $(libdir)/libfltk.sl.1 $(libdir)/libfltk.sl;\ - fi d30 19 a48 7 + $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIBNAME) $(libdir) @@echo "Installing include files..." - @@-mkdir -p $(includedir) - @@rm -rf $(includedir)/FL $(includedir)/Fl - @@-cp -r ../FL $(includedir) - @@-chmod 755 $(includedir)/FL - @@-chmod 644 $(includedir)/FL/* d51 3 a53 3 @@for file in $(includedir)/FL/*.H; do\ newfile="`basename $$file H`h";\ ln -s $$file $(includedir)/FL/$$newfile;\ @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- fluid/Makefile.orig Mon Apr 19 23:01:23 1999 +++ fluid/Makefile Mon Apr 26 13:52:02 1999 @@@@ -45,21 +45,20 @@@@ d7 4 a10 1 ################################################################ d12 1 a12 2 -OBJECTS = $(CPPFILES:.cxx=.o) +OBJECTS = $(CPPFILES:.cxx=.lo) d14 12 a25 1 include ../makeinclude d27 1 a27 2 -.SUFFIXES : .cxx .c .o +.SUFFIXES : .cxx .c .lo d29 1 a29 1 -.cxx.o : a30 8 -.c.o : - $(CC) -I.. $(CFLAGS) -c $< -.cxx : - $(CXX) -I.. $(CXXFLAGS) -o $@@ $< -L../lib -lfltk $(LDLIBS) - -$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME) - $(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS) +.cxx.lo : d32 2 a33 1 +.c.lo : a34 4 + +$(PROGRAM) : $(OBJECTS) ../src/$(LIBNAME) + $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) \ + ../src/$(LIBNAME) $(LDLIBS) d37 38 a74 13 -@@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend @@@@ -71,10 +70,7 @@@@ install: $(PROGRAM) @@echo "Installing FLUID..." - @@strip $(PROGRAM) - @@-mkdir -p $(bindir) - @@cp $(PROGRAM) $(bindir)/$(PROGRAM) - @@chmod 755 $(bindir)/$(PROGRAM) + $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(bindir) uninstall: -@@ rm -f $(bindir)/$(PROGRAM) @ 1.1.1.1 log @FLTK, C++ graphical user interface toolkit for X. @ text @@