[pkgsrc/trunk]: pkgsrc/x11/wxGTK30 wxGTK30: fix png library name

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c0dfad7fd6ac
branches:  trunk
changeset: 382555:c0dfad7fd6ac
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jul 31 12:07:23 2022 +0000

description:
wxGTK30: fix png library name

diffstat:

 x11/wxGTK30/buildlink3.mk           |   4 ++--
 x11/wxGTK30/distinfo                |   4 ++--
 x11/wxGTK30/patches/patch-configure |  29 ++++++++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)

diffs (80 lines):

diff -r 6cdd85c8ef1e -r c0dfad7fd6ac x11/wxGTK30/buildlink3.mk
--- a/x11/wxGTK30/buildlink3.mk Sun Jul 31 10:50:25 2022 +0000
+++ b/x11/wxGTK30/buildlink3.mk Sun Jul 31 12:07:23 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2022/06/28 11:37:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2022/07/31 12:07:23 wiz Exp $
 
 BUILDLINK_TREE+=       wxGTK30
 
@@ -29,7 +29,7 @@
 .if ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.  if !empty(PKG_BUILD_OPTIONS.wxGTK30:Mgtk2)
+.  if ${PKG_BUILD_OPTIONS.wxGTK30:Mgtk2}
 .include "../../x11/gtk2/buildlink3.mk"
 .  else
 .include "../../x11/gtk3/buildlink3.mk"
diff -r 6cdd85c8ef1e -r c0dfad7fd6ac x11/wxGTK30/distinfo
--- a/x11/wxGTK30/distinfo      Sun Jul 31 10:50:25 2022 +0000
+++ b/x11/wxGTK30/distinfo      Sun Jul 31 12:07:23 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 11:34:32 nia Exp $
+$NetBSD: distinfo,v 1.26 2022/07/31 12:07:23 wiz Exp $
 
 BLAKE2s (wxWidgets-3.0.5.1.tar.bz2) = 739cad22bf2306c7f30bf3256eaa124c32e240a0c75723267c86fc78f7621264
 SHA512 (wxWidgets-3.0.5.1.tar.bz2) = 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d
 Size (wxWidgets-3.0.5.1.tar.bz2) = 19739206 bytes
-SHA1 (patch-configure) = 9baeab2e231b3f334065acc8a615ba6c3443fd68
+SHA1 (patch-configure) = f2bda7d0bc3a9222dbb73ee6a20ffa5ed146fd78
 SHA1 (patch-misc_scripts_makeosxtags.sh) = a18e1c44f1cbc0e81cb75ae9df1eedd3643446c4
 SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = fe34102b241f84f8add08ed69d8c9c1c9c2df771
diff -r 6cdd85c8ef1e -r c0dfad7fd6ac x11/wxGTK30/patches/patch-configure
--- a/x11/wxGTK30/patches/patch-configure       Sun Jul 31 10:50:25 2022 +0000
+++ b/x11/wxGTK30/patches/patch-configure       Sun Jul 31 12:07:23 2022 +0000
@@ -1,9 +1,10 @@
-$NetBSD: patch-configure,v 1.9 2021/01/12 15:58:31 jperkin Exp $
+$NetBSD: patch-configure,v 1.10 2022/07/31 12:07:23 wiz Exp $
 
 Remove install program overrides on Darwin
 Tweak SEARCH_LIB.
 Don't call install_name_tool on symlinks
 Avoid -Werror.
+Fix png library name.
 
 --- configure.orig     2020-05-02 14:03:18.000000000 +0000
 +++ configure
@@ -32,6 +33,32 @@
  
  if test "$build" != "$host" -a "$GCC" = yes; then
                      if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+@@ -22454,13 +22445,13 @@ fi
+ 
+ 
+         if test "$ac_cv_header_png_h" = "yes"; then
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5
+-$as_echo_n "checking for png_sig_cmp in -lpng... " >&6; }
++            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng16" >&5
++$as_echo_n "checking for png_sig_cmp in -lpng16... " >&6; }
+ if ${ac_cv_lib_png_png_sig_cmp+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng -lz -lm $LIBS"
++LIBS="-lpng16 -lz -lm $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -22491,7 +22482,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5
+ $as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; }
+ if test "x$ac_cv_lib_png_png_sig_cmp" = xyes; then :
+-  PNG_LINK=" -lpng -lz"
++  PNG_LINK=" -lpng16 -lz"
+ fi
+ 
+         fi
 @@ -28844,7 +28835,7 @@ for dep in \${libnames} ; do
      changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"
  done