Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Feb 2020 14:41:16 -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: r525035 - in head/print: . xreader
Message-ID:  <945c00bf-02a3-7bc8-70b8-e82e3b3900e8@FreeBSD.org>
In-Reply-To: <202002031322.013DMSCA044267@repo.freebsd.org>
References:  <202002031322.013DMSCA044267@repo.freebsd.org>

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

Hi,

On 2/3/20 8:22 AM, Alexey Dokuchaev wrote:
> Author: danfe
> Date: Mon Feb  3 13:22:28 2020
> New Revision: 525035
> URL: https://svnweb.freebsd.org/changeset/ports/525035
> 
> Log:
>    Xreader is a document viewer capable of displaying multiple and single page
>    document formats like CBR (comics), DjVu, DVI, PDF, PostScript, XPS, etc.
>    
>    WWW: https://github.com/linuxmint/xreader
> 
> Added:
>    head/print/xreader/
>    head/print/xreader/Makefile   (contents, props changed)
>    head/print/xreader/distinfo   (contents, props changed)
>    head/print/xreader/pkg-descr   (contents, props changed)
>    head/print/xreader/pkg-plist   (contents, props changed)
> Modified:
>    head/print/Makefile
> 
> Modified: head/print/Makefile
> ==============================================================================
> --- head/print/Makefile	Mon Feb  3 12:46:16 2020	(r525034)
> +++ head/print/Makefile	Mon Feb  3 13:22:28 2020	(r525035)
> @@ -259,6 +259,7 @@
>       SUBDIR += xmbibtex
>       SUBDIR += xpdfopen
>       SUBDIR += xpp
> +    SUBDIR += xreader
>       SUBDIR += xtexsh
>       SUBDIR += yatex
>   
> 
> Added: head/print/xreader/Makefile
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/print/xreader/Makefile	Mon Feb  3 13:22:28 2020	(r525035)
> @@ -0,0 +1,55 @@
> +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
> +# $FreeBSD$
> +
> +PORTNAME=	xreader
> +PORTVERSION=	2.4.4
> +CATEGORIES=	print
> +
> +MAINTAINER=	danfe@FreeBSD.org
> +COMMENT=	Generic document reader
> +
> +LICENSE=	GPLv2+
> +
> +BUILD_DEPENDS=	intltool-merge:textproc/intltool
> +LIB_DEPENDS=	libxapp.so:x11/xapps
> +
> +USES=		desktop-file-utils gettext-tools gnome meson pkgconfig
> +USE_GITHUB=	yes
> +GH_ACCOUNT=	linuxmint
> +USE_LDCONFIG=	yes
> +USE_GNOME=	cairo gdkpixbuf2 gtk30 libxml2
> +USE_XORG=	ice sm x11
> +GLIB_SCHEMAS=	org.x.reader.gschema.xml
> +INSTALLS_ICONS=	yes
> +
> +MESON_ARGS=	-Depub=false -Dtests=false
> +
> +OPTIONS_DEFINE=	DJVU KEYRING PDF PS TIFF XPS
> +OPTIONS_DEFAULT=	DJVU KEYRING PDF TIFF XPS
> +KEYRING_DESC=	Password-protected document support
> +XPS_DESC=	XPS document support
> +OPTIONS_SUB=	yes
> +
> +DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
> +DJVU_MESON_ON=		-Ddjvu=true
> +
> +KEYRING_LIB_DEPENDS=	libsecret-1.so:security/libsecret
> +KEYRING_MESON_OFF=	-Dkeyring=false
> +
> +PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
> +PDF_MESON_OFF=		-Dpdf=false
> +
> +PS_LIB_DEPENDS=		libspectre.so:print/libspectre
> +PS_MESON_OFF=		-Dps=false
> +
> +TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
> +TIFF_MESON_OFF=		-Dtiff=false
> +
> +XPS_LIB_DEPENDS=	libgxps.so:graphics/libgxps
> +XPS_MESON_OFF=		-Dxps=false
> +
> +post-patch:
> +	@${REINPLACE_CMD} -e '/gdk\/gdkwayland\.h/d' \
> +		${WRKSRC}/libdocument/ev-document-misc.h
> +

This REINPLACE_CMD doesn't seem necessary, it seems to build fine for me 
without this. See attached, which also has some clean up.

Steve

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

diff --git print/xreader/Makefile print/xreader/Makefile
index 0aca321c7ee1..dff59dd12f7a 100644
--- print/xreader/Makefile
+++ print/xreader/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2+
 BUILD_DEPENDS=	intltool-merge:textproc/intltool
 LIB_DEPENDS=	libxapp.so:x11/xapps
 
-USES=		desktop-file-utils gettext-tools gnome meson pkgconfig
+USES=		desktop-file-utils gettext-tools gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_LDCONFIG=	yes
@@ -22,13 +22,14 @@ USE_XORG=	ice sm x11
 GLIB_SCHEMAS=	org.x.reader.gschema.xml
 INSTALLS_ICONS=	yes
 
-MESON_ARGS=	-Depub=false -Dtests=false
+MESON_ARGS=	-Depub=false \
+		-Dtests=false
 
-OPTIONS_DEFINE=	DJVU KEYRING PDF PS TIFF XPS
+OPTIONS_DEFINE=		DJVU KEYRING PDF PS TIFF XPS
 OPTIONS_DEFAULT=	DJVU KEYRING PDF TIFF XPS
-KEYRING_DESC=	Password-protected document support
-XPS_DESC=	XPS document support
-OPTIONS_SUB=	yes
+KEYRING_DESC=		Password-protected document support
+XPS_DESC=		XPS document support
+OPTIONS_SUB=		yes
 
 DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 DJVU_MESON_ON=		-Ddjvu=true
@@ -39,8 +40,8 @@ KEYRING_MESON_OFF=	-Dkeyring=false
 PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 PDF_MESON_OFF=		-Dpdf=false
 
-PS_LIB_DEPENDS=		libspectre.so:print/libspectre
-PS_MESON_OFF=		-Dps=false
+PS_LIB_DEPENDS=	libspectre.so:print/libspectre
+PS_MESON_OFF=	-Dps=false
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MESON_OFF=		-Dtiff=false
@@ -48,8 +49,4 @@ TIFF_MESON_OFF=		-Dtiff=false
 XPS_LIB_DEPENDS=	libgxps.so:graphics/libgxps
 XPS_MESON_OFF=		-Dxps=false
 
-post-patch:
-	@${REINPLACE_CMD} -e '/gdk\/gdkwayland\.h/d' \
-		${WRKSRC}/libdocument/ev-document-misc.h
-
 .include <bsd.port.mk>

--------------4F13CF2D9BDB99053BF0648E--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?945c00bf-02a3-7bc8-70b8-e82e3b3900e8>