aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2011-04-22 14:12:25 +0800
committerDirk Meyer <dinoex@FreeBSD.org>2011-04-22 14:12:25 +0800
commit943957c74da9dc02cbadfc10dfcb3315d880c1d1 (patch)
tree00bf30041085ac1b7fae075b109ae721ee894f14 /graphics
parent21a2fdb0c2002db2ed6e7a60b522e9d912da066f (diff)
downloadfreebsd-ports-gnome-943957c74da9dc02cbadfc10dfcb3315d880c1d1.tar.gz
freebsd-ports-gnome-943957c74da9dc02cbadfc10dfcb3315d880c1d1.tar.zst
freebsd-ports-gnome-943957c74da9dc02cbadfc10dfcb3315d880c1d1.zip
- retire netpbm-devel
Diffstat (limited to 'graphics')
-rw-r--r--graphics/netpbm-devel/Makefile18
-rw-r--r--graphics/netpbm-devel/files/Makefile.config.FreeBSD124
-rw-r--r--graphics/netpbm-devel/files/patch-GNUmakefile11
-rw-r--r--graphics/netpbm-devel/files/patch-Makefile.common26
-rw-r--r--graphics/netpbm-devel/files/patch-editor-pnmquant20
-rw-r--r--graphics/netpbm-devel/files/patch-jpeg.c11
-rw-r--r--graphics/netpbm-devel/files/patch-lib-Makefile93
-rw-r--r--graphics/netpbm-devel/files/patch-lib-libpm.c20
-rw-r--r--graphics/netpbm-devel/files/patch-lib-libsystem.c16
-rw-r--r--graphics/netpbm-devel/files/patch-pm_config.in.h26
-rw-r--r--graphics/netpbm-devel/files/patch-pngtopnm.c58
-rw-r--r--graphics/netpbm-devel/files/patch-pnmtopng.c44
12 files changed, 0 insertions, 467 deletions
diff --git a/graphics/netpbm-devel/Makefile b/graphics/netpbm-devel/Makefile
deleted file mode 100644
index 189b3075e0f0..000000000000
--- a/graphics/netpbm-devel/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for: netpm-devel
-# Date created: 25.May 2006
-# Whom: dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-
-CATEGORIES= graphics
-
-MAINTAINER= dinoex@FreeBSD.org
-
-WITH_NETPBM_DEVEL=yes
-MASTERDIR?= ${.CURDIR}/../netpbm
-
-.if exists(${.CURDIR}/Makefile.local)
-.include "${.CURDIR}/Makefile.local"
-.endif
-
-.include "${MASTERDIR}/Makefile"
diff --git a/graphics/netpbm-devel/files/Makefile.config.FreeBSD b/graphics/netpbm-devel/files/Makefile.config.FreeBSD
deleted file mode 100644
index 8aecf913ab5c..000000000000
--- a/graphics/netpbm-devel/files/Makefile.config.FreeBSD
+++ /dev/null
@@ -1,124 +0,0 @@
-# This is a make file inclusion, to be included in all the Netpbm make
-# files.
-
-DEFAULT_TARGET = nonmerge
-
-BUILD_FIASCO = Y
-
-LD = $(CC)
-
-LINKERISCOMPILER=Y
-
-LINKER_CAN_DO_EXPLICIT_LIBRARY=N
-
-INTTYPES_H = <inttypes.h>
-
-HAVE_INT64 = Y
-
-CC_FOR_BUILD = $(CC)
-LD_FOR_BUILD = $(LD)
-CFLAGS_FOR_BUILD = $(CFLAGS)
-
-INSTALL = $(SRCDIR)/buildtools/install.sh
-
-STRIPFLAG = -s
-
-SYMLINK = ln -s
-
-MANPAGE_FORMAT = nroff
-
-AR = ar
-RANLIB = ranlib
-
-LEX = flex
-
-EXE =
-
-LDSHLIB = -shared -Wl,-soname,$(SONAME)
-
-LDRELOC = NONE
-
-CFLAGS_SHLIB =
-
-SHLIB_CLIB = -lc
-SHLIB_CLIB =
-
-NEED_RUNTIME_PATH = N
-
-RPATHOPTNAME = -rpath
-
-NETPBMLIB_RUNTIME_PATH =
-
-TIFFLIB = ${LOCALBASE}/lib/libtiff.so
-TIFFHDR_DIR = ${LOCALBASE}/include
-
-TIFFLIB_NEEDS_JPEG = Y
-TIFFLIB_NEEDS_Z = Y
-
-JPEGLIB = ${LOCALBASE}/lib/libjpeg.so
-JPEGHDR_DIR = ${LOCALBASE}/include
-
-PNGLIB = ${LOCALBASE}/lib/libpng.so
-PNGHDR_DIR = ${LOCALBASE}/include
-PNGVER =
-
-ZLIB = /usr/lib/libz.so
-ZHDR_DIR = /usr/include
-
-JBIGLIB = ${LOCALBASE}/lib/libjbig.so
-JBIGHDR_DIR = ${LOCALBASE}/include
-
-JASPERLIB = ${LOCALBASE}/lib/libjasper.so
-JASPERHDR_DIR = ${LOCALBASE}/include
-JASPERDEPLIBS =
-
-URTLIB = $(BUILDDIR)/urt/librle.a
-URTHDR_DIR = $(SRCDIR)/urt
-
-X11LIB = ${LOCALBASE}/lib/libX11.so
-X11HDR_DIR = ${LOCALBASE}/include
-
-LINUXSVGALIB = NONE
-LINUXSVGAHDR_DIR =
-
-OMIT_NETWORK =
-
-NETWORKLD =
-
-VMS =
-
-DONT_HAVE_PROCESS_MGMT = N
-
-PKGDIR_DEFAULT = ${PREFIX}
-
-PKGMANDIR = man
-
-SUFFIXMANUALS1 = 1
-SUFFIXMANUALS3 = 3
-SUFFIXMANUALS5 = 5
-
-NETPBMLIBTYPE = unixshared
-
-NETPBMLIBSUFFIX = so
-
-STATICLIB_TOO = y
-
-STATICLIBSUFFIX = a
-
-SHLIBPREFIXLIST = lib
-
-NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
-
-DLLVER =
-
-NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
-
-DEFAULT_TARGET = nonmerge
-NETPBMLIBTYPE=unixshared
-NETPBMLIBSUFFIX=so
-STATICLIB_TOO=y
-LINKERISCOMPILER = Y
-CFLAGS_SHLIB += -fPIC -I..
-LDFLAGS+= -L${LOCALBASE}/lib
-SOVER = 1
-
diff --git a/graphics/netpbm-devel/files/patch-GNUmakefile b/graphics/netpbm-devel/files/patch-GNUmakefile
deleted file mode 100644
index 6601316b1dfa..000000000000
--- a/graphics/netpbm-devel/files/patch-GNUmakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- GNUmakefile.orig 2008-09-27 03:37:09.000000000 +0200
-+++ GNUmakefile 2010-05-21 10:33:07.000000000 +0200
-@@ -361,7 +361,7 @@
- install.hdr: $(PKGDIR)/include
- $(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
- SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr
-- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
-+ ${BSD_INSTALL_DATA} \
- $(BUILDDIR)/pm_config.h $(PKGDIR)/include
-
- ifeq ($(STATICLIB_TOO),y)
diff --git a/graphics/netpbm-devel/files/patch-Makefile.common b/graphics/netpbm-devel/files/patch-Makefile.common
deleted file mode 100644
index 5664fdf7850c..000000000000
--- a/graphics/netpbm-devel/files/patch-Makefile.common
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.common.orig Wed Oct 9 11:17:24 2002
-+++ Makefile.common Sat Oct 12 00:00:00 2002
-@@ -231,19 +231,19 @@
- INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
- .PHONY: $(INSTALLBIN_TARGETS)
- $(INSTALLBIN_TARGETS): $(PKGDIR)/bin
-- $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
-+ ${BSD_INSTALL_PROGRAM} \
- $(@:%_installbin=%) $<
-
- $(SCRIPTS:%=%_installscript): $(PKGDIR)/bin
-- $(INSTALL) -c -m $(INSTALL_PERM_BIN) \
-+ ${BSD_INSTALL_SCRIPT} \
- $(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
-
- .PHONY: install.data
- install.data: $(DATAFILES:%=%_installdata) $(SUBDIRS:%=%/install.data)
-
- .PHONY: $(DATAFILES:%=%_installdata)
--$(DATAFILES:%=%_installdata): $(PKGDIR)/misc
-- $(INSTALL) -c -m $(INSTALL_PERM_DATA) \
-+$(DATAFILES:%=%_installdata): $(PKGDIR)/share/netpbm
-+ ${BSD_INSTALL_DATA} \
- $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $<
-
-
diff --git a/graphics/netpbm-devel/files/patch-editor-pnmquant b/graphics/netpbm-devel/files/patch-editor-pnmquant
deleted file mode 100644
index 3a0f3f2579fd..000000000000
--- a/graphics/netpbm-devel/files/patch-editor-pnmquant
+++ /dev/null
@@ -1,20 +0,0 @@
---- editor/pnmquant.orig 2006-08-19 05:12:28.000000000 +0200
-+++ editor/pnmquant 2010-05-21 10:37:10.000000000 +0200
-@@ -149,7 +149,7 @@
- tell(INFH); # Avoids bogus "INFH is not referenced" warning
- }
- } else {
-- open(STDIN, "<", $infile)
-+ open(STDIN, "<" . $infile)
- or die("Unable to open input file '$infile'. Errno=$ERRNO");
- }
- }
-@@ -194,7 +194,7 @@
- push(@options, '-quiet');
- }
-
-- open(STDOUT, ">", $mapfileSpec);
-+ open(STDOUT, ">" . $mapfileSpec);
-
- my $maprc = system("pnmcolormap", $ncolors, @options);
-
diff --git a/graphics/netpbm-devel/files/patch-jpeg.c b/graphics/netpbm-devel/files/patch-jpeg.c
deleted file mode 100644
index d1fc4252f4c2..000000000000
--- a/graphics/netpbm-devel/files/patch-jpeg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- converter/ppm/ppmtompeg/jpeg.c.orig 2005-11-10 04:53:40.000000000 +0100
-+++ converter/ppm/ppmtompeg/jpeg.c 2009-07-07 10:51:13.000000000 +0200
-@@ -469,7 +469,7 @@
- #ifdef JPEG4
- buffer_height = 8; /* could be 2, 4,8 rows high */
- #else
-- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
-+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
- #endif
-
- for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
diff --git a/graphics/netpbm-devel/files/patch-lib-Makefile b/graphics/netpbm-devel/files/patch-lib-Makefile
deleted file mode 100644
index 4ed3dec176b2..000000000000
--- a/graphics/netpbm-devel/files/patch-lib-Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
---- lib/Makefile.orig 2009-09-18 21:04:37.000000000 +0200
-+++ lib/Makefile 2010-05-21 10:36:08.000000000 +0200
-@@ -42,6 +42,8 @@
- # Library objects to be linked but not built by Makefile.common:
- LIBOBJECTS_X = util/shhopt.o util/nstring.o util/filename.o
-
-+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
-+
- MANUALS3 = libnetpbm
- MANUALS5 = pbm pgm ppm pnm pam
-
-@@ -80,13 +82,17 @@
-
- $(LIBOBJECTS): %.o: %.c importinc
- # Note that the user may have configured -I options into CFLAGS.
-+ $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) \
-+ $(CFLAGS_PERSONAL) $(CADD) -o $@ $<
-+
-+$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS)
- $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) $(CFLAGS_SHLIB) \
- $(CFLAGS_PERSONAL) $(CADD) -o $@ $<
-
- MAJ = $(NETPBM_MAJOR_RELEASE)
- MIN = $(NETPBM_MINOR_RELEASE)
-
--SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ)
-+SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(SOVER)
-
- ifeq ($(NETPBMLIBTYPE),irixshared)
- # The libxxx.so link is needed to link the executables.
-@@ -113,11 +119,8 @@
- # The $(SONAME) link is needed only to test the programs without
- # installing the libraries (in that case, you also need to direct the
- # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
--$(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
-- rm -f $@
-- $(SYMLINK) $< $@
--libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
-- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
-+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
-+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
- $(SHLIB_CLIB) -lm $(LADD)
- endif
-
-@@ -205,13 +208,10 @@
- .PHONY: install.lib
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install a Unix-style shared library
--install.lib: $(PKGDIR)/lib $(PKGDIR)/link
-- cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
-- $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
-- libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/
-- cd $(PKGDIR)/lib/ ; \
-- rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ); \
-- $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME)
-+install.lib: $(PKGDIR)/lib
-+ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).*
-+ ${BSD_INSTALL_DATA} \
-+ $(SONAME) $(PKGDIR)/lib/
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
- #install a Windows DLL shared library
-@@ -241,23 +241,23 @@
- # directory when you compile your programs.
-
- %_installhdr: $(PKGDIR)/include
-- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
-+ ${BSD_INSTALL_DATA} \
- $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/;
-
- .PHONY: install.staticlib
--install.staticlib: $(PKGDIR)/link
-- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
-+install.staticlib: $(PKGDIR)/lib
-+ ${BSD_INSTALL_DATA} libnetpbm.$(STATICLIBSUFFIX) \
-+ $(PKGDIR)/lib
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
- .PHONY: install.sharedlibstub
--install.sharedlibstub: $(PKGDIR)/link
-+install.sharedlibstub: $(PKGDIR)/lib
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
-+ cd $(PKGDIR)/lib ; \
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) $(SONAME) \
- libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
diff --git a/graphics/netpbm-devel/files/patch-lib-libpm.c b/graphics/netpbm-devel/files/patch-lib-libpm.c
deleted file mode 100644
index 7c805f039462..000000000000
--- a/graphics/netpbm-devel/files/patch-lib-libpm.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/libpm.c.orig 2006-08-19 05:12:28.000000000 +0200
-+++ lib/libpm.c 2010-05-21 10:37:10.000000000 +0200
-@@ -669,7 +669,7 @@
- pm_openr(const char * const name) {
- FILE* f;
-
-- if (strcmp(name, "-") == 0)
-+ if (name == NULL || strcmp(name, "-") == 0)
- f = stdin;
- else {
- #ifndef VMS
-@@ -691,7 +691,7 @@
- pm_openw(const char * const name) {
- FILE* f;
-
-- if (strcmp(name, "-") == 0)
-+ if (name == NULL || strcmp(name, "-") == 0)
- f = stdout;
- else {
- #ifndef VMS
diff --git a/graphics/netpbm-devel/files/patch-lib-libsystem.c b/graphics/netpbm-devel/files/patch-lib-libsystem.c
deleted file mode 100644
index 57bb33db76b3..000000000000
--- a/graphics/netpbm-devel/files/patch-lib-libsystem.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/libsystem.c.orig 2010-03-24 03:06:41.000000000 +0100
-+++ lib/libsystem.c 2010-05-25 07:31:25.000000000 +0200
-@@ -154,6 +154,13 @@
- }
-
-
-+#ifndef SIGRTMIN
-+#define SIGRTMIN 65
-+#endif
-+#ifndef SIGRTMAX
-+#define SIGRTMAX 126
-+#endif
-+
-
- static const char *
- signalName(unsigned int const signalClass) {
diff --git a/graphics/netpbm-devel/files/patch-pm_config.in.h b/graphics/netpbm-devel/files/patch-pm_config.in.h
deleted file mode 100644
index 1ccdafc6a9c2..000000000000
--- a/graphics/netpbm-devel/files/patch-pm_config.in.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- pm_config.in.h.orig 2006-10-18 20:29:13.000000000 +0200
-+++ pm_config.in.h 2010-05-21 10:37:50.000000000 +0200
-@@ -15,6 +15,10 @@
-
- **************************************************************************/
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
- #define SYSV
- #endif
-@@ -67,9 +71,9 @@
- #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
- #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
- #else
--#define RGB_DB1 "/usr/lib/X11/rgb.txt"
--#define RGB_DB2 "/usr/share/X11/rgb.txt"
--#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
-+#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt"
-+#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt"
-+#define RGB_DB3 "%%LOCALBASE%%/lib/X11/rgb.txt"
- #endif
-
- /* CONFIGURE: This is the name of an environment variable that tells
diff --git a/graphics/netpbm-devel/files/patch-pngtopnm.c b/graphics/netpbm-devel/files/patch-pngtopnm.c
deleted file mode 100644
index b5387857e1b2..000000000000
--- a/graphics/netpbm-devel/files/patch-pngtopnm.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- converter/other/pngtopnm.c.orig 2009-09-03 17:34:36.000000000 +0200
-+++ converter/other/pngtopnm.c 2010-05-21 11:24:05.000000000 +0200
-@@ -44,7 +44,7 @@
- #include "nstring.h"
- #include "shhopt.h"
-
--#if PNG_LIBPNG_VER >= 10400
-+#if 0
- #error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
- #error You need either an older PNG library (older than 1.4)
- #error newer Netpbm source code (at least 10.48)
-@@ -482,7 +482,7 @@
- bool retval;
-
- if (info_ptr->valid & PNG_INFO_tRNS) {
-- const png_color_16 * const transColorP = &info_ptr->trans_values;
-+ const png_color_16 * const transColorP = &info_ptr->trans_color;
-
-
- /* There seems to be a problem here: you can't compare real
-@@ -575,8 +575,8 @@
- for (i = 0, foundGray = FALSE;
- i < info_ptr->num_trans && !foundGray;
- ++i) {
-- if (info_ptr->trans[i] != 0 &&
-- info_ptr->trans[i] != maxval) {
-+ if (info_ptr->trans_alpha[i] != 0 &&
-+ info_ptr->trans_alpha[i] != maxval) {
- foundGray = TRUE;
- }
- }
-@@ -647,7 +647,7 @@
- unsigned int i;
- trans_mix = TRUE;
- for (i = 0; i < info_ptr->num_trans; ++i)
-- if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) {
-+ if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) {
- trans_mix = FALSE;
- break;
- }
-@@ -885,7 +885,7 @@
- setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
- ((info_ptr->valid & PNG_INFO_tRNS) &&
- (fgColor.r ==
-- gamma_correct(info_ptr->trans_values.gray,
-+ gamma_correct(info_ptr->trans_color.gray,
- totalgamma))) ?
- 0 : maxval);
- }
-@@ -914,7 +914,7 @@
- setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
- (info_ptr->valid & PNG_INFO_tRNS) &&
- index < info_ptr->num_trans ?
-- info_ptr->trans[index] : maxval);
-+ info_ptr->trans_alpha[index] : maxval);
- }
- break;
-
diff --git a/graphics/netpbm-devel/files/patch-pnmtopng.c b/graphics/netpbm-devel/files/patch-pnmtopng.c
deleted file mode 100644
index 14ed8ff7c123..000000000000
--- a/graphics/netpbm-devel/files/patch-pnmtopng.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- converter/other/pnmtopng.c.orig 2009-09-03 17:34:36.000000000 +0200
-+++ converter/other/pnmtopng.c 2010-05-21 10:45:59.000000000 +0200
-@@ -69,7 +69,7 @@
- #include "nstring.h"
- #include "version.h"
-
--#if PNG_LIBPNG_VER >= 10400
-+#if 0
- #error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
- #error You need either an older PNG library (older than 1.4)
- #error newer Netpbm source code (at least 10.48)
-@@ -2611,7 +2611,7 @@
- info_ptr->num_palette = palette_size;
- if (trans_size > 0) {
- info_ptr->valid |= PNG_INFO_tRNS;
-- info_ptr->trans = trans;
-+ info_ptr->trans_alpha = trans;
- info_ptr->num_trans = trans_size; /* omit opaque values */
- }
- /* creating hIST chunk */
-@@ -2648,7 +2648,7 @@
- info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
- if (transparent > 0) {
- info_ptr->valid |= PNG_INFO_tRNS;
-- info_ptr->trans_values =
-+ info_ptr->trans_color =
- xelToPngColor_16(transcolor, maxval, png_maxval);
- }
- } else {
-@@ -2660,10 +2660,10 @@
- if (info_ptr->valid && PNG_INFO_tRNS)
- pm_message("Transparent color {gray, red, green, blue} = "
- "{%d, %d, %d, %d}",
-- info_ptr->trans_values.gray,
-- info_ptr->trans_values.red,
-- info_ptr->trans_values.green,
-- info_ptr->trans_values.blue);
-+ info_ptr->trans_color.gray,
-+ info_ptr->trans_color.red,
-+ info_ptr->trans_color.green,
-+ info_ptr->trans_color.blue);
- else
- pm_message("No transparent color");
- }