Mercurial > mxe-octave

diff src/pango.mk @ 4296:68c7e187e20d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pango: update to 1.40.3 * src/pango.mk: update version, checksum, configure opts * src/mingw-pango-1-fixes.patch: remove patch * dist-files: remove old patch file
author John D
date Mon, 26 Dec 2016 15:41:24 -0500
parents 13be64f9f16d
children b6819fef128f
line wrap: on
line diff
--- a/src/pango.mk	Mon Dec 26 15:41:20 2016 -0500
+++ b/src/pango.mk	Mon Dec 26 15:41:24 2016 -0500
@@ -3,12 +3,12 @@
 
 PKG             := pango
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.34.1
-$(PKG)_CHECKSUM := a6c224424eb3f0dcc231a8000591c05a85df689c
+$(PKG)_VERSION  := 1.40.3
+$(PKG)_CHECKSUM := 18db616204416936ef969e1c387b7a2f4e8b039b
 $(PKG)_SUBDIR   := pango-$($(PKG)_VERSION)
 $(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := fontconfig freetype cairo glib harfbuzz
+$(PKG)_DEPS     := fontconfig freetype cairo glib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://git.gnome.org/browse/pango/refs/tags' | \
@@ -18,23 +18,15 @@
 endef
 
 define $(PKG)_BUILD
-    if [ $(MXE_SYSTEM) = mingw ]; then \
-        rm '$(1)'/docs/Makefile.am && \
-        cd '$(1)' && NOCONFIGURE=1 ./autogen.sh; \
-    fi
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-gtk-doc \
-        --without-x \
-        --enable-explicit-deps \
-        --with-included-modules \
-        --without-dynamic-modules \
         CXX='$(MXE_CXX)' \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \
-        PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
+        PKG_CONFIG_PATH='$(PKG_CONFIG_PATH)' \
         && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' noinst_PROGRAMS=
-    $(MAKE) -C '$(1)' -j 1 install noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install noinst_PROGRAMS= DESTDIR='$(3)'
 endef