diff --git a/srcpkgs/wordgrinder/patches/fix-luapath.patch b/srcpkgs/wordgrinder/patches/fix-luapath.patch new file mode 100644 index 00000000000..941e939b0df --- /dev/null +++ b/srcpkgs/wordgrinder/patches/fix-luapath.patch @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -97,7 +97,7 @@ + + hide = @ + +-LUA_INTERPRETER = $(OBJDIR)/lua ++LUA_INTERPRETER ?= $(OBJDIR)/lua + + NINJABUILD = \ + $(hide) ninja -f $(OBJDIR)/build.ninja $(NINJAFLAGS) diff --git a/srcpkgs/wordgrinder/patches/fix-typo.patch b/srcpkgs/wordgrinder/patches/fix-typo.patch deleted file mode 100644 index e85330bc28d..00000000000 --- a/srcpkgs/wordgrinder/patches/fix-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6c28bf3a7f223b5e120f075669fb3047bb580bf5 Mon Sep 17 00:00:00 2001 -From: David Given -Date: Fri, 3 Nov 2017 22:17:45 +0100 -Subject: [PATCH] Stupid typo fix. - ---- - src/lua/document.lua | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lua/document.lua b/src/lua/document.lua -index 83d58e5..1c15a26 100644 ---- src/lua/document.lua -+++ src/lua/document.lua -@@ -533,7 +533,7 @@ end - function UpdateDocumentStyles() - local plaintext = - { -- desc = "Plain test", -+ desc = "Plain text", - name = "P" - } - diff --git a/srcpkgs/wordgrinder/template b/srcpkgs/wordgrinder/template index f6cbbde2a88..711557d7502 100644 --- a/srcpkgs/wordgrinder/template +++ b/srcpkgs/wordgrinder/template @@ -1,7 +1,7 @@ # Template file for 'wordgrinder' pkgname=wordgrinder -version=0.7.1 -revision=3 +version=0.7.2 +revision=1 hostmakedepends="pkg-config ninja lua" makedepends="libXft-devel lua-devel" short_desc="A terminal-based word processor" @@ -9,12 +9,13 @@ maintainer="Andrew Benson " license="MIT" homepage="http://cowlark.com/wordgrinder" distfiles="https://github.com/davidgiven/wordgrinder/archive/${version}.tar.gz" -checksum=54085af7963e1f67342bc0b1b20d1ccc75494f2e23d401b601cf3089acea747c +checksum=4e1bc659403f98479fe8619655f901c8c03eb87743374548b4d20a41d31d1dff do_configure() { export PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=${XBPS_CROSS_BASE}/usr/lib/pkgconfig export PKG_CONFIG_SYSROOT_DIR=${XBPS_CROSS_BASE} + LDFLAGS+=" -lX11 " make wg-build/build.ninja LUA_PACKAGE=lua LUA_INTERPRETER=/usr/bin/lua XFT_PACKAGE=xft }