On Wed, Oct 19, 2022 at 02:39:31PM +0100, Stuart Henderson wrote:
> On 2022/10/17 17:19, Christian Weisgerber wrote:
> > CVSROOT: /cvs
> > Module name: ports
> > Changes by: [email protected] 2022/10/17 17:19:36
> >
> > Modified files:
> > graphics/png : Makefile distinfo
> > graphics/png/patches: patch-Makefile_in patch-libpng_pc_in
> > graphics/png/pkg: PLIST
> >
> > Log message:
> > graphics/png: update to 1.6.38
> >
> > * Fixed various errors in the handling of tRNS, hIST and eXIf.
> > * Implemented many stability improvements across all platforms.
> >
> > from Brad
> >
>
> This moved zlib from 'Requires' to 'Requires.private' in the pkg-config
> file, which breaks graphics/azpainter (undefined references to zlib
> functions).
Yes, there is a bug in the configure script.
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/graphics/azpainter/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-configure
--- patches/patch-configure 16 Mar 2022 01:44:05 -0000 1.3
+++ patches/patch-configure 19 Oct 2022 17:50:12 -0000
@@ -13,15 +13,24 @@ Index: configure
fi
fi
-@@ -290,6 +290,11 @@ elif test "$tmp1" = Darwin;then
- CFLAGS=`fc_add_string "$CFLAGS" "-DMLK_NO_SIMD"`
- elif test "$tmp1" = FreeBSD;then
- cf_os=freebsd
-+ cf_make=gmake
-+ CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
-+ LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
-+elif test "$tmp1" = OpenBSD;then
-+ cf_os=openbsd
+@@ -293,6 +293,11 @@ elif test "$tmp1" = FreeBSD;then
cf_make=gmake
CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
++elif test "$tmp1" = OpenBSD;then
++ cf_os=openbsd
++ cf_make=gmake
++ CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
++ LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
+ fi
+
+ # dir
+@@ -349,7 +354,7 @@ fc_check_sharedlib "iconv"
+ fc_check_funclink rt "clock_gettime"
+
+ fc_check_lib libpng "libpng" "" "-lpng -lz" "png.h" "" "libpng-dev or
libpng-devel or libpng or png"
+-fc_check_lib zlib "zlib" "" "" "zlib.h" "" "zlib1g-dev or zlib-devel or zlib"
++fc_check_lib zlib "zlib" "" "-lz" "zlib.h" "" "zlib1g-dev or zlib-devel or
zlib"
+ fc_check_lib libjpeg "libjpeg" "" "-ljpeg" "stdio.h jpeglib.h" ""
"libjpeg-dev or libjpeg-devel or libjpeg-turbo or jpeg-turbo"
+ fc_check_lib libtiff "libtiff-4" "" "-ltiff" "tiff.h" "" "libtiff-dev or
libtiff-devel or libtiff or tiff"
+ fc_check_lib libwebp "libwebp" "" "-lwebp" "webp/decode.h" "" "libwebp-dev or
libwebp-devel or libwebp or webp"
