minor update and ported to meson build system

3 files changed, 19 insertions, 134 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96f46c85b04a..bcc8de363d4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-pango
 	pkgdesc = A library for layout and rendering of text (mingw-w64)
-	pkgver = 1.42.1
+	pkgver = 1.42.1+4+g5d46e21d
 	pkgrel = 1
 	url = http://www.pango.org
 	arch = any
@@ -8,6 +8,7 @@ pkgbase = mingw-w64-pango
 	makedepends = mingw-w64-configure
 	makedepends = gtk-doc
 	makedepends = gobject-introspection
+	makedepends = mingw-w64-meson
 	makedepends = git
 	depends = mingw-w64-harfbuzz
 	depends = mingw-w64-fribidi
@@ -17,10 +18,8 @@ pkgbase = mingw-w64-pango
 	options = !strip
 	options = staticlibs
 	options = !buildflags
-	source = git+https://git.gnome.org/browse/pango#commit=46f8583c87c45b304ac98d06005c49df67d53b07
-	source = 0001-no-unconditional-xft-please.all.patch
+	source = git+https://git.gnome.org/browse/pango#commit=5d46e21df66a11233186ddf27ca8c70149307871
 	sha256sums = SKIP
-	sha256sums = bebab6128258d300e677df0751177f5c30235d0a49c150d97987d0f00b309f35
 
 pkgname = mingw-w64-pango
 
diff --git a/0001-no-unconditional-xft-please.all.patch b/0001-no-unconditional-xft-please.all.patch
deleted file mode 100644
index 40ee76828563..000000000000
--- a/0001-no-unconditional-xft-please.all.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- pango-1.30.0/docs/pango.types.in.orig	2012-04-03 09:28:11 +0400
-+++ pango-1.30.0/docs/pango.types.in	2012-04-03 09:27:43 +0400
-@@ -0,0 +1,77 @@
-+#include <pango/pango-attributes.h>
-+#include <pango/pango-context.h>
-+#include <pango/pango-engine.h>
-+#include <pango/pango-enum-types.h>
-+#include <pango/pango-font.h>
-+#include <pango/pango-fontmap.h>
-+#include <pango/pango-fontset.h>
-+#include <pango/pango-glyph-item.h>
-+#include <pango/pango-glyph.h>
-+#include <pango/pango-item.h>
-+#include <pango/pango-language.h>
-+#include <pango/pango-layout.h>
-+#include <pango/pango-matrix.h>
-+#include <pango/pango-ot.h>
-+#include <pango/pango-renderer.h>
-+#include <pango/pango-tabs.h>
-+#include <pango/pangocairo-fc.h>
-+#include <pango/pangocairo.h>
-+#include <pango/pangofc-decoder.h>
-+#include <pango/pangofc-font.h>
-+#include <pango/pangofc-fontmap.h>
-+#include <pango/pangoft2.h>
-+@PANGO_INCLUDE_XFT@
-+
-+pango_alignment_get_type
-+pango_attr_list_get_type
-+pango_attr_type_get_type
-+pango_bidi_type_get_type
-+pango_cairo_fc_font_map_get_type
-+pango_cairo_font_get_type
-+pango_cairo_font_map_get_type
-+pango_color_get_type
-+pango_context_get_type
-+pango_coverage_level_get_type
-+pango_direction_get_type
-+pango_ellipsize_mode_get_type
-+pango_engine_get_type
-+pango_engine_lang_get_type
-+pango_engine_shape_get_type
-+pango_fc_decoder_get_type
-+pango_fc_font_get_type
-+pango_fc_font_map_get_type
-+pango_font_description_get_type
-+pango_font_face_get_type
-+pango_font_family_get_type
-+pango_font_get_type
-+pango_font_map_get_type
-+pango_font_mask_get_type
-+pango_font_metrics_get_type
-+pango_fontset_get_type
-+pango_fontset_simple_get_type
-+pango_ft2_font_map_get_type
-+pango_glyph_item_get_type
-+pango_glyph_item_iter_get_type
-+pango_glyph_string_get_type
-+pango_gravity_get_type
-+pango_gravity_hint_get_type
-+pango_item_get_type
-+pango_language_get_type
-+pango_layout_get_type
-+pango_layout_iter_get_type
-+pango_layout_line_get_type
-+pango_matrix_get_type
-+pango_ot_info_get_type
-+pango_ot_ruleset_get_type
-+pango_render_part_get_type
-+pango_renderer_get_type
-+pango_script_get_type
-+pango_stretch_get_type
-+pango_style_get_type
-+pango_tab_align_get_type
-+pango_tab_array_get_type
-+pango_underline_get_type
-+pango_variant_get_type
-+pango_weight_get_type
-+pango_wrap_mode_get_type
-+@PANGO_XFT_TYPES@
-\ No newline at end of file
---- pango-1.32.6/configure.ac.orig	2013-01-19 18:11:30 +0400
-+++ pango-1.32.6/configure.ac	2013-01-19 18:13:05 +0400
-@@ -257,6 +257,8 @@
- # Checks for Xft/XRender
- #
- have_xft=false
-+pango_include_xft=
-+pango_xft_types=
- AC_ARG_WITH(xft,
-   AS_HELP_STRING([--with-xft], [build xft backend]),
-   [], [with_xft=yes])
-@@ -265,8 +267,15 @@
- fi
- if test "x$with_xft" = xyes && $have_xft ; then
-   AC_DEFINE(HAVE_XFT, 1, [Have Xft library])
-+  pango_include_xft="#include <pango/pangoxft-render.h>
-+#include <pango/pangoxft.h>"
-+  psnho_xft_types="pango_xft_font_get_type
-+pango_xft_font_map_get_type
-+pango_xft_renderer_get_type"
- fi
- AM_CONDITIONAL(HAVE_XFT, test "x$with_xft" = xyes && $have_xft )
-+AC_SUBST(PANGO_INCLUDE_XFT, $pango_include_xft)
-+AC_SUBST(PANGO_XFT_TYPES, $pango_xft_types)
- 
- #
- # Checks for Win32 GDI
-@@ -935,6 +944,7 @@
- win32/vs12/Makefile
- win32/vs14/Makefile
- win32/vs15/Makefile
-+docs/pango.types
- pango.pc
- pangowin32.pc
- pangoft2.pc
diff --git a/PKGBUILD b/PKGBUILD
index bf9f2208fef7..981a3faf645c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: pingplug <pingplug@foxmail.com>
 # Contributor: Schala Zeal <schalaalexiazeal@gmail.com>
 
