Attachment #221860 for bug #252926




# $FreeBSD$

PORTNAME=	mtpaint
PORTVERSION=	3.50
PORTREVISION=	8
CATEGORIES=	graphics
MASTER_SITES=	SF

MAINTAINER=	ed.arrakis@gmail.com
COMMENT=	Simple painting program

LICENSE=	GPLv3

		libgif.so:graphics/giflib \
		libfreetype.so:print/freetype2

USES=		desktop-file-utils gmake gnome iconv jpeg pkgconfig tar:bzip2 xorg
USE_GNOME=	cairo gdkpixbuf2 gtk30
USE_XORG=	x11
HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${PREFIX}/share/man/man1 \
		--localedir=${PREFIX}/share/locale \
		gtk3 cflags asneeded ft jpeg tiff man GIF

CFLAGS+=	-fcommon
LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

PORTDOCS=	README

OPTIONS_DEFINE=	DOCS LCMS2 OPENJPEG NLS WEBP
OPTIONS_DEFAULT=	LCMS2 OPENJPEG
OPTIONS_SUB=	yes


LCMS2_CONFIGURE_ON=	lcms2
LCMS2_CONFIGURE_OFF=	nolcms

OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
OPENJPEG_CONFIGURE_ON=	jp2v2
OPENJPEG_LIB_DEPENDS_OFF=libjasper.so:graphics/jasper
OPENJPEG_CONFIGURE_OFF=	jasper
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
WEBP_CONFIGURE_ON=	webp

NLS_USES=		gettext
NLS_CONFIGURE_ON=	intl

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
		${STAGEDIR}${PREFIX}/share/man/man1
	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.desktop \
		${STAGEDIR}${DESKTOPDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.png \

Lines 1-2 Link Here

(-)b/graphics/mtpaint/distinfo (-2 / +3 lines)
1	SHA256 (mtpaint-3.40.tar.bz2) = ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890	1	TIMESTAMP = 1611318094
2	SIZE (mtpaint-3.40.tar.bz2) = 600857	2	SHA256 (mtpaint-3.50.tar.bz2) = 695cea10c428a8f122ed59beee5ffa49dcdcba8d88a4790eaf3c64fd7c73d6ac
		3	SIZE (mtpaint-3.50.tar.bz2) = 800134




--- configure.orig	2021-01-23 07:22:40 UTC
+++ configure
@@ -74,6 +74,7 @@ do
 	"webp" )	NWEBP=YES;;
 	"nowebp" )	NWEBP=NO;;
 	"staticwebp" )	STATIC_WEBP=WebP;;
+	"ft" )		NFT=YES;;
 	"noft" )	NFT=NO;;
 	"staticft" )	STATIC_FT=FreeType;;
 	"lcms" )	NCMS=LittleCMS;;
@@ -523,7 +524,7 @@ else # $OPTS = CFLAGS
 	MARCH=
 	# And leave CFLAGS alone
 fi

 # Set Windows-specific flags
 if [ "$OS" != "${OS#MinGW/}" ]
 then
@@ -856,7 +857,7 @@ General
 -------
 
     Version             $MT_V
-    System              $OS
+    System              $OSTYPE
     Toolkit             GTK+$GTK${GTK2VERSION:+.$GTK2VERSION}
     Lists               GTK+$MT_LISTS
     File Picker         $MT_FPICK




--- src/png.c.orig	2011-10-27 20:56:24 UTC
+++ src/png.c
@@ -1510,7 +1510,11 @@ static int load_gif_frames(char *file_na
 	int res, val, disposal, bpp, cmask, lastzero = FALSE;
 
 
+#if GIFLIB_MAJOR >= 5
+	if (!(giffy = DGifOpenFileName(file_name, NULL))) return (-1);
+#else
 	if (!(giffy = DGifOpenFileName(file_name))) return (-1);
+#endif
 
 	/* Init state structure */
 	memset(&stat, 0, sizeof(stat));
@@ -1608,7 +1612,11 @@ static int load_gif_frames(char *file_na
 	}
 	res = 1;
 fail:	mem_free_chanlist(w_set.img);
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+	DGifCloseFile(giffy, NULL);
+#else
 	DGifCloseFile(giffy);
+#endif
 	return (res);
 }
 
