summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--.gitignore2
-rw-r--r--0001-no-unconditional-xft-please.all.patch116
-rw-r--r--PKGBUILD27
4 files changed, 23 insertions, 135 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a7fddc9de9..c89ad853ec1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
# Generated by mksrcinfo v8
-# Wed Sep 28 23:17:27 UTC 2016
+# Tue Feb 28 02:17:01 UTC 2017
pkgbase = mingw-w64-pango
pkgdesc = A library for layout and rendering of text (mingw-w64)
- pkgver = 1.40.3
- pkgrel = 2
+ pkgver = 1.40.4
+ pkgrel = 1
url = http://www.pango.org
arch = any
license = LGPL
makedepends = mingw-w64-configure
makedepends = gtk-doc
+ makedepends = git
depends = mingw-w64-harfbuzz
depends = mingw-w64-cairo
options = staticlibs
options = !strip
options = !buildflags
options = !emptydirs
- source = http://ftp.gnome.org/pub/gnome/sources/pango/1.40/pango-1.40.3.tar.xz
- source = 0001-no-unconditional-xft-please.all.patch
- sha256sums = abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3
- sha256sums = eccc044bbd156b252f5a13f7894c3a6cd1efc6ea80eaee57a5865895b192616d
+ source = git+https://git.gnome.org/browse/pango#commit=43b9668ba688b01553abb7b453aeb206d7fd56fa
+ sha256sums = SKIP
pkgname = mingw-w64-pango
diff --git a/.gitignore b/.gitignore
index 436a5947778..15e0732b545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+pango/
pkg/
src/
+*.log
*.tar
*.xz
diff --git a/0001-no-unconditional-xft-please.all.patch b/0001-no-unconditional-xft-please.all.patch
deleted file mode 100644
index 9c6b81da83a..00000000000
--- 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 @@
- build/win32/vs11/Makefile
- build/win32/vs12/Makefile
- build/win32/vs14/Makefile
-+docs/pango.types
- pango.pc
- pangowin32.pc
- pangoft2.pc
diff --git a/PKGBUILD b/PKGBUILD
index 51c0afc34fb..df918305851 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,31 @@
pkgname=mingw-w64-pango
-pkgver=1.40.3
-pkgrel=2
+pkgver=1.40.4
+pkgrel=1
+_commit=43b9668ba688b01553abb7b453aeb206d7fd56fa
pkgdesc="A library for layout and rendering of text (mingw-w64)"
arch=(any)
url="http://www.pango.org"
license=("LGPL")
-makedepends=(mingw-w64-configure gtk-doc)
+makedepends=(mingw-w64-configure gtk-doc git)
depends=(mingw-w64-harfbuzz mingw-w64-cairo)
options=(staticlibs !strip !buildflags !emptydirs)
-source=("http://ftp.gnome.org/pub/gnome/sources/pango/${pkgver:0:4}/pango-${pkgver}.tar.xz"
-"0001-no-unconditional-xft-please.all.patch")
-sha256sums=('abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3'
- 'eccc044bbd156b252f5a13f7894c3a6cd1efc6ea80eaee57a5865895b192616d')
+source=("git+https://git.gnome.org/browse/pango#commit=$_commit")
+sha256sums=('SKIP')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+pkgver() {
+ cd "$srcdir/pango"
+ git describe --tags | sed 's/-/+/g'
+}
+
prepare() {
- cd "$srcdir/pango-$pkgver"
- patch -p1 -i ${srcdir}/0001-no-unconditional-xft-please.all.patch
- autoreconf -fi
+ cd "$srcdir/pango"
+ NOCONFIGURE=1 ./autogen.sh
sed -i 's/have_libthai=true/have_libthai=false/' configure
}
build() {
- cd pango-$pkgver
+ cd "$srcdir/pango"
for _arch in ${_architectures}; do
mkdir -p build-${_arch} && pushd build-${_arch}
${_arch}-configure \
@@ -37,7 +40,7 @@ build() {
package() {
for _arch in ${_architectures}; do
- cd "${srcdir}/pango-${pkgver}/build-${_arch}"
+ cd "${srcdir}/pango/build-${_arch}"
make -j1 DESTDIR="$pkgdir" install
find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;