From cdf081de312f947a5d745175a36f29d6ecae958d Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Fri, 23 Sep 2016 09:31:02 +0200 Subject: [PATCH] pango: updated to 1.40.3. --- .../0002-msvc-is-impotent-but-not.mingw.patch | 13 ------------- mingw-w64-pango/PKGBUILD | 17 +++++++++-------- 2 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 mingw-w64-pango/0002-msvc-is-impotent-but-not.mingw.patch diff --git a/mingw-w64-pango/0002-msvc-is-impotent-but-not.mingw.patch b/mingw-w64-pango/0002-msvc-is-impotent-but-not.mingw.patch deleted file mode 100644 index 710feaeb89..0000000000 --- a/mingw-w64-pango/0002-msvc-is-impotent-but-not.mingw.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- pango-1.30.0/pango/pangocairo.def.orig 2011-08-16 05:11:08 +0400 -+++ pango-1.30.0/pango/pangocairo.def 2012-04-03 10:07:15 +0400 -@@ -8,8 +8,8 @@ - pango_cairo_create_context - pango_cairo_create_layout - pango_cairo_error_underline_path --; pango_cairo_fc_font_get_type --; pango_cairo_fc_font_map_get_type -+ pango_cairo_fc_font_get_type -+ pango_cairo_fc_font_map_get_type - pango_cairo_font_get_type - pango_cairo_font_get_scaled_font - pango_cairo_font_map_create_context diff --git a/mingw-w64-pango/PKGBUILD b/mingw-w64-pango/PKGBUILD index 84963a9196..07bb9575bf 100644 --- a/mingw-w64-pango/PKGBUILD +++ b/mingw-w64-pango/PKGBUILD @@ -4,8 +4,8 @@ _realname=pango pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.40.1 -pkgrel=2 +pkgver=1.40.3 +pkgrel=1 pkgdesc="A library for layout and rendering of text (mingw-w64)" arch=('any') url="http://www.pango.org" @@ -30,16 +30,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-harfbuzz") options=('staticlibs' 'strip' 'emptydirs') source=("https://download.gnome.org/sources/pango/${pkgver:0:4}/${_realname}-${pkgver}.tar.xz" - 0001-no-unconditional-xft-please.all.patch - 0002-msvc-is-impotent-but-not.mingw.patch) -sha256sums=('e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40' - 'eccc044bbd156b252f5a13f7894c3a6cd1efc6ea80eaee57a5865895b192616d' - '240d21474157c0deabc2660593ac0414565ddf30c304b08b74a09072c910b34d') + 0001-no-unconditional-xft-please.all.patch) +sha256sums=('abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3' + 'eccc044bbd156b252f5a13f7894c3a6cd1efc6ea80eaee57a5865895b192616d') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i ${srcdir}/0001-no-unconditional-xft-please.all.patch - patch -p1 -i ${srcdir}/0002-msvc-is-impotent-but-not.mingw.patch autoreconf -fi sed -i 's/have_libthai=true/have_libthai=false/' configure @@ -48,6 +45,10 @@ prepare() { 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 + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \