From 7db67efa94eb199be90eb87ac6cd0f585ede402e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Sat, 20 Aug 2022 17:49:44 +0100 Subject: [PATCH] libluv: update to 1.44.2-0 --- .../001-luv-1.42.0-win-install.patch | 36 ------------------- mingw-w64-libluv/PKGBUILD | 20 ++++------- 2 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 mingw-w64-libluv/001-luv-1.42.0-win-install.patch diff --git a/mingw-w64-libluv/001-luv-1.42.0-win-install.patch b/mingw-w64-libluv/001-luv-1.42.0-win-install.patch deleted file mode 100644 index 7e6a22d168..0000000000 --- a/mingw-w64-libluv/001-luv-1.42.0-win-install.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f8732b5..c6d3e54 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -215,6 +215,9 @@ if (BUILD_SHARED_LIBS) - set_target_properties(libluv PROPERTIES PREFIX "") - set_target_properties(libluv - PROPERTIES VERSION ${LUV_VERSION} SOVERSION ${LUV_VERSION_MAJOR}) -+ if(WIN32) -+ set_target_properties(libluv PROPERTIES IMPORT_PREFIX "") -+ endif(WIN32) - if(APPLE) - set_target_properties(libluv - PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") -@@ -279,6 +282,8 @@ if (NOT LUA) - CACHE PATH "Installation directory for static libraries") - endif (BUILD_STATIC_LIBS) - if (BUILD_SHARED_LIBS) -+ set(SHAREDLIBS_INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" -+ CACHE PATH "Installation directory for runtime components") - set(SHAREDLIBS_INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" - CACHE PATH "Installation directory for shared libraries") - endif (BUILD_SHARED_LIBS) -@@ -318,10 +323,11 @@ if (CMAKE_INSTALL_PREFIX) - endif (BUILD_STATIC_LIBS) - if (BUILD_SHARED_LIBS) - install(TARGETS libluv -+ RUNTIME DESTINATION "${SHAREDLIBS_INSTALL_BIN_DIR}" - ARCHIVE DESTINATION "${SHAREDLIBS_INSTALL_LIB_DIR}" - LIBRARY DESTINATION "${SHAREDLIBS_INSTALL_LIB_DIR}" - ) -- if(UNIX) -+ if(UNIX OR WIN32) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(includedir ${SHAREDLIBS_INSTALL_INC_DIR}) - set(libdir ${SHAREDLIBS_INSTALL_LIB_DIR}) diff --git a/mingw-w64-libluv/PKGBUILD b/mingw-w64-libluv/PKGBUILD index d284066f5b..73804e0aab 100644 --- a/mingw-w64-libluv/PKGBUILD +++ b/mingw-w64-libluv/PKGBUILD @@ -4,15 +4,13 @@ _realname=luv _pkgname=lib${_realname} pkgbase=mingw-w64-${_pkgname} pkgname="${MINGW_PACKAGE_PREFIX}-${_pkgname}" -_pkgver=1.42.0-1 -_compat53ver=0.10 +_pkgver=1.44.2-0 pkgver=${_pkgver/-/_} pkgrel=1 pkgdesc='Bare libuv bindings for lua (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url='https://github.com/luvit/luv' -_compat53url='https://github.com/keplerproject/lua-compat-5.3' license=('apache') depends=("${MINGW_PACKAGE_PREFIX}-luajit" "${MINGW_PACKAGE_PREFIX}-libuv") @@ -20,16 +18,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cc") options=('staticlibs' '!strip' '!buildflags') -source=("${_realname}-${_pkgver}.tar.gz"::"${url}/archive/${_pkgver}.tar.gz" - "lua-compat-5.3-${_compat53ver}.tar.gz"::"${_compat53url}/archive/v${_compat53ver}.tar.gz" - '001-luv-1.42.0-win-install.patch') -sha256sums=('a55563e6da9294ea26f77a2111598aa49188c5806b8bd1e1f4bdf402f340713e' - 'd1ed32f091856f6fffab06232da79c48b437afd4cd89e5c1fc85d7905b011430' - 'SKIP') +source=("${_realname}-${_pkgver}.tar.gz"::"${url}/releases/download/${_pkgver}/${_realname}-${_pkgver}.tar.gz") +sha256sums=('30639f8e0fac7fb0c3a04b94a00f73c6d218c15765347ceb0998a6b72464b6cf') + prepare() { cd "${srcdir}/${_realname}-${_pkgver}" - - patch -Np1 -i ${srcdir}/001-luv-1.42.0-win-install.patch } build() { @@ -45,16 +38,15 @@ build() { -DBUILD_MODULE=OFF \ -DWITH_SHARED_LIBUV=ON \ -DLUA_BUILD_TYPE=System \ - -DLUA_COMPAT53_DIR="${srcdir}/lua-compat-5.3-${_compat53ver}" \ ../${_realname}-${_pkgver} - cmake --build ./ + ${MINGW_PREFIX}/bin/cmake --build ./ } package() { cd "${srcdir}/build-${MSYSTEM}" - DESTDIR=${pkgdir} cmake --install ./ + DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install ./ install -Dm644 "${srcdir}/${_realname}-${_pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_pkgname}/LICENSE.txt" }