From c963cdb5d51b38b42675e19a18a5860af5ab203a Mon Sep 17 00:00:00 2001 From: Kiyoshi Aman Date: Sat, 4 Jan 2020 22:48:12 -0500 Subject: {system,user}/*: update point of contact for Kiyoshi Aman --- user/lua-expat/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user/lua-expat/APKBUILD') diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD index 9c8a6713a..9b6295bc1 100644 --- a/user/lua-expat/APKBUILD +++ b/user/lua-expat/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Mika Havela # Contribtor: Natanael Copa -# Maintainer: Kiyoshi Aman +# Maintainer: Kiyoshi Aman pkgname=lua-expat _name=expat pkgver=1.3.0 -- cgit v1.2.3-70-g09d2 From 025606accdfe07de9aafe079e4f068ac4d54d9d1 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 12 Jan 2020 10:56:11 +0000 Subject: user/lua-expat: Bump to 1.3.3 --- user/lua-expat/APKBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'user/lua-expat/APKBUILD') diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD index 9b6295bc1..452404157 100644 --- a/user/lua-expat/APKBUILD +++ b/user/lua-expat/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kiyoshi Aman pkgname=lua-expat _name=expat -pkgver=1.3.0 +pkgver=1.3.3 pkgrel=0 pkgdesc="SAX XML parser based on the Expat library" url="https://matthewwild.co.uk/projects/luaexpat/" @@ -11,22 +11,22 @@ arch="all" license="MIT" depends="lua5.3" makedepends="lua5.3-dev expat-dev" -source="http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz" builddir="$srcdir/luaexpat-$pkgver" build() { - cd "$builddir" make LUA_V=5.3 } check() { - cd "$builddir" - LUA_CPATH="./src/?.so" lua tests/test.lua + LUA_CPATH="./src/?.so.1.3.3" lua tests/test.lua } package() { - cd "$builddir" - make LUA_V=5.3 DESTDIR="$pkgdir" install + make \ + LUA_LIBDIR="$pkgdir"/usr/lib/lua5.3 \ + LUA_DIR="$pkgdir"/usr/share/lua5.3 \ + LUA_V=5.3 DESTDIR="$pkgdir" install } -sha512sums="91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae luaexpat-1.3.0.tar.gz" +sha512sums="aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63 lua-expat-1.3.3.tar.gz" -- cgit v1.2.3-70-g09d2 From 4a699fe5f95c969c9a237a277cf9879e45540dc9 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 24 Jan 2020 06:07:41 +0000 Subject: user/lua-expat: Fix build on 32-bit architectures --- user/lua-expat/32bit.patch | 11 +++++++++++ user/lua-expat/APKBUILD | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 user/lua-expat/32bit.patch (limited to 'user/lua-expat/APKBUILD') diff --git a/user/lua-expat/32bit.patch b/user/lua-expat/32bit.patch new file mode 100644 index 000000000..5a09710e1 --- /dev/null +++ b/user/lua-expat/32bit.patch @@ -0,0 +1,11 @@ +--- luaexpat-1.3.3/makefile.old 2018-11-27 11:31:28.000000000 +0000 ++++ luaexpat-1.3.3/makefile 2020-01-24 06:06:47.843102618 +0000 +@@ -36,7 +36,7 @@ + -Wpointer-arith \ + -Wshadow \ + -Wwrite-strings \ +- -DLUA_C89_NUMBERS ++ -Wno-long-long + + CFLAGS = -fPIC -std=gnu99 $(CWARNS) -ansi -O2 -I$(LUA_INC) -I$(EXPAT_INC) + CC = gcc diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD index 452404157..704f89173 100644 --- a/user/lua-expat/APKBUILD +++ b/user/lua-expat/APKBUILD @@ -2,7 +2,6 @@ # Contribtor: Natanael Copa # Maintainer: Kiyoshi Aman pkgname=lua-expat -_name=expat pkgver=1.3.3 pkgrel=0 pkgdesc="SAX XML parser based on the Expat library" @@ -11,7 +10,9 @@ arch="all" license="MIT" depends="lua5.3" makedepends="lua5.3-dev expat-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz + 32bit.patch + " builddir="$srcdir/luaexpat-$pkgver" build() { @@ -29,4 +30,5 @@ package() { LUA_V=5.3 DESTDIR="$pkgdir" install } -sha512sums="aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63 lua-expat-1.3.3.tar.gz" +sha512sums="aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63 lua-expat-1.3.3.tar.gz +ac5b05991dfe36bcc0c9ff7570110dbb1face387c0b65e4735b99cedaff5e29311a919b5e8ce6dae2ac674eadd2fa0bea6ec547754071d325dcce6460eeef36e 32bit.patch" -- cgit v1.2.3-70-g09d2