Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2020 14:38:23 -0500
From:      Steve Wills <swills@FreeBSD.org>
To:        Alexey Dokuchaev <danfe@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r525015 - in head/graphics: . xviewer
Message-ID:  <2d41afa7-54b0-677d-5dc3-f7106b366cb5@FreeBSD.org>
In-Reply-To: <202002030639.0136d7FL098267@repo.freebsd.org>
References:  <202002030639.0136d7FL098267@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------4492DA7BCC186978E1E7E5E0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

On 2/3/20 1:39 AM, Alexey Dokuchaev wrote:
> Author: danfe
> Date: Mon Feb  3 06:39:07 2020
> New Revision: 525015
> URL: https://svnweb.freebsd.org/changeset/ports/525015
> 
> Log:
>    Xviewer is a fast and functional image viewer which supports reading EXIF
>    tags, simple color management, SVG, and Adobe's XMP.
>    
>    WWW: https://github.com/linuxmint/xviewer
> 
> Added:
>    head/graphics/xviewer/
>    head/graphics/xviewer/Makefile   (contents, props changed)
>    head/graphics/xviewer/distinfo   (contents, props changed)
>    head/graphics/xviewer/pkg-descr   (contents, props changed)
>    head/graphics/xviewer/pkg-plist   (contents, props changed)
> Modified:
>    head/graphics/Makefile
> 
> Modified: head/graphics/Makefile
> ==============================================================================
> --- head/graphics/Makefile	Mon Feb  3 05:53:36 2020	(r525014)
> +++ head/graphics/Makefile	Mon Feb  3 06:39:07 2020	(r525015)
> @@ -1074,6 +1074,7 @@
>       SUBDIR += xtexcad
>       SUBDIR += xv
>       SUBDIR += xv-m17n
> +    SUBDIR += xviewer
>       SUBDIR += xwpick
>       SUBDIR += xzgv
>       SUBDIR += yacreader
> 
> Added: head/graphics/xviewer/Makefile
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/graphics/xviewer/Makefile	Mon Feb  3 06:39:07 2020	(r525015)
> @@ -0,0 +1,53 @@
> +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
> +# $FreeBSD$
> +
> +PORTNAME=	xviewer
> +PORTVERSION=	2.4.3
> +CATEGORIES=	graphics
> +
> +MAINTAINER=	danfe@FreeBSD.org
> +COMMENT=	Fast and functional image viewer
> +
> +LICENSE=	GPLv2+
> +
> +BUILD_DEPENDS=	intltool-update:textproc/intltool \
> +		itstool:textproc/itstool \
> +		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
> +LIB_DEPENDS=	libcinnamon-desktop.so:x11/cinnamon-desktop \
> +		libpeas-1.0.so:devel/libpeas
> +
> +USES=		autoreconf desktop-file-utils gettext-tools gmake gnome \
> +		libtool localbase pkgconfig
> +GNU_CONFIGURE=	yes
> +USE_GITHUB=	yes
> +GH_ACCOUNT=	linuxmint
> +USE_GNOME=	atk cairo gdkpixbuf2 gtk30 introspection pango
> +USE_XORG=	x11
> +GLIB_SCHEMAS=	org.x.viewer.enums.xml org.x.viewer.gschema.xml
> +INSTALLS_ICONS=	yes
> +
> +OPTIONS_DEFINE=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
> +OPTIONS_DEFAULT=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
> +XMP_DESC=	Adobe Extensible Metadata Platform support
> +OPTIONS_SUB=	yes
> +
> +JPEG_USES=		jpeg
> +JPEG_CONFIGURE_OFF=	--without-libjpeg
> +
> +LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
> +LCMS2_CONFIGURE_OFF=	--without-cms
> +
> +LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
> +LIBEXIF_CONFIGURE_OFF=	--without-libexif
> +
> +LIBRSVG2_USE=		GNOME=librsvg2
> +LIBRSVG2_CONFIGURE_OFF=	--without-librsvg
> +
> +XMP_LIB_DEPENDS=	libexempi.so:textproc/exempi
> +XMP_CONFIGURE_OFF=	--without-xmp
> +
> +post-patch:
> +	@${REINPLACE_CMD} -e '/CINNAMON_DESKTOP_REQUIRED/s,3\.2\.0,2.4.2,' \
> +		${WRKSRC}/configure.ac
> +

This would be better as a patch. See attached, which also has some clean up.

Steve


--------------4492DA7BCC186978E1E7E5E0
Content-Type: text/x-patch; charset=UTF-8;
 name="xviewer_changes_rev0.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="xviewer_changes_rev0.diff"

diff --git graphics/xviewer/Makefile graphics/xviewer/Makefile
index 53cb4edb89eb..a55b3415fd34 100644
--- graphics/xviewer/Makefile
+++ graphics/xviewer/Makefile
@@ -10,26 +10,27 @@ COMMENT=	Fast and functional image viewer
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	intltool-update:textproc/intltool \
-		itstool:textproc/itstool \
-		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools \
+		intltool-update:textproc/intltool \
+		itstool:textproc/itstool
 LIB_DEPENDS=	libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libpeas-1.0.so:devel/libpeas
 
-USES=		autoreconf desktop-file-utils gettext-tools gmake gnome \
-		libtool localbase pkgconfig
+USES=		autoreconf desktop-file-utils gettext-tools gmake gnome libtool \
+		localbase pkgconfig xorg
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 introspection pango
 USE_XORG=	x11
-GLIB_SCHEMAS=	org.x.viewer.enums.xml org.x.viewer.gschema.xml
+GLIB_SCHEMAS=	org.x.viewer.enums.xml \
+		org.x.viewer.gschema.xml
 INSTALLS_ICONS=	yes
 
-OPTIONS_DEFINE=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
+OPTIONS_DEFINE=		JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
 OPTIONS_DEFAULT=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
-XMP_DESC=	Adobe Extensible Metadata Platform support
-OPTIONS_SUB=	yes
+XMP_DESC=		Adobe Extensible Metadata Platform support
+OPTIONS_SUB=		yes
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_OFF=	--without-libjpeg
@@ -46,8 +47,4 @@ LIBRSVG2_CONFIGURE_OFF=	--without-librsvg
 XMP_LIB_DEPENDS=	libexempi.so:textproc/exempi
 XMP_CONFIGURE_OFF=	--without-xmp
 
-post-patch:
-	@${REINPLACE_CMD} -e '/CINNAMON_DESKTOP_REQUIRED/s,3\.2\.0,2.4.2,' \
-		${WRKSRC}/configure.ac
-
 .include <bsd.port.mk>
diff --git graphics/xviewer/files/patch-configure.ac graphics/xviewer/files/patch-configure.ac
new file mode 100644
index 000000000000..2f994cd8d3f0
--- /dev/null
+++ graphics/xviewer/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2020-01-06 11:26:06 UTC
++++ configure.ac
+@@ -87,7 +87,7 @@ YELP_HELP_INIT
+ 
+ GTK_REQUIRED=3.10.0
+ GLIB_REQUIRED=2.38.0
+-CINNAMON_DESKTOP_REQUIRED=3.2.0
++CINNAMON_DESKTOP_REQUIRED=2.4.2
+ GDKPIXBUF_REQUIRED=2.4.0
+ GTK_PRINT_REQUIRED=3.5.4
+ SHARED_MIME_INFO_REQUIRED=0.20

--------------4492DA7BCC186978E1E7E5E0--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2d41afa7-54b0-677d-5dc3-f7106b366cb5>