From 13fdaaaaf211cbb5079ccd9e809e249f6537b8d8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 3 Oct 2018 09:51:23 +0200 Subject: [PATCH] atk: Update to 2.30.0 and port to meson (#4501) --- mingw-w64-atk/PKGBUILD | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/mingw-w64-atk/PKGBUILD b/mingw-w64-atk/PKGBUILD index 6bf95984aa..b5ee12348b 100644 --- a/mingw-w64-atk/PKGBUILD +++ b/mingw-w64-atk/PKGBUILD @@ -4,52 +4,46 @@ _realname=atk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.28.1 +pkgver=2.30.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility (mingw-w64)" arch=('any') url="https://www.gtk.org/" license=(LGPL2) makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-gobject-introspection" - "${MINGW_PACKAGE_PREFIX}-gtk-doc" - "autoconf-archive") + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-gtk-doc" + "${MINGW_PACKAGE_PREFIX}-meson") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-glib2>=2.46.0") options=('strip' 'staticlibs') source=("https://download.gnome.org/sources/atk/${pkgver%.*}/${_realname}-${pkgver}.tar.xz") -sha256sums=('cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc') +sha256sums=('dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b') prepare() { cd "${srcdir}"/${_realname}-${pkgver} - #autoreconf -fi } build() { [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST} mkdir -p "${srcdir}"/build-${MINGW_CHOST} && cd "${srcdir}"/build-${MINGW_CHOST} - mkdir -p docs/html - cp -rf ../${_realname}-${pkgver}/docs/html/* docs/html + meson \ + -Ddocs=true \ + ../${_realname}-${pkgver} - "${srcdir}"/${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ - --build=${MINGW_CHOST} \ - --host=${MINGW_CHOST} \ - --enable-static \ - --enable-shared \ - --enable-introspection \ - --disable-glibtest \ - --without-libintl-prefix \ - --without-libiconv-prefix - - make + ninja } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install - find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm + + DESTDIR="${pkgdir}${MINGW_PREFIX}" ninja install + + for pcfile in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do + sed -s "s|$(cygpath -m ${MINGW_PREFIX})|${MINGW_PREFIX}|g" -i "${pcfile}" + done + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" }