Attachment 221832 Details for Bug 252926 – Sugested git diff (with correct openjpeg depends)

[patch] Sugested git diff (with correct openjpeg depends)

mtpaint-3.50.diff (text/plain), 6.78 KB, created by Nuno Teixeira on 2021-01-23 09:32:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2021-01-23 09:32:19 UTC

Size: 6.78 KB

patch

obsolete

>diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile
>index e729143de0fe..622b939cbc20 100644
>--- a/graphics/mtpaint/Makefile
>+++ b/graphics/mtpaint/Makefile
>@@ -2,12 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	mtpaint
>-PORTVERSION=	3.40
>-PORTREVISION=	8
>+PORTVERSION=	3.50
> CATEGORIES=	graphics
> MASTER_SITES=	SF
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	ed.arrakis@gmail.com
> COMMENT=	Simple painting program
> 
> LICENSE=	GPLv3
>@@ -18,17 +17,20 @@ LIB_DEPENDS=	libpng.so:graphics/png \
> 		libgif.so:graphics/giflib \
> 		libfreetype.so:print/freetype2
> 
>-USES=		desktop-file-utils gmake gnome iconv jpeg pkgconfig tar:bzip2
>-USE_GNOME=	gtk20
>+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=${MAN1PREFIX}/man/man1 \
>+CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${PREFIX}/share/man/man1 \
> 		--localedir=${PREFIX}/share/locale \
>-		gtk2 cflags asneeded ft jpeg tiff man GIF
>+		gtk3 cflags asneeded ft jpeg tiff man GIF
> 
> CFLAGS+=	-fcommon
> LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
> 
>-OPTIONS_DEFINE=	LCMS2 OPENJPEG NLS
>+PORTDOCS=	README
>+
>+OPTIONS_DEFINE=	DOCS LCMS2 OPENJPEG NLS
> OPTIONS_DEFAULT=	LCMS2 OPENJPEG
> OPTIONS_SUB=	yes
> 
>@@ -36,18 +38,22 @@ LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
> LCMS2_CONFIGURE_ON=	lcms2
> LCMS2_CONFIGURE_OFF=	nolcms
> 
>-OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
>-OPENJPEG_CONFIGURE_ON=	jp2
>+OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
>+OPENJPEG_CONFIGURE_ON=	jp2v2
> OPENJPEG_LIB_DEPENDS_OFF=libjasper.so:graphics/jasper
> OPENJPEG_CONFIGURE_OFF=	jasper
> 
> 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}${MANPREFIX}/man/man1
>+		${STAGEDIR}${PREFIX}/share/man/man1
> 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.desktop \
> 		${STAGEDIR}${DESKTOPDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.png \
>diff --git a/graphics/mtpaint/distinfo b/graphics/mtpaint/distinfo
>index 9374f4db231f..555e9949a171 100644
>--- a/graphics/mtpaint/distinfo
>+++ b/graphics/mtpaint/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (mtpaint-3.40.tar.bz2) = ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890
>-SIZE (mtpaint-3.40.tar.bz2) = 600857
>+TIMESTAMP = 1611318094
>+SHA256 (mtpaint-3.50.tar.bz2) = 695cea10c428a8f122ed59beee5ffa49dcdcba8d88a4790eaf3c64fd7c73d6ac
>+SIZE (mtpaint-3.50.tar.bz2) = 800134
>diff --git a/graphics/mtpaint/files/patch-configure b/graphics/mtpaint/files/patch-configure
>index a0444859630d..fc176dbc2b16 100644
>--- a/graphics/mtpaint/files/patch-configure
>+++ b/graphics/mtpaint/files/patch-configure
>@@ -1,14 +1,14 @@
>---- configure.bak	2011-12-30 03:08:17.000000000 +0900
>-+++ configure	2012-01-06 05:25:11.000000000 +0900
>-@@ -68,6 +68,7 @@
>- 	"tiff" )	NTIFF=YES;;
>- 	"notiff" )	NTIFF=NO;;
>- 	"statictiff" )	STATIC_TIFF=TIFF;;
>+--- 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;;
>-@@ -471,7 +472,7 @@
>+@@ -523,7 +524,7 @@ else # $OPTS = CFLAGS
>  	MARCH=
>  	# And leave CFLAGS alone
>  fi
>@@ -17,3 +17,12 @@
>  # 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
>diff --git a/graphics/mtpaint/files/patch-src_png.c b/graphics/mtpaint/files/patch-src_png.c
>deleted file mode 100644
>index 9a39208498de..000000000000
>--- a/graphics/mtpaint/files/patch-src_png.c
>+++ /dev/null
>@@ -1,92 +0,0 @@
>---- 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);
>- }
>diff --git a/graphics/mtpaint/pkg-plist b/graphics/mtpaint/pkg-plist
>index 98cc6716f425..6692803d89e9 100644
>--- a/graphics/mtpaint/pkg-plist
>+++ b/graphics/mtpaint/pkg-plist
>@@ -1,5 +1,5 @@
> bin/mtpaint
>-man/man1/mtpaint.1.gz
>+share/man/man1/mtpaint.1.gz
> share/applications/mtpaint.desktop
> %%NLS%%share/locale/cs/LC_MESSAGES/mtpaint.mo
> %%NLS%%share/locale/de/LC_MESSAGES/mtpaint.mo

Flags:

eduardo: maintainer-approval+

Actions: View | Diff

Attachments on bug 252926: 221818 | 221831 | 221832 | 221860 | 221885