From 08752a2de6fc23edef8e7177561d5fd677fa5d2f Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sat, 17 Dec 2022 05:13:17 +0000 Subject: [PATCH] pystring: update to 1.1.4 --- mingw-w64-pystring/01-makefile.patch | 19 +++++++------------ mingw-w64-pystring/PKGBUILD | 16 ++++++++-------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/mingw-w64-pystring/01-makefile.patch b/mingw-w64-pystring/01-makefile.patch index e4c5f05a26..bd1e163659 100644 --- a/mingw-w64-pystring/01-makefile.patch +++ b/mingw-w64-pystring/01-makefile.patch @@ -1,18 +1,13 @@ ---- pystring-1.1.3/Makefile.orig 2019-07-30 20:39:11.924525000 +0300 -+++ pystring-1.1.3/Makefile 2019-07-30 20:39:17.322134500 +0300 -@@ -1,7 +1,9 @@ --LIBTOOL = libtool --LIBDIR = /usr/lib --CXX = g++ --CXXFLAGS = -g -O3 -Wall -Wextra -Wshadow -Wconversion -Wcast-qual -Wformat=2 -+LIBTOOL ?= libtool +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,7 @@ + LIBTOOL ?= libtool +-LIBDIR ?= /usr/lib +PREFIX ?= /usr +INCLUDEDIR = ${PREFIX}/include/pystring +LIBDIR = ${PREFIX}/lib -+CXX ?= g++ -+CXXFLAGS ?= -g -O3 -Wall -Wextra -Wshadow -Wconversion -Wcast-qual -Wformat=2 - - all: libpystring.la + CXX ?= g++ + CXXFLAGS ?= -g -O3 -Wall -Wextra -Wshadow -Wconversion -Wcast-qual -Wformat=2 @@ -12,7 +14,8 @@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $< -rpath $(LIBDIR) diff --git a/mingw-w64-pystring/PKGBUILD b/mingw-w64-pystring/PKGBUILD index 28ebc0a18b..33ba7d0c26 100644 --- a/mingw-w64-pystring/PKGBUILD +++ b/mingw-w64-pystring/PKGBUILD @@ -3,21 +3,21 @@ _realname=pystring pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.1.3 -pkgrel=2 +pkgver=1.1.4 +pkgrel=1 pkgdesc="A collection of C++ functions which match the interface and behavior of python's string class methods using std::string (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://github.com/imageworks/pystring" -license=('custom') +license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") options=('strip') source=(${_realname}-${pkgver}.tar.gz::https://github.com/imageworks/pystring/archive/v${pkgver}.tar.gz 01-makefile.patch) -sha256sums=('358a56e756e701836b69a31c75d3d9d41c34d447cf7b3775bbd5620dcd3203d9' - '9f210c79dbe0a87832747379161944c45996bfcd5091ee8c91d4180e8d4bcdec') +sha256sums=('49da0fe2a049340d3c45cce530df63a2278af936003642330287b68cefd788fb' + '35754393c734730664fb7686d463db7e0c05f59c3a9e51fc38c22ff177e2cfee') prepare() { cd ${_realname}-${pkgver} @@ -25,15 +25,15 @@ prepare() { } build() { - [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" - cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}" + cp -rf ${_realname}-${pkgver} build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM} make } package() { + cd build-${MSYSTEM} mkdir -p ${pkgdir}${MINGW_PREFIX}/{include/pystring,lib} - cd build-${MINGW_CHOST} make DESTDIR=${pkgdir} PREFIX=${MINGW_PREFIX} install install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }