From bd733487d324f6426083de92b6bbbb3e676ec58f Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 23 Oct 2018 13:58:20 +0300 Subject: [PATCH] unibilium: Update to 2.0.0 --- .../0001-unibilium-msys-makefile.patch | 21 ++++--------------- mingw-w64-unibilium/PKGBUILD | 20 +++++++++--------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/mingw-w64-unibilium/0001-unibilium-msys-makefile.patch b/mingw-w64-unibilium/0001-unibilium-msys-makefile.patch index 0be170554f..9e594bee07 100644 --- a/mingw-w64-unibilium/0001-unibilium-msys-makefile.patch +++ b/mingw-w64-unibilium/0001-unibilium-msys-makefile.patch @@ -3,29 +3,16 @@ index 35741ac..bb56037 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ - ifneq ($(wildcard .git),) -- -include maint.mk + ifneq ($(wildcard .maint),) +- include maint.mk + ifeq ($(OS),Windows_NT) -+ -include maint_windows.mk ++ include maint_windows.mk + else -+ -include maint.mk ++ include maint.mk + endif endif ifeq ($(shell uname),Darwin) -@@ -32,7 +36,11 @@ INCDIR=$(PREFIX)/include - MANDIR=$(PREFIX)/share/man - MAN3DIR=$(MANDIR)/man3 - --TERMINFO_DIRS="/etc/terminfo:/lib/terminfo:/usr/share/terminfo:/usr/lib/terminfo:/usr/local/share/terminfo:/usr/local/lib/terminfo" -+ifneq ($(OS),Windows_NT) -+ TERMINFO_DIRS="/etc/terminfo:/lib/terminfo:/usr/share/terminfo:/usr/lib/terminfo:/usr/local/share/terminfo:/usr/local/lib/terminfo" -+else -+ TERMINFO_DIRS="" -+endif - - POD2MAN=pod2man - POD2MAN_OPTS=-c "$(PACKAGE)" -s3 -r "$(PACKAGE)-$(PKG_VERSION)" diff --git a/maint_windows.mk b/maint_windows.mk new file mode 100644 index 0000000..6088278 diff --git a/mingw-w64-unibilium/PKGBUILD b/mingw-w64-unibilium/PKGBUILD index 9263cbf86d..99f6beaa1c 100644 --- a/mingw-w64-unibilium/PKGBUILD +++ b/mingw-w64-unibilium/PKGBUILD @@ -1,16 +1,16 @@ _realname=unibilium pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.2.0 +pkgver=2.0.0 pkgrel=1 -pkgdesc='A terminfo parsing library (mingw-w64)' +pkgdesc="A terminfo parsing library (mingw-w64)" arch=('any') url='https://github.com/mauke/unibilium/' license=(LGPL3) -source=("$_realname-$pkgver.tar.gz::https://github.com/mauke/unibilium/archive/v$pkgver.tar.gz" - "0001-unibilium-msys-makefile.patch") -sha1sums=("ed5150071bef1d1504fddbbe1c842ab47c1cbaec" - "4852cc0e4e3174e5b60d6d1e1d74d8d234a4ebf3") +source=("${_realname}-${pkgver}.tar.gz::https://github.com/mauke/unibilium/archive/v${pkgver}.tar.gz" + "0001-unibilium-msys-makefile.patch") +sha1sums=('bd6ddf0ae86405b95cd41432081219b2ab1b4b22' + 'aa77f324d698ac725490bbd6dfc7c986bc0cf275') prepare() { cd "${_realname}-${pkgver}" @@ -18,16 +18,16 @@ prepare() { } build() { - cd $_realname-$pkgver + cd ${_realname}-${pkgver} make PREFIX=${MINGW_PREFIX} } check() { - cd $_realname-$pkgver + cd ${_realname}-${pkgver} make test } package() { - cd $_realname-$pkgver - make install PREFIX=${MINGW_PREFIX} DESTDIR="$pkgdir" + cd ${_realname}-${pkgver} + make install PREFIX=${MINGW_PREFIX} DESTDIR="${pkgdir}" }