diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-no-unconditional-xft-please.all.patch | 116 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
3 files changed, 128 insertions, 7 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Feb 28 02:17:01 UTC 2017 +# Wed May 24 22:02:19 UTC 2017 pkgbase = mingw-w64-pango pkgdesc = A library for layout and rendering of text (mingw-w64) - pkgver = 1.40.4 + pkgver = 1.40.6+6+g6f59d0f3 pkgrel = 1 url = http://www.pango.org arch = any @@ -16,8 +16,10 @@ pkgbase = mingw-w64-pango options = !strip options = !buildflags options = !emptydirs - source = git+https://git.gnome.org/browse/pango#commit=43b9668ba688b01553abb7b453aeb206d7fd56fa + source = git+https://git.gnome.org/browse/pango#commit=6f59d0f387dd62f12a7107e898064c7e42159945 + source = 0001-no-unconditional-xft-please.all.patch 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 new file mode 100644 index 00000000000..40ee7682856 --- /dev/null +++ b/0001-no-unconditional-xft-please.all.patch @@ -0,0 +1,116 @@ +--- 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 @@ -1,7 +1,7 @@ pkgname=mingw-w64-pango -pkgver=1.40.4 +pkgver=1.40.6+6+g6f59d0f3 pkgrel=1 -_commit=43b9668ba688b01553abb7b453aeb206d7fd56fa +_commit=6f59d0f387dd62f12a7107e898064c7e42159945 # master pkgdesc="A library for layout and rendering of text (mingw-w64)" arch=(any) url="http://www.pango.org" @@ -9,8 +9,10 @@ license=("LGPL") makedepends=(mingw-w64-configure gtk-doc git) depends=(mingw-w64-harfbuzz mingw-w64-cairo) options=(staticlibs !strip !buildflags !emptydirs) -source=("git+https://git.gnome.org/browse/pango#commit=$_commit") -sha256sums=('SKIP') +source=("git+https://git.gnome.org/browse/pango#commit=$_commit" +"0001-no-unconditional-xft-please.all.patch") +sha256sums=('SKIP' + 'bebab6128258d300e677df0751177f5c30235d0a49c150d97987d0f00b309f35') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" pkgver() { @@ -20,6 +22,7 @@ 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 } |