@@ -1621,7 +1629,11 @@ static int load_gif(char *file_name, ls_
 	int delay = settings->gif_delay, trans = -1;//, disposal = 0;
 
 
+#if GIFLIB_MAJOR >= 5
+	if (!(giffy = DGifOpenFileName(file_name, NULL))) return (-1);
+#else
 	if (!(giffy = DGifOpenFileName(file_name))) return (-1);
+#endif
 
 	/* Get global palette */
 	settings->colors = convert_gif_palette(settings->pal, giffy->SColorMap);
@@ -1659,7 +1671,11 @@ static int load_gif(char *file_name, ls_
 		}
 	}
 	res = 1;
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+fail:	DGifCloseFile(giffy, NULL);
+#else
 fail:	DGifCloseFile(giffy);
+#endif
 	return (res);
 }
 
@@ -1682,10 +1698,18 @@ static int save_gif(char *file_name, ls_
 	nc |= nc >> 1; nc |= nc >> 2; nc |= nc >> 4;
 	nc += !nc + 1; // No less than 2 colors
 
+#if GIFLIB_MAJOR >= 5
+	gif_map = GifMakeMapObject(nc, NULL);
+#else
 	gif_map = MakeMapObject(nc, NULL);
+#endif
 	if (!gif_map) return -1;
 
+#if GIFLIB_MAJOR >= 5
+	giffy = EGifOpenFileName(file_name, FALSE, NULL);
+#else
 	giffy = EGifOpenFileName(file_name, FALSE);
+#endif
 	if (!giffy) goto fail0;
 
 	for (i = 0; i < settings->colors; i++)
@@ -1725,14 +1749,22 @@ static int save_gif(char *file_name, ls_
 	if (!settings->silent) progress_end();
 	msg = 0;
 
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+fail:	EGifCloseFile(giffy, NULL);
+#else
 fail:	EGifCloseFile(giffy);
+#endif
 #ifndef WIN32
 	/* giflib creates files with 0600 permissions, which is nasty - WJ */
 	mode = umask(0022);
 	umask(mode);
 	chmod(file_name, 0666 & ~mode);
 #endif
+#if GIFLIB_MAJOR >= 5
+fail0:	GifFreeMapObject(gif_map);
+#else
 fail0:	FreeMapObject(gif_map);
+#endif
 
 	return (msg);
 }

Lines 1-5 Link Here

(-)b/graphics/mtpaint/pkg-plist (-1 / +1 lines)
1	bin/mtpaint	1	bin/mtpaint
2	man/man1/mtpaint.1.gz	2	share/man/man1/mtpaint.1.gz
3	share/applications/mtpaint.desktop	3	share/applications/mtpaint.desktop
4	%%NLS%%share/locale/cs/LC_MESSAGES/mtpaint.mo	4	%%NLS%%share/locale/cs/LC_MESSAGES/mtpaint.mo
5	%%NLS%%share/locale/de/LC_MESSAGES/mtpaint.mo	5	%%NLS%%share/locale/de/LC_MESSAGES/mtpaint.mo

Return to bug 252926

Lines 2-13 Link Here

(-)b/graphics/mtpaint/Makefile (-11 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mtpaint	4	PORTNAME= mtpaint
5	PORTVERSION= 3.40	5	PORTVERSION= 3.50
6	PORTREVISION= 8
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ed.arrakis@gmail.com
11	COMMENT= Simple painting program	10	COMMENT= Simple painting program
12		11
13	LICENSE= GPLv3	12	LICENSE= GPLv3
Lines 18-34 LIB_DEPENDS= libpng.so:graphics/png \ Link Here
18	libgif.so:graphics/giflib \	17	libgif.so:graphics/giflib \
19	libfreetype.so:print/freetype2	18	libfreetype.so:print/freetype2
20		19
21	USES= desktop-file-utils gmake gnome iconv jpeg pkgconfig tar:bzip2	20	USES= desktop-file-utils gmake gnome iconv jpeg pkgconfig tar:bzip2 xorg
22	USE_GNOME= gtk20	21	USE_GNOME= cairo gdkpixbuf2 gtk30
		22	USE_XORG= x11
23	HAS_CONFIGURE= yes	23	HAS_CONFIGURE= yes
24	CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MAN1PREFIX}/man/man1 \	24	CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${PREFIX}/share/man/man1 \
25	--localedir=${PREFIX}/share/locale \	25	--localedir=${PREFIX}/share/locale \
26	gtk2 cflags asneeded ft jpeg tiff man GIF	26	gtk3 cflags asneeded ft jpeg tiff man GIF
27		27
28	CFLAGS+= -fcommon	28	CFLAGS+= -fcommon
29	LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}	29	LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
30		30
31	OPTIONS_DEFINE= LCMS2 OPENJPEG NLS	31	PORTDOCS= README
		32
		33	OPTIONS_DEFINE= DOCS LCMS2 OPENJPEG NLS WEBP
