wordgrinder: update to 0.8.
This commit is contained in:
parent
eebe74cd80
commit
0c9c04301d
3 changed files with 8 additions and 50 deletions
|
@ -1,11 +0,0 @@
|
|||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -11,7 +11,7 @@
|
||||
DESTDIR ?=
|
||||
|
||||
# Where do the temporary files go?
|
||||
-OBJDIR = /tmp/wg-build
|
||||
+OBJDIR = wg-build
|
||||
|
||||
# The compiler used for the native build (curses, X11)
|
||||
CC ?= cc
|
|
@ -1,31 +0,0 @@
|
|||
--- build.lua.orig
|
||||
+++ build.lua
|
||||
@@ -24,7 +24,7 @@
|
||||
if package == "builtin" then
|
||||
return true
|
||||
end
|
||||
- return os.execute("pkg-config "..package) == 0
|
||||
+ return os.execute("pkg-config "..package)
|
||||
end
|
||||
|
||||
local function detect_package(name, package)
|
||||
@@ -54,7 +54,7 @@
|
||||
end
|
||||
|
||||
local function has_binary(binary)
|
||||
- return os.execute("type "..binary.." >/dev/null 2>&1") == 0
|
||||
+ return os.execute("type "..binary.." >/dev/null 2>&1")
|
||||
end
|
||||
|
||||
local function package_flags(package, kind)
|
||||
@@ -68,8 +68,8 @@
|
||||
end
|
||||
|
||||
local filename = os.tmpname()
|
||||
- local e = os.execute("pkg-config "..kind.." "..package.." > "..filename)
|
||||
- if e ~= 0 then
|
||||
+
|
||||
+ if os.execute("pkg-config "..kind.." "..package.." > "..filename) == false then
|
||||
error("required package "..package.." is not available")
|
||||
end
|
||||
local s = io.open(filename):read("*a")
|
|
@ -1,28 +1,28 @@
|
|||
# Template file for 'wordgrinder'
|
||||
pkgname=wordgrinder
|
||||
version=0.7.2
|
||||
revision=2
|
||||
version=0.8
|
||||
revision=1
|
||||
hostmakedepends="pkg-config ninja lua53"
|
||||
makedepends="libXft-devel lua53-devel"
|
||||
short_desc="A terminal-based word processor"
|
||||
short_desc="Terminal-based word processor"
|
||||
maintainer="Andrew Benson <abenson+void@gmail.com>"
|
||||
license="MIT"
|
||||
homepage="http://cowlark.com/wordgrinder"
|
||||
distfiles="https://github.com/davidgiven/wordgrinder/archive/${version}.tar.gz"
|
||||
checksum=4e1bc659403f98479fe8619655f901c8c03eb87743374548b4d20a41d31d1dff
|
||||
checksum=856cbed2b4ccd5127f61c4997a30e642d414247970f69932f25b4b5a81b18d3f
|
||||
|
||||
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
|
||||
make .obj/build.ninja LUA_PACKAGE=lua LUA_INTERPRETER=/usr/bin/lua XFT_PACKAGE=xft
|
||||
}
|
||||
|
||||
do_build() {
|
||||
ninja -f wg-build/build.ninja bin/xwordgrinder-builtin-x11-release
|
||||
ninja -f wg-build/build.ninja bin/wordgrinder-builtin-curses-release
|
||||
ninja -f wg-build/build.ninja bin/wordgrinder.1
|
||||
ninja -f .obj/build.ninja bin/xwordgrinder-builtin-x11-release
|
||||
ninja -f .obj/build.ninja bin/wordgrinder-builtin-curses-release
|
||||
ninja -f .obj/build.ninja bin/wordgrinder.1
|
||||
}
|
||||
|
||||
do_install() {
|
||||
|
|
Loading…
Add table
Reference in a new issue