vars/build.vars: adds pango v1.40.11.

patches/glib-2.46.2.local.patch: specify correct paths in glib-2.0.pc.in.
patches/pango-1.40.11.local.patch: merged from Redfoxmoon, provide weak pango_cairo_fc_font_map_get_type() stub.

3 files changed, 67 insertions, 1 deletions

diff --git a/patches/glib-2.46.2.local.patch b/patches/glib-2.46.2.local.patch
index 6b6809c6..0cd6e7c1 100644
--- a/patches/glib-2.46.2.local.patch
+++ b/patches/glib-2.46.2.local.patch
@@ -9,3 +9,14 @@
  am__objects_1 =
  am_libinotify_la_OBJECTS = libinotify_la-inotify-kernel.lo \
  	libinotify_la-inotify-sub.lo libinotify_la-inotify-path.lo \
+--- glib-2.46.2/glib-2.0.pc.in.orig	2015-03-23 04:22:18.000000000 +0100
++++ glib-2.46.2/glib-2.0.pc.in	2017-08-25 22:20:03.833998381 +0200
+@@ -5,7 +5,7 @@
+ 
+ glib_genmarshal=glib-genmarshal
+ gobject_query=gobject-query
+-glib_mkenums=glib-mkenums
++glib_mkenums=@prefix@/bin/glib-mkenums
+ 
+ Name: GLib
+ Description: C Utility Library
diff --git a/patches/pango-1.40.11.local.patch b/patches/pango-1.40.11.local.patch
new file mode 100644
index 00000000..30944118
--- /dev/null
+++ b/patches/pango-1.40.11.local.patch
@@ -0,0 +1,51 @@
+diff -ru pango-1.40.11.orig/configure pango-1.40.11/configure
+--- pango-1.40.11.orig/configure	2017-08-19 15:28:44.000000000 +0200
++++ pango-1.40.11/configure	2017-08-25 21:29:22.922827837 +0200
+@@ -19005,33 +19005,11 @@
+ fi
+ 
+ if $have_cairo ; then
+-  pango_save_libs=$LIBS
+-  LIBS="$LIBS $CAIRO_LIBS"
+-  pango_save_ldflags=$LDFLAGS
+-  LDFLAGS="$LDFLAGS $CAIRO_LIBS"
+-
+-  have_cairo=false
+-  cairo_font_backends=""
+-
+-  if $have_freetype; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-ft >= \$cairo_required\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "cairo-ft >= $cairo_required") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  have_cairo_freetype=true
+-else
+-  :
+-fi
+-  fi
+-  if $have_cairo_freetype; then
+ 
+ $as_echo "#define HAVE_CAIRO_FREETYPE 1" >>confdefs.h
+ 
+     cairo_font_backends="freetype $cairo_font_backends"
+     have_cairo=true
+-  fi
+ 
+   if $have_win32; then
+     if test -n "$PKG_CONFIG" && \
+
+--- pango-1.40.11/pango/pangocairo-fontmap.c.orig	2016-10-22 07:00:37.000000000 +0200
++++ pango-1.40.11/pango/pangocairo-fontmap.c	2017-08-25 22:30:01.766561892 +0200
+@@ -35,6 +35,10 @@
+ #  include "pangocairo-fc.h"
+ #endif
+ 
++PANGO_AVAILABLE_IN_ALL
++GType __attribute__((weak)) pango_cairo_fc_font_map_get_type (void) {
++	return NULL;
++}
+ 
+ typedef PangoCairoFontMapIface PangoCairoFontMapInterface;
+ G_DEFINE_INTERFACE (PangoCairoFontMap, pango_cairo_font_map, PANGO_TYPE_FONT_MAP)
diff --git a/vars/build.vars b/vars/build.vars
index 79acf30f..423a499b 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -259,7 +259,7 @@ libksba lua ncurses ncursestw ncursesw npth sqlite3 xz";
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext freetype fontconfig renderproto Xrender libXft libICE libSM libXt libXmu libXpm
-libXaw libxkbfile pixman cairo";
+libXaw libxkbfile pixman cairo pango";
 LIB_PACKAGES_PACKAGES_LIBS="
 cmake llvm_host";
 LIB_PACKAGES_PACKAGES="
@@ -499,6 +499,10 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CAIRO_URL:=http://cairographics.org/snapshots/cairo-${PKG_CAIRO_VERSION}.tar.xz};
 : ${PKG_CAIRO_SHA256SUM:=5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c};
 : ${PKG_CAIRO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
+: ${PKG_PANGO_VERSION:=1.40.11};
+: ${PKG_PANGO_SHA256SUM:=5b11140590e632739e4151cae06b8116160d59e22bf36a3ccd5df76d1cf0383e};
+: ${PKG_PANGO_URL:=http://ftp.gnome.org/pub/GNOME/sources/pango/${PKG_PANGO_VERSION%.*}/pango-${PKG_PANGO_VERSION}.tar.xz};
+: ${PKG_PANGO_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/freetype2};
 
 : ${PKG_CMAKE_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe};
 : ${PKG_CMAKE_VERSION:=3.6.3};