32	OPTIONS_DEFAULT= LCMS2 OPENJPEG	34	OPTIONS_DEFAULT= LCMS2 OPENJPEG
33	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
34		36
Lines 36-53 LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 Link Here
36	LCMS2_CONFIGURE_ON= lcms2	38	LCMS2_CONFIGURE_ON= lcms2
37	LCMS2_CONFIGURE_OFF= nolcms	39	LCMS2_CONFIGURE_OFF= nolcms
38		40
39	OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15	41	OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
40	OPENJPEG_CONFIGURE_ON= jp2	42	OPENJPEG_CONFIGURE_ON= jp2v2
41	OPENJPEG_LIB_DEPENDS_OFF=libjasper.so:graphics/jasper	43	OPENJPEG_LIB_DEPENDS_OFF=libjasper.so:graphics/jasper
42	OPENJPEG_CONFIGURE_OFF= jasper	44	OPENJPEG_CONFIGURE_OFF= jasper
		45	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
		46	WEBP_CONFIGURE_ON= webp
43		47
44	NLS_USES= gettext	48	NLS_USES= gettext
45	NLS_CONFIGURE_ON= intl	49	NLS_CONFIGURE_ON= intl
46		50
		51	do-install-DOCS-on:
		52	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		53	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
		54
47	do-install:	55	do-install:
48	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	56	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
49	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \	57	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
50	${STAGEDIR}${MANPREFIX}/man/man1	58	${STAGEDIR}${PREFIX}/share/man/man1
51	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.desktop \	59	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.desktop \
52	${STAGEDIR}${DESKTOPDIR}	60	${STAGEDIR}${DESKTOPDIR}
53	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.png \	61	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.png \

Lines 1-14 Link Here

(-)b/graphics/mtpaint/files/patch-configure (-7 / +16 lines)
1	--- configure.bak 2011-12-30 03:08:17.000000000 +0900	1	--- configure.orig 2021-01-23 07:22:40 UTC
2	+++ configure 2012-01-06 05:25:11.000000000 +0900	2	+++ configure
3	@@ -68,6 +68,7 @@	3	@@ -74,6 +74,7 @@ do
4	"tiff" ) NTIFF=YES;;	4	"webp" ) NWEBP=YES;;
5	"notiff" ) NTIFF=NO;;	5	"nowebp" ) NWEBP=NO;;
6	"statictiff" ) STATIC_TIFF=TIFF;;	6	"staticwebp" ) STATIC_WEBP=WebP;;
7	+ "ft" ) NFT=YES;;	7	+ "ft" ) NFT=YES;;
8	"noft" ) NFT=NO;;	8	"noft" ) NFT=NO;;
9	"staticft" ) STATIC_FT=FreeType;;	9	"staticft" ) STATIC_FT=FreeType;;
10	"lcms" ) NCMS=LittleCMS;;	10	"lcms" ) NCMS=LittleCMS;;
11	@@ -471,7 +472,7 @@	11	@@ -523,7 +524,7 @@ else # $OPTS = CFLAGS
12	MARCH=	12	MARCH=
13	# And leave CFLAGS alone	13	# And leave CFLAGS alone
14	fi	14	fi
Lines 17-19 Link Here
17	# Set Windows-specific flags	17	# Set Windows-specific flags
18	if [ "$OS" != "${OS#MinGW/}" ]	18	if [ "$OS" != "${OS#MinGW/}" ]
19	then	19	then
		20	@@ -856,7 +857,7 @@ General
		21	-------
		22
		23	Version $MT_V
		24	- System $OS
		25	+ System $OSTYPE
		26	Toolkit GTK+$GTK${GTK2VERSION:+.$GTK2VERSION}
		27	Lists GTK+$MT_LISTS
		28	File Picker $MT_FPICK

