Skip to content

Commit

Permalink
x11/fltk13: Update to 1.3.9
Browse files Browse the repository at this point in the history 
This release does not contain new "ABI features". The ABI (Application
Binary Interface) is 100% compatible with releases 1.3.5 - 1.3.8.

CHANGES IN FLTK 1.3.9                              RELEASED: Dec 09 2023

FLTK 1.3.9 is a maintenance release with some fixes and enhancements.

Highlights in this release:

  - Support macOS up to macOS 14 "Sonoma".

Details:

  Albrecht Schlosser:
    Backport X11 INCR protocol fixes from 1.4.0 (issue #451)
    X11: Suppress compiler warnings when using gcc or clang
    Fix crash if a program exits before it opens a window (STR 3484).
    Fix compilation error with current Visual Studio 2022
    Windows: #define WIN32 if not defined by user
    Backport warning fixes from 1.4.0 in src/fl_draw.cxx (#693)
    Fix compiler warning as pointed out in PR #693
    Fix another compiler warning (#693)
    Remove unused variable, fix "type issue" (#445, part 2)
    Fix stack buffer overflow found by address sanitizer
    Fix "gtk+ rendering" (GitHub Issue #443)
    Fix doxygen warnings
    Bump version numbers, prepare release 1.3.9
    Fix several compiler warnings
    Update bundled image libraries and zlib to current versions
    Update README, README.CMake.txt, and some support files
    Fix compiler warnings: backported from 1.4 (git 'master')
    CMake/MSVC: remove confusing recommendation to rerun CMake
    Documentation: remove dark color on title page
    Raise CMake minimum required version to 3.15 and more

  ManoloFLTK:
    macOS platform: Issue #325
      "Disabling IM disables Greek and Cyrillic layouts"
    Fix fullscreen window level corner cases on macOS
    Fix issue #373 apparent with macOS platform and SDK ? 10.13
    Issue #452: Fl::get_font_name failure on OS-X.
    Issue #454: crash in Fl::get_font_name().
    Issue #469: Fl_Sys_Menu_Bar menu item shortcuts using Esc or Tab
      don't work on Mac
    Fix "Focus is lost leaving full screen on macOS 13" (#608)
    Add support of macOS Ventura 13.0 and macOS Sonoma 14.0
    macOS: remove configure option --enable-x11 and
      CMake OPTION_APPLE_X11; this functionality remains in FLTK 1.4.
    configure.ac: make sure local-png and local-zlib always run together
    Remove the -mwindows argument from CFLAGS and CXXFLAGS

Matthias Melcher:
    Issue #188: Fix reference counts and search for Fl_Shared_Image
      original

  YX:
    Fix IME problem (issue #270)
  • Loading branch information
micha committed May 8, 2024
1 parent 414c5f0 commit 4c7414f
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 49 deletions.
5 changes: 2 additions & 3 deletions x11/fltk13/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.45 2023/11/12 13:24:02 wiz Exp $
# $NetBSD: Makefile,v 1.46 2024/05/08 12:49:05 micha Exp $

DISTNAME= fltk-1.3.8-source
DISTNAME= fltk-1.3.9-source
PKGNAME= ${DISTNAME:S/-source//}
PKGREVISION= 3
VERS= ${DISTNAME:S/fltk-//:S/-source//}
CATEGORIES= x11
MASTER_SITES= https://fltk.org/pub/fltk/${VERS}/
Expand Down
10 changes: 5 additions & 5 deletions x11/fltk13/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.17 2022/07/27 18:46:49 wiz Exp $
$NetBSD: distinfo,v 1.18 2024/05/08 12:49:05 micha Exp $

BLAKE2s (fltk-1.3.8-source.tar.bz2) = c94fe7f4ce7afbc5c1c8968f19a944d36ddb85c73bcf80c91039f74c46f9b039
SHA512 (fltk-1.3.8-source.tar.bz2) = a836ad5069de7461ab3d791a587237a64efded9328bc89f46f71f02b3576000f5386bb17d2e8ee693435752fe99b0fb6566ebd34e4038c270c1801b9f360cd8b
Size (fltk-1.3.8-source.tar.bz2) = 4574725 bytes
BLAKE2s (fltk-1.3.9-source.tar.bz2) = 69983849a576c8adfaedcf2f9cfdbbc25463f0b157711655f8a09981e492eb84
SHA512 (fltk-1.3.9-source.tar.bz2) = 8de8596bdc355c618cc85b8aa3a3f6aeb3650d3d252d63cec2f2c440f915b33cb3cb7cd47e22813f30a44cc7183bf808fc78c9bd6b6129f0202a07d40e46085b
Size (fltk-1.3.9-source.tar.bz2) = 4774284 bytes
SHA1 (patch-Makefile) = c10e99516649e8fc02b6041be162229baec7a550
SHA1 (patch-configure) = 1b8ad181047144d7adf610a3ca73c01ea94e2315
SHA1 (patch-configure) = 6e5ea65207d721552f1afaf9e13a5607ce12d288
SHA1 (patch-documentation_Makefile) = 4c0c4243311c170d6c645db41b8bb1821d053712
SHA1 (patch-fluid_Makefile) = 6033e485a8ea7590fe68d9049645a1035326f8ce
SHA1 (patch-makeinclude.in) = e353cdc721c856e9c8839eb6334de59981e70d90
Expand Down
92 changes: 51 additions & 41 deletions x11/fltk13/patches/patch-configure
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
$NetBSD: patch-configure,v 1.2 2022/07/27 18:46:49 wiz Exp $
$NetBSD: patch-configure,v 1.3 2024/05/08 12:49:06 micha Exp $

Add libtool support.
Upstream will not merge this (libtool is listed as not acceptable).
Fix png library name.

--- configure.orig 2021-11-20 18:12:26.000000000 +0000
--- configure.orig 2023-12-09 14:02:17.000000000 +0000
+++ configure
@@ -3830,7 +3830,22 @@ if test "${enable_shared+set}" = set; th
@@ -1462,6 +1462,7 @@ Optional Features:
--enable-cp936 turn on CP936 [default=no]
--enable-gl turn on OpenGL support [default=yes]
--enable-shared turn on shared libraries [default=no]
+ --enable-libtool pkgsrc: Use libtool
--enable-threads enable multi-threading support [default=yes]
--disable-largefile omit support for large files
--enable-localjpeg use local JPEG library [default=auto]
@@ -4720,6 +4721,20 @@ then :
enableval=$enable_shared;
fi

-if test x$enable_shared = xyes; then
+
+# Check whether --enable-libtool or --disable-libtool was given.
+# pkgsrc: Check whether --enable-libtool or --disable-libtool was given.
+if test "${enable_libtool+set}" = set; then
+ enableval="$enable_libtool"
+
Expand All @@ -25,15 +32,16 @@ Fix png library name.
+fi
+
+
+if test "$enable_shared" = "yes"; then
+
if test x$enable_shared = xyes; then
PICFLAG=1
SHAREDSUFFIX=""
FLUID="fluid-shared"
@@ -4071,6 +4086,20 @@ else
FLUID_BUILD="../fluid/fluid$EXEEXT"
@@ -4966,8 +4981,21 @@ else
fi


-
-
+# pkgsrc: libtool support
+if test "x$LIBTOOL" != "x"; then
+ LINKFLTK="../src/libfltk.la"
+ if test "x$LINKFLTKGL" != "x"; then
Expand All @@ -51,57 +59,59 @@ Fix png library name.



@@ -6355,13 +6384,13 @@ fi
syspnglib_ok=no
syspnginc_ok=no
if test x$enable_localpng != xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
-$as_echo_n "checking for png_read_info in -lpng... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng16" >&5
+$as_echo_n "checking for png_read_info in -lpng16... " >&6; }
if ${ac_cv_lib_png_png_read_info+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6974,14 +7002,14 @@ syspnginc_ok=no
if test x$enable_localpng != xyes
then :

- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
-printf %s "checking for png_read_info in -lpng... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng16" >&5
+printf %s "checking for png_read_info in -lpng16... " >&6; }
if test ${ac_cv_lib_png_png_read_info+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng $LIBS"
+LIBS="-lpng16 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

@@ -6437,17 +6466,17 @@ $as_echo "$as_me: WARNING: Cannot find s
else
@@ -7125,18 +7153,18 @@ else $as_nop

PNGINC=""
PNG=""
- IMAGELIBS="-lpng $IMAGELIBS"
- STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
+ IMAGELIBS="-lpng16 $IMAGELIBS"
+ STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_valid in -lpng" >&5
-$as_echo_n "checking for png_get_valid in -lpng... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_valid in -lpng16" >&5
+$as_echo_n "checking for png_get_valid in -lpng16... " >&6; }
if ${ac_cv_lib_png_png_get_valid+:} false; then :
$as_echo_n "(cached) " >&6
else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_get_valid in -lpng" >&5
-printf %s "checking for png_get_valid in -lpng... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_get_valid in -lpng16" >&5
+printf %s "checking for png_get_valid in -lpng16... " >&6; }
if test ${ac_cv_lib_png_png_get_valid+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng $LIBS"
+LIBS="-lpng16 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

@@ -6482,13 +6511,13 @@ if test "x$ac_cv_lib_png_png_get_valid"
@@ -7172,14 +7200,14 @@ then :

fi

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_tRNS_to_alpha in -lpng" >&5
-$as_echo_n "checking for png_set_tRNS_to_alpha in -lpng... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_tRNS_to_alpha in -lpng16" >&5
+$as_echo_n "checking for png_set_tRNS_to_alpha in -lpng16... " >&6; }
if ${ac_cv_lib_png_png_set_tRNS_to_alpha+:} false; then :
$as_echo_n "(cached) " >&6
else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_set_tRNS_to_alpha in -lpng" >&5
-printf %s "checking for png_set_tRNS_to_alpha in -lpng... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for png_set_tRNS_to_alpha in -lpng16" >&5
+printf %s "checking for png_set_tRNS_to_alpha in -lpng16... " >&6; }
if test ${ac_cv_lib_png_png_set_tRNS_to_alpha+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng $LIBS"
+LIBS="-lpng16 $LIBS"
Expand Down

0 comments on commit 4c7414f

Please sign in to comment.