diff --git a/mingw-w64-pango/0001-no-unconditional-xft-please.all.patch b/mingw-w64-pango/0001-no-unconditional-xft-please.all.patch index cf21a81550..0805faa939 100644 --- a/mingw-w64-pango/0001-no-unconditional-xft-please.all.patch +++ b/mingw-w64-pango/0001-no-unconditional-xft-please.all.patch @@ -107,9 +107,9 @@ # # Checks for Win32 GDI @@ -935,6 +944,7 @@ - build/win32/Makefile - build/win32/vs9/Makefile build/win32/vs10/Makefile + build/win32/vs11/Makefile + build/win32/vs12/Makefile +docs/pango.types pango.pc pangowin32.pc diff --git a/mingw-w64-pango/0006-give-cc-to-gir-scanner.mingw.patch b/mingw-w64-pango/0006-give-cc-to-gir-scanner.mingw.patch deleted file mode 100644 index a8f0ec591e..0000000000 --- a/mingw-w64-pango/0006-give-cc-to-gir-scanner.mingw.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- pango-1.34.1/pango/Makefile.am.orig 2013-03-05 01:24:38.000000000 +0000 -+++ pango-1.34.1/pango/Makefile.am 2013-07-27 20:34:48.190291500 +0000 -@@ -9,6 +9,7 @@ - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) --add-include-path=. - INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=. -+INTROSPECTION_SCANNER_ENV = CC="$(CC)" - - SUBDIRS = mini-fribidi - diff --git a/mingw-w64-pango/0007-include-freetype.mingw.patch b/mingw-w64-pango/0007-include-freetype.mingw.patch deleted file mode 100644 index 627c3d1412..0000000000 --- a/mingw-w64-pango/0007-include-freetype.mingw.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pango-1.34.1/pango/Makefile.am.orig 2013-07-27 20:42:47.606669700 +0000 -+++ pango-1.34.1/pango/Makefile.am 2013-07-27 21:12:46.904651500 +0000 -@@ -230,7 +230,7 @@ - PangoFT2_1_0_gir_EXPORT_PACKAGES = pangoft2 - PangoFT2_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 freetype2-2.0 fontconfig-2.0 - PangoFT2_1_0_gir_LIBS = $(Pango_1_0_gir_LIBS) libpangoft2-1.0.la --PangoFT2_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -+PangoFT2_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(FREETYPE_CFLAGS) - PangoFT2_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include "pango/pangoft2.h" - PangoFT2_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoft2_introspection_files))) - -@@ -371,7 +371,7 @@ - PangoCairo_1_0_gir_EXPORT_PACKAGES = pangocairo - PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 - PangoCairo_1_0_gir_LIBS = $(Pango_1_0_gir_LIBS) libpangocairo-1.0.la --PangoCairo_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) -+PangoCairo_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS) - PangoCairo_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include "pango/pangocairo.h" - if HAVE_CAIRO_FREETYPE - PangoCairo_1_0_gir_SCANNERFLAGS += --include-uninstalled=$(builddir)/$(PANGOCAIRO_FONT_BACKEND_GI_MODULE) diff --git a/mingw-w64-pango/0008-allow-backend-selection.mingw.patch b/mingw-w64-pango/0008-allow-backend-selection.mingw.patch deleted file mode 100644 index 064f8090ba..0000000000 --- a/mingw-w64-pango/0008-allow-backend-selection.mingw.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- pango-1.36.2/pango/pangocairo-fontmap.c.orig 2013-10-04 21:34:33.000000000 +0000 -+++ pango-1.36.2/pango/pangocairo-fontmap.c 2014-02-08 02:25:22.257663500 +0000 -@@ -66,10 +66,27 @@ - PangoFontMap * - pango_cairo_font_map_new (void) - { -+ const char *env_backend; - #if !GLIB_CHECK_VERSION (2, 35, 3) - /* Make sure that the type system is initialized */ - g_type_init (); - #endif -+ env_backend = getenv ("PANGOCAIRO_BACKEND"); -+ if (NULL != env_backend) -+ { -+#if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ) -+ if (0 == strcmp (env_backend, "quartz")) -+ return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL); -+#endif -+#if defined(HAVE_CAIRO_WIN32) -+ if (0 == strcmp (env_backend, "win32")) -+ return g_object_new (PANGO_TYPE_CAIRO_WIN32_FONT_MAP, NULL); -+#endif -+#if defined(HAVE_CAIRO_FREETYPE) -+ if (0 == strcmp (env_backend, "fontconfig")) -+ return g_object_new (PANGO_TYPE_CAIRO_FC_FONT_MAP, NULL); -+#endif -+ } - #if defined(HAVE_CORE_TEXT) && defined (HAVE_CAIRO_QUARTZ) - return g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT_MAP, NULL); - #elif defined(HAVE_CAIRO_WIN32) diff --git a/mingw-w64-pango/0009-pango_enable_static_build.patch b/mingw-w64-pango/0009-pango_enable_static_build.patch deleted file mode 100644 index 4e6ca84cc2..0000000000 --- a/mingw-w64-pango/0009-pango_enable_static_build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac 2011-06-20 22:39:08.377416539 +0200 -+++ b/configure.ac 2011-06-20 22:40:46.959037254 +0200 -@@ -145,17 +145,6 @@ - AC_LIBTOOL_WIN32_DLL - AM_DISABLE_STATIC - --if test "$pango_os_win32" = "yes"; then -- if test x$enable_static = xyes -o x$enable_static = x; then -- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) -- enable_static=no -- fi -- if test x$enable_shared = xno; then -- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) -- fi -- enable_shared=yes --fi -- - AM_PROG_LIBTOOL - dnl when using libtool 2.x create libtool early, because it's used in configure - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) diff --git a/mingw-w64-pango/0010-pangocairo-gir-add-cairo.patch b/mingw-w64-pango/0010-pangocairo-gir-add-cairo.patch deleted file mode 100644 index 385fac3ce0..0000000000 --- a/mingw-w64-pango/0010-pangocairo-gir-add-cairo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pango-1.36.2/pango/Makefile.am.orig 2014-02-24 08:41:05.374400000 +0400 -+++ pango-1.36.2/pango/Makefile.am 2014-02-24 08:52:49.792400000 +0400 -@@ -371,7 +371,7 @@ - PangoCairo_1_0_gir_EXPORT_PACKAGES = pangocairo - PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 - PangoCairo_1_0_gir_LIBS = $(Pango_1_0_gir_LIBS) libpangocairo-1.0.la --PangoCairo_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS) -+PangoCairo_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS) $(CAIRO_CFLAGS) - PangoCairo_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include "pango/pangocairo.h" - if HAVE_CAIRO_FREETYPE - PangoCairo_1_0_gir_SCANNERFLAGS += --include-uninstalled=$(builddir)/$(PANGOCAIRO_FONT_BACKEND_GI_MODULE) diff --git a/mingw-w64-pango/PKGBUILD b/mingw-w64-pango/PKGBUILD index bb0060e4f9..e730535d55 100644 --- a/mingw-w64-pango/PKGBUILD +++ b/mingw-w64-pango/PKGBUILD @@ -3,54 +3,39 @@ _realname=pango pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.36.5 +pkgver=1.36.6 pkgrel=1 pkgdesc="A library for layout and rendering of text (mingw-w64)" arch=(any) url="http://www.pango.org" license=("LGPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-gobject-introspection") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-gobject-introspection") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-freetype" - "${MINGW_PACKAGE_PREFIX}-fontconfig" - "${MINGW_PACKAGE_PREFIX}-cairo" - "${MINGW_PACKAGE_PREFIX}-glib2" - "${MINGW_PACKAGE_PREFIX}-harfbuzz" ) + "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-fontconfig" + "${MINGW_PACKAGE_PREFIX}-cairo" + "${MINGW_PACKAGE_PREFIX}-glib2" + "${MINGW_PACKAGE_PREFIX}-harfbuzz") options=('staticlibs' 'strip') source=("http://ftp.gnome.org/pub/gnome/sources/pango/${pkgver:0:4}/pango-${pkgver}.tar.xz" - 0001-no-unconditional-xft-please.all.patch - 0002-msvc-is-impotent-but-not.mingw.patch - 0006-give-cc-to-gir-scanner.mingw.patch - 0007-include-freetype.mingw.patch - 0008-allow-backend-selection.mingw.patch - 0009-pango_enable_static_build.patch - 0010-pangocairo-gir-add-cairo.patch) -sha256sums=('be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8' - '64e32bbf328cea85a4ea0a8552422eb74d4511f7655f19943302432ee67f36dc' - '240d21474157c0deabc2660593ac0414565ddf30c304b08b74a09072c910b34d' - 'bb8bb6658ad71423aa2c94fdfec661406ee5a78909046a36136847a6ee1c9ac3' - '7ad69d48bebd2640970ce7638a9d1b7f405816b70f914f3b544adf4da9b99dc5' - '6afc8db8f19a043e569800137b985d4624029b3cb00ce4dbda02e656b1aa9885' - '6bfe1e23894eb772f884e63b862935ddf53926f63e836af8712185415a0d27d9' - '6cf99bc0a2fd44962a8a0152fff7f82c0b45d4fb2d3bb00a254b59f2c4f59d62') + 0001-no-unconditional-xft-please.all.patch + 0002-msvc-is-impotent-but-not.mingw.patch) +sha256sums=('4c53c752823723875078b91340f32136aadb99e91c0f6483f024f978a02c8624' + 'a673ce807b29abe4b0fedf5b17e154986d675cec3e001c4235067b01515c2e4d' + '240d21474157c0deabc2660593ac0414565ddf30c304b08b74a09072c910b34d') prepare() { cd "$srcdir/pango-$pkgver" patch -p1 -i ${srcdir}/0001-no-unconditional-xft-please.all.patch patch -p1 -i ${srcdir}/0002-msvc-is-impotent-but-not.mingw.patch - patch -p1 -i ${srcdir}/0006-give-cc-to-gir-scanner.mingw.patch - patch -p1 -i ${srcdir}/0007-include-freetype.mingw.patch - patch -p1 -i ${srcdir}/0008-allow-backend-selection.mingw.patch - patch -p1 -i ${srcdir}/0009-pango_enable_static_build.patch - patch -p1 -i ${srcdir}/0010-pangocairo-gir-add-cairo.patch autoreconf -fi sed -i 's/have_libthai=true/have_libthai=false/' configure } build() { - CFLAGS+=" -mms-bitfields -I${MINGW_PREFIX}/include/cairo" - CXXFLAGS+=" -mms-bitfields" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" "${srcdir}"/${_realname}-${pkgver}/configure \