libunistring: update to 1.0
* Remove fix-pointer-casts.patch file. * Add pgp key to validate source tarball.
This commit is contained in:
@@ -3,8 +3,8 @@
|
||||
_realname=libunistring
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=0.9.10
|
||||
pkgrel=4
|
||||
pkgver=1.0
|
||||
pkgrel=1
|
||||
pkgdesc="Library for manipulating Unicode strings and C strings. (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
|
||||
@@ -13,21 +13,20 @@ license=('LGPL' 'GPL3')
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-libiconv")
|
||||
options=('staticlibs' 'strip')
|
||||
source=("https://ftp.gnu.org/gnu/libunistring/${_realname}-${pkgver}.tar.gz"
|
||||
fix-pointer-casts.patch)
|
||||
sha256sums=('a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b'
|
||||
'77ae425f982b61ae69c53f689f90a0a57706be73298acb1df61cca74855edf69')
|
||||
source=("https://ftp.gnu.org/gnu/libunistring/${_realname}-${pkgver}.tar.gz"{,.sig})
|
||||
sha256sums=('3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544'
|
||||
'SKIP')
|
||||
validpgpkeys=('9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development) <bruno@clisp.org>
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/libunistring-${pkgver}
|
||||
patch -Nbp1 -i ${srcdir}/fix-pointer-casts.patch
|
||||
autoreconf -fiv
|
||||
}
|
||||
|
||||
build() {
|
||||
#export lt_cv_deplibs_check_method='pass_all'
|
||||
[[ -d "${srcdir}/build-static-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-static-${MINGW_CHOST}"
|
||||
mkdir -p "${srcdir}/build-static-${MINGW_CHOST}" && cd "${srcdir}/build-static-${MINGW_CHOST}"
|
||||
[[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}"
|
||||
mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
|
||||
../libunistring-${pkgver}/configure \
|
||||
--prefix=${MINGW_PREFIX} \
|
||||
--build=${MINGW_CHOST} \
|
||||
@@ -37,8 +36,8 @@ build() {
|
||||
|
||||
make
|
||||
|
||||
[[ -d "${srcdir}/build-shared-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-shared-${MINGW_CHOST}"
|
||||
mkdir -p "${srcdir}/build-shared-${MINGW_CHOST}" && cd "${srcdir}/build-shared-${MINGW_CHOST}"
|
||||
[[ -d "${srcdir}/build-shared-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-shared-${MSYSTEM}"
|
||||
mkdir -p "${srcdir}/build-shared-${MSYSTEM}" && cd "${srcdir}/build-shared-${MSYSTEM}"
|
||||
../libunistring-${pkgver}/configure \
|
||||
--prefix=${MINGW_PREFIX} \
|
||||
--build=${MINGW_CHOST} \
|
||||
@@ -50,10 +49,10 @@ build() {
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/build-static-${MINGW_CHOST}"
|
||||
cd "${srcdir}/build-static-${MSYSTEM}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
cd "${srcdir}/build-shared-${MINGW_CHOST}"
|
||||
cd "${srcdir}/build-shared-${MSYSTEM}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
--- libunistring-0.9.9/lib/unictype/joininggroup_name.c.orig 2018-04-30 15:17:10.646207300 -0400
|
||||
+++ libunistring-0.9.9/lib/unictype/joininggroup_name.c 2018-04-30 15:28:06.447600200 -0400
|
||||
@@ -49,7 +49,12 @@ static const struct joining_group_string
|
||||
|
||||
static const int joining_group_index[] =
|
||||
{
|
||||
-#define ELEM(tag,string) (int)(long)&((struct joining_group_stringpool_t *)0)->tag,
|
||||
+
|
||||
+#ifdef _WIN32
|
||||
+#define ELEM(tag,string) (intptr_t)&((struct joining_group_stringpool_t *)0)->tag,
|
||||
+#else
|
||||
+#define ELEM(tag,string) (int)(long)&((struct joining_group_stringpool_t *)0)->tag,
|
||||
+#endif
|
||||
#include "unictype/joininggroup_name.h"
|
||||
#undef ELEM
|
||||
};
|
||||
Reference in New Issue
Block a user