-_commit=46f8583c87c45b304ac98d06005c49df67d53b07  # tags/1.42.1^0
+_commit=5d46e21df66a11233186ddf27ca8c70149307871  # after a bug fix
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-pango
-pkgver=1.42.1
+pkgver=1.42.1+4+g5d46e21d
 pkgrel=1
 pkgdesc="A library for layout and rendering of text (mingw-w64)"
 arch=('any')
@@ -19,12 +19,11 @@ depends=('mingw-w64-harfbuzz'
 makedepends=('mingw-w64-configure'
              'gtk-doc'
              'gobject-introspection'
+             'mingw-w64-meson'
              'git')
 options=('!strip' 'staticlibs' '!buildflags')
-source=("git+https://git.gnome.org/browse/pango#commit=${_commit}"
-        "0001-no-unconditional-xft-please.all.patch")
-sha256sums=('SKIP'
-            'bebab6128258d300e677df0751177f5c30235d0a49c150d97987d0f00b309f35')
+source=("git+https://git.gnome.org/browse/pango#commit=${_commit}")
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/pango"
@@ -33,19 +32,20 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/pango"
-  patch -p1 -i ${srcdir}/0001-no-unconditional-xft-please.all.patch
-  NOCONFIGURE=1 ./autogen.sh
-  sed -i 's/have_libthai=true/have_libthai=false/' configure
+
 }
 
 build() {
   cd "${srcdir}/pango"
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-configure \
-      --disable-introspection \
-      --disable-debug
-    make
+    ${_arch}-meson \
+      --buildtype=release \
+      --default-library=both \
+      -D 'enable_docs=false' \
+      -D 'gir=false' \
+      ..
+    ninja
     popd
   done
 }
@@ -53,7 +53,9 @@ build() {
 package() {
   for _arch in ${_architectures}; do
     cd "${srcdir}/pango/build-${_arch}"
-    make -j1 DESTDIR="${pkgdir}" install
+    DESTDIR="${pkgdir}" ninja install
+    rm -r "${pkgdir}/usr/${_arch}/lib/installed-tests"
+    rm -r "${pkgdir}/usr/${_arch}/share"
     find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
     find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
     find "${pkgdir}/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g