diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2017-08-25 22:41:14 +0200 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2017-08-25 22:41:14 +0200 |
| commit | 1f94850a33ebc99e9174efccb585bf3a5153a876 (patch) | |
| tree | d746f8953e4fc53e02099b0cbeff35200054c93f /patches | |
| parent | ba199bd08e6bbe2602ba0bdff93ea171e16710eb (diff) | |
| download | midipix_build-1f94850a33ebc99e9174efccb585bf3a5153a876.tar.bz2 midipix_build-1f94850a33ebc99e9174efccb585bf3a5153a876.tar.xz | |
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.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/glib-2.46.2.local.patch | 11 | ||||
| -rw-r--r-- | patches/pango-1.40.11.local.patch | 51 |
2 files changed, 62 insertions, 0 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) |