Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_165926924338460"
MIME-Version: 1.0
Date: Sun, 31 Jul 2022 12:07:23 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/x11/wxGTK30
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20220731120723.8038DFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_165926924338460
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun Jul 31 12:07:23 UTC 2022

Modified Files:
	pkgsrc/x11/wxGTK30: buildlink3.mk distinfo
	pkgsrc/x11/wxGTK30/patches: patch-configure

Log Message:
wxGTK30: fix png library name


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/wxGTK30/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/wxGTK30/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/wxGTK30/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_165926924338460
Content-Disposition: inline
Content-Length: 3674
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/wxGTK30/buildlink3.mk
diff -u pkgsrc/x11/wxGTK30/buildlink3.mk:1.26 pkgsrc/x11/wxGTK30/buildlink3.mk:1.27
--- pkgsrc/x11/wxGTK30/buildlink3.mk:1.26	Tue Jun 28 11:37:59 2022
+++ pkgsrc/x11/wxGTK30/buildlink3.mk	Sun Jul 31 12:07:23 2022
@@ -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 @@ pkgbase := wxGTK30
 .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"

Index: pkgsrc/x11/wxGTK30/distinfo
diff -u pkgsrc/x11/wxGTK30/distinfo:1.25 pkgsrc/x11/wxGTK30/distinfo:1.26
--- pkgsrc/x11/wxGTK30/distinfo:1.25	Tue Oct 26 11:34:32 2021
+++ pkgsrc/x11/wxGTK30/distinfo	Sun Jul 31 12:07:23 2022
@@ -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

Index: pkgsrc/x11/wxGTK30/patches/patch-configure
diff -u pkgsrc/x11/wxGTK30/patches/patch-configure:1.9 pkgsrc/x11/wxGTK30/patches/patch-configure:1.10
--- pkgsrc/x11/wxGTK30/patches/patch-configure:1.9	Tue Jan 12 15:58:31 2021
+++ pkgsrc/x11/wxGTK30/patches/patch-configure	Sun Jul 31 12:07:23 2022
@@ -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 @@ Avoid -Werror.
  
  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


--_----------=_165926924338460--