pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

foliate: Normalize meson usage

Module Name:	pkgsrc-wip
Committed By:	nia <>
Pushed By:	nee
Date:		Sat Oct 5 12:01:48 2019 +0100
Changeset:	aa839777e08c7bd8fe18176bfbb5c2ee4ae0d786

Modified Files:

Log Message:
foliate: Normalize meson usage

To see a diff of this commit:;a=commitdiff;h=aa839777e08c7bd8fe18176bfbb5c2ee4ae0d786

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

 foliate/Makefile | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/foliate/Makefile b/foliate/Makefile
index 9c57bee507..7876d6fdfb 100644
--- a/foliate/Makefile
+++ b/foliate/Makefile
@@ -10,11 +10,9 @@ COMMENT=	Simple and modern GTK eBook viewer
 LICENSE=	gnu-gpl-v3
-USE_TOOLS+=	gettext msgfmt msgmerge
+USE_TOOLS+=	pkg-config msgfmt xgettext
-BUILD_DEPENDS+=	${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson
 BUILD_DEPENDS+=	gjs>=1.52.0:../../wip/gjs
-BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 # XXX fails without GNU msgfmt
 _TOOLS_USE_PKGSRC.msgfmt=	yes
@@ -27,17 +25,9 @@ REPLACE_PYTHON+=	${WRKSRC}/src/assets/KindleUnpack/
 GLIB_SCHEMAS=	com.github.johnfactotum.Foliate.gschema.xml
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson build --prefix=${PREFIX}
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C build
-	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ninja -C build install
 # Add options once the package is running correctly
 #.include ""
+.include "../../devel/py-meson/"
 .include "../../devel/glib2/"
 .include "../../devel/glib2/"
 .include "../../lang/python/"

Home | Main Index | Thread Index | Old Index