Removed Link Here

(-)a/graphics/mtpaint/files/patch-src_png.c (-92 lines)
1	--- src/png.c.orig 2011-10-27 20:56:24 UTC
2	+++ src/png.c
3	@@ -1510,7 +1510,11 @@ static int load_gif_frames(char *file_na
4	int res, val, disposal, bpp, cmask, lastzero = FALSE;
5
6
7	+#if GIFLIB_MAJOR >= 5
8	+ if (!(giffy = DGifOpenFileName(file_name, NULL))) return (-1);
9	+#else
10	if (!(giffy = DGifOpenFileName(file_name))) return (-1);
11	+#endif
12
13	/* Init state structure */
14	memset(&stat, 0, sizeof(stat));
15	@@ -1608,7 +1612,11 @@ static int load_gif_frames(char *file_na
16	}
17	res = 1;
18	fail: mem_free_chanlist(w_set.img);
19	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
20	+ DGifCloseFile(giffy, NULL);
21	+#else
22	DGifCloseFile(giffy);
23	+#endif
24	return (res);
25	}
26
27	@@ -1621,7 +1629,11 @@ static int load_gif(char *file_name, ls_
28	int delay = settings->gif_delay, trans = -1;//, disposal = 0;
29
30
31	+#if GIFLIB_MAJOR >= 5
32	+ if (!(giffy = DGifOpenFileName(file_name, NULL))) return (-1);
33	+#else
34	if (!(giffy = DGifOpenFileName(file_name))) return (-1);
35	+#endif
36
37	/* Get global palette */
38	settings->colors = convert_gif_palette(settings->pal, giffy->SColorMap);
39	@@ -1659,7 +1671,11 @@ static int load_gif(char *file_name, ls_
40	}
41	}
42	res = 1;
43	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
44	+fail: DGifCloseFile(giffy, NULL);
45	+#else
46	fail: DGifCloseFile(giffy);
47	+#endif
48	return (res);
49	}
50
51	@@ -1682,10 +1698,18 @@ static int save_gif(char *file_name, ls_
52	nc \|= nc >> 1; nc \|= nc >> 2; nc \|= nc >> 4;
53	nc += !nc + 1; // No less than 2 colors
54
55	+#if GIFLIB_MAJOR >= 5
56	+ gif_map = GifMakeMapObject(nc, NULL);
57	+#else
58	gif_map = MakeMapObject(nc, NULL);
59	+#endif
60	if (!gif_map) return -1;
61
62	+#if GIFLIB_MAJOR >= 5
63	+ giffy = EGifOpenFileName(file_name, FALSE, NULL);
64	+#else
65	giffy = EGifOpenFileName(file_name, FALSE);
66	+#endif
67	if (!giffy) goto fail0;
68
69	for (i = 0; i < settings->colors; i++)
70	@@ -1725,14 +1749,22 @@ static int save_gif(char *file_name, ls_
71	if (!settings->silent) progress_end();
72	msg = 0;
73
74	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
75	+fail: EGifCloseFile(giffy, NULL);
76	+#else
77	fail: EGifCloseFile(giffy);
78	+#endif
79	#ifndef WIN32
80	/* giflib creates files with 0600 permissions, which is nasty - WJ */
81	mode = umask(0022);
82	umask(mode);
83	chmod(file_name, 0666 & ~mode);
84	#endif
85	+#if GIFLIB_MAJOR >= 5
86	+fail0: GifFreeMapObject(gif_map);
87	+#else
88	fail0: FreeMapObject(gif_map);
89	+#endif
90
91	return (msg);
92	}