diff --git a/mingw-w64-lua-lgi/001-lua5.1.patch b/mingw-w64-lua-lgi/001-lua5.1.patch deleted file mode 100644 index fcf36bad7b..0000000000 --- a/mingw-w64-lua-lgi/001-lua5.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rup lgi-0.9.1/lgi/lgi.h lgi-0.9.1-ricky/lgi/lgi.h ---- lgi-0.9.1/lgi/lgi.h 2016-05-28 03:56:36.000000000 +0800 -+++ lgi-0.9.1-ricky/lgi/lgi.h 2016-10-26 21:13:00.262476600 +0800 -@@ -8,8 +8,8 @@ - - #define G_LOG_DOMAIN "Lgi" - --#include --#include -+#include -+#include - - /* Lua 5.2 compatibility stuff. */ - #if LUA_VERSION_NUM >= 502 -diff -rup lgi-0.9.1/lgi/Makefile lgi-0.9.1-ricky/lgi/Makefile ---- lgi-0.9.1/lgi/Makefile 2016-05-28 03:56:36.000000000 +0800 -+++ lgi-0.9.1-ricky/lgi/Makefile 2016-10-26 21:14:47.106118700 +0800 -@@ -19,7 +19,7 @@ VERSION_FILE = version.lua - ifneq ($(filter cygwin% msys% mingw%, $(HOST_OS)),) - CORE = corelgilua51.dll - LIBFLAG = -shared --LIBS += -llua -+LIBS += -llua5.1 - else - ifeq ($(HOST_OS),darwin) - CORE = corelgilua51.so - diff --git a/mingw-w64-lua-lgi/PKGBUILD b/mingw-w64-lua-lgi/PKGBUILD index 22f3f734cf..12bb046584 100644 --- a/mingw-w64-lua-lgi/PKGBUILD +++ b/mingw-w64-lua-lgi/PKGBUILD @@ -4,7 +4,7 @@ _realname=lgi pkgbase=mingw-w64-lua-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-lua51-${_realname}" pkgver=0.9.2 -pkgrel=5 +pkgrel=6 pkgdesc="LGI is gobject-introspection based dynamic Lua binding to GObject based libraries (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -17,22 +17,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-lua51" "${MINGW_PACKAGE_PREFIX}-glib2" "${MINGW_PACKAGE_PREFIX}-gobject-introspection-runtime" "${MINGW_PACKAGE_PREFIX}-libffi") -source=("https://github.com/pavouk/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.zip" - "001-lua5.1.patch") -sha256sums=('c6cdb7cca6b745790454b45ebb9c3e8be96aca948c7d640d79c969a1c78b35e9' - '7c10a414e57f07a89fd1847b5d1c4baf61dc568c2737841eb94a6f2c76b3a5c5') +source=("https://github.com/pavouk/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.zip") +sha256sums=('c6cdb7cca6b745790454b45ebb9c3e8be96aca948c7d640d79c969a1c78b35e9') prepare() { - cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -i ${srcdir}/001-lua5.1.patch + cp -r "${_realname}-${pkgver}" "build-${MSYSTEM}-lua51" + sed -i "s/-llua/-llua5.1/g" "build-${MSYSTEM}-lua51"/lgi/Makefile } build() { - cd "${srcdir}/${_realname}-${pkgver}" - make + CFLAGS="$CFLAGS -I${MINGW_PREFIX}/include/lua5.1" make -C "build-${MSYSTEM}-lua51" all } package() { - cd "${srcdir}/${_realname}-${pkgver}" - make PREFIX=${MINGW_PREFIX} DESTDIR=${pkgdir} install + CFLAGS="$CFLAGS -I${MINGW_PREFIX}/include/lua5.1" \ + make -C "build-${MSYSTEM}-lua51" \ + LUA_VERSION=5.1 \ + PREFIX="${MINGW_PREFIX}" DESTDIR="${pkgdir}" install }