From owner-svn-ports-head@freebsd.org Mon Feb 3 19:41:28 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C565C22C7BE; Mon, 3 Feb 2020 19:41:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 48BJ9N4fgpz3yw5; Mon, 3 Feb 2020 19:41:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from lrrr.mouf.net (cpe-76-182-16-135.nc.res.rr.com [76.182.16.135]) (authenticated bits=0) by mouf.net (8.14.9/8.14.9) with ESMTP id 013JfLfK015664 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Mon, 3 Feb 2020 19:41:27 GMT (envelope-from swills@FreeBSD.org) Subject: Re: svn commit: r525035 - in head/print: . xreader To: Alexey Dokuchaev , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <202002031322.013DMSCA044267@repo.freebsd.org> From: Steve Wills Message-ID: <945c00bf-02a3-7bc8-70b8-e82e3b3900e8@FreeBSD.org> Date: Mon, 3 Feb 2020 14:41:16 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <202002031322.013DMSCA044267@repo.freebsd.org> Content-Type: multipart/mixed; boundary="------------4F13CF2D9BDB99053BF0648E" Content-Language: en-US X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Mon, 03 Feb 2020 19:41:27 +0000 (UTC) X-Spam-Status: No, score=0.3 required=4.5 tests=KHOP_HELO_FCRDNS autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mouf.net X-Virus-Scanned: clamav-milter 0.99.2 at mouf.net X-Virus-Status: Clean X-Rspamd-Queue-Id: 48BJ9N4fgpz3yw5 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.988,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Feb 2020 19:41:28 -0000 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 > +# $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 --------------4F13CF2D9BDB99053BF0648E--