CVS commit: pkgsrc/x11/wxGTK32

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul 29 13:14:59 UTC 2022

Modified Files:
        pkgsrc/x11/wxGTK32: Makefile distinfo
        pkgsrc/x11/wxGTK32/patches: patch-configure patch-configure.in

Log Message:
wxGTK32: fix png library name

Fix some pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/wxGTK32/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/wxGTK32/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/wxGTK32/patches/patch-configure \
    pkgsrc/x11/wxGTK32/patches/patch-configure.in

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

Modified files:

Index: pkgsrc/x11/wxGTK32/Makefile
diff -u pkgsrc/x11/wxGTK32/Makefile:1.5 pkgsrc/x11/wxGTK32/Makefile:1.6
--- pkgsrc/x11/wxGTK32/Makefile:1.5     Fri Jul 29 01:24:24 2022
+++ pkgsrc/x11/wxGTK32/Makefile Fri Jul 29 13:14:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/07/29 01:24:24 dbj Exp $
+# $NetBSD: Makefile,v 1.6 2022/07/29 13:14:59 wiz Exp $
 
 DISTNAME=      wxWidgets-3.2.0
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK32/}
@@ -49,19 +49,19 @@ PLIST_SRC+=         PLIST.cmake
 
 CMAKE_ARGS+=           -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
 CMAKE_ARGS+=           -DCMAKE_INSTALL_BINDIR:PATH=libexec/wx-3.2
-. if ${OPSYS} != "Linux"
+.  if ${OPSYS} != "Linux"
 # https://github.com/wxWidgets/wxWidgets/issues/22646
 CMAKE_ARGS+=           -DwxUSE_JOYSTICK:BOOL=OFF
-. endif
+.  endif
 
 SUBST_CLASSES+=                unwrap
 SUBST_STAGE.unwrap=    post-build
 SUBST_MESSAGE.unwrap=  Unwrapping wx-config.
-. if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 SUBST_FILES.unwrap=    lib/wx/config/gtk3-unicode-3.2
-. else
+.  else
 SUBST_FILES.unwrap=    lib/wx/config/osx_cocoa-unicode-3.2
-. endif
+.  endif
 SUBST_SED.unwrap=      -e 's,EGREP=.*,EGREP=${EGREP},'
 SUBST_SED.unwrap+=     -e 's,echo.*/${CC}",echo "${CC}",'
 SUBST_SED.unwrap+=     -e 's,echo.*/${CXX}",echo "${CXX}",'

Index: pkgsrc/x11/wxGTK32/distinfo
diff -u pkgsrc/x11/wxGTK32/distinfo:1.3 pkgsrc/x11/wxGTK32/distinfo:1.4
--- pkgsrc/x11/wxGTK32/distinfo:1.3     Thu Jul 28 05:25:22 2022
+++ pkgsrc/x11/wxGTK32/distinfo Fri Jul 29 13:14:59 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2022/07/28 05:25:22 dbj Exp $
+$NetBSD: distinfo,v 1.4 2022/07/29 13:14:59 wiz Exp $
 
 BLAKE2s (wxWidgets-3.2.0.tar.bz2) = 4029147a8e77a22e0379eeda11bc26f8fee998862aaa52819adf16a8ed4860ea
 SHA512 (wxWidgets-3.2.0.tar.bz2) = e55e7c5ac7abcacf2ecff7c22e367db17ff5a077d3d5d2aa7589e8ba7cc6695cfa48c0f00bcfdffeda8dc4f974f97a857fb61b4b300a724f7687d710fbb23967
@@ -9,7 +9,7 @@ SHA1 (patch-build_cmake_install.cmake) =
 SHA1 (patch-build_cmake_lib_base_CMakeLists.txt) = bec7be2f64bb4629a60d2b4f169e8feb215408e3
 SHA1 (patch-build_cmake_setup.cmake) = 277ae3c5bf4f04d057402f0b626d09d1e9749ca8
 SHA1 (patch-build_cmake_utils_CMakeLists.txt) = ccd342e1b565c942fb61730a91713323fd3d8cb2
-SHA1 (patch-configure) = fd7330fd1d83d42f7b95af61130e4db131de90b6
-SHA1 (patch-configure.in) = ad62f55a628e52de89b43001fc37a179fb50e7b3
+SHA1 (patch-configure) = 679580bee6373fd63968f0ee75934cdfc42bd3b8
+SHA1 (patch-configure.in) = 850221d02799cd875fe917f7e9c2994d0f89db29
 SHA1 (patch-src_unix_dialup.cpp) = 1c62d37508e45a0095ef062f7d450529e9b557e7
 SHA1 (patch-src_unix_utilsunx.cpp) = be61cc3931e8aa8cf790cfedf6f916a84970f074

Index: pkgsrc/x11/wxGTK32/patches/patch-configure
diff -u pkgsrc/x11/wxGTK32/patches/patch-configure:1.1 pkgsrc/x11/wxGTK32/patches/patch-configure:1.2
--- pkgsrc/x11/wxGTK32/patches/patch-configure:1.1      Tue Jul 26 02:58:56 2022
+++ pkgsrc/x11/wxGTK32/patches/patch-configure  Fri Jul 29 13:14:59 2022
@@ -1,9 +1,35 @@
-$NetBSD: patch-configure,v 1.1 2022/07/26 02:58:56 dbj Exp $
+$NetBSD: patch-configure,v 1.2 2022/07/29 13:14:59 wiz Exp $
 
 Fixup invocation of install_name_tool on wxrc
 
 --- configure.orig     2022-07-06 14:19:50.000000000 +0000
 +++ configure
+@@ -26288,13 +26288,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.  */
+ 
+@@ -26325,7 +26325,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
 @@ -27356,7 +27356,7 @@ $as_echo "$as_me: WARNING: XML library n
      USE_XML=0
  else
Index: pkgsrc/x11/wxGTK32/patches/patch-configure.in
diff -u pkgsrc/x11/wxGTK32/patches/patch-configure.in:1.1 pkgsrc/x11/wxGTK32/patches/patch-configure.in:1.2
--- pkgsrc/x11/wxGTK32/patches/patch-configure.in:1.1   Tue Jul 26 02:58:56 2022
+++ pkgsrc/x11/wxGTK32/patches/patch-configure.in       Fri Jul 29 13:14:59 2022
@@ -1,9 +1,19 @@
-$NetBSD: patch-configure.in,v 1.1 2022/07/26 02:58:56 dbj Exp $
+$NetBSD: patch-configure.in,v 1.2 2022/07/29 13:14:59 wiz Exp $
 
+Fix png library name.
 Fixup invocation of install_name_tool on wxrc
 
 --- configure.in.orig  2022-07-06 14:19:50.000000000 +0000
 +++ configure.in
+@@ -2617,7 +2617,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
+         AC_CHECK_HEADER(png.h,,, [ ])
+ 
+         if test "$ac_cv_header_png_h" = "yes"; then
+-            AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
++            AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng16 -lz", , [-lz -lm])
+         fi
+ 
+         if test "x$PNG_LINK" = "x" ; then
 @@ -2975,7 +2975,7 @@ if test "$wxUSE_XML" != "yes"; then
      USE_XML=0
  else