Re: [ptxdist] [PATCH] pango: version bump 1.29.4 -> 1.40.6

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Tue, Jun 06, 2017 at 04:36:39PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

FYI: I've not merged this patch yet because it breaks building gtk. That's
a bug in gtk that's probably fixed in a newer version.
We either need to update that package or move it to staging.
Staging is probably ok. It's currently a rather old version. If someone
cares, then they can update it and move it back. That's what staging is for
after all.

Michael

> ---
>  rules/pango.in   | 44 +-------------------------------------------
>  rules/pango.make | 32 +++++++++++---------------------
>  2 files changed, 12 insertions(+), 64 deletions(-)
> 
> diff --git a/rules/pango.in b/rules/pango.in
> index f9c4810b3..e9061a973 100644
> --- a/rules/pango.in
> +++ b/rules/pango.in
> @@ -9,7 +9,7 @@ menuconfig PANGO
>  	select GOBJECT_INTROSPECTION	if PANGO_INTROSPECTION
>  	select CAIRO_GOBJECT		if PANGO_INTROSPECTION
>  	select GLIB
> -	select WINE if PANGO__WINE
> +	select HARFBUZZ
>  
>  if PANGO
>  
> @@ -21,46 +21,4 @@ config PANGO_TARGET_X11
>  	bool
>  	default GTK_TARGET_X11
>  
> -
> -config PANGO__WINE
> -	bool "extra dep for MINGW"
> -
> -
> -config PANGO_ARABIC
> -	bool
> -	prompt "arabic"
> -
> -config PANGO_BASIC
> -	bool
> -	default y
> -	prompt "basic"
> -
> -config PANGO_HANGUL
> -	bool
> -	prompt "hangul"
> -
> -config PANGO_HEBREW
> -	bool
> -	prompt "hebrew"
> -
> -config PANGO_INDIC
> -	bool
> -	prompt "indic"
> -
> -config PANGO_KHMER
> -	bool
> -	prompt "khmer"
> -
> -config PANGO_SYRIAC
> -	bool
> -	prompt "syriac"
> -
> -config PANGO_THAI
> -	bool
> -	prompt "thai"
> -
> -config PANGO_TIBETAN
> -	bool
> -	prompt "tibetan"
> -
>  endif
> diff --git a/rules/pango.make b/rules/pango.make
> index 515a361e5..d30515e7c 100644
> --- a/rules/pango.make
> +++ b/rules/pango.make
> @@ -18,11 +18,11 @@ PACKAGES-$(PTXCONF_PANGO) += pango
>  #
>  # Paths and names
>  #
> -PANGO_VERSION	:= 1.29.4
> -PANGO_MD5	:= a5ee785f4f31d6bdd8625a09ea3f8b4b
> +PANGO_VERSION	:= 1.40.6
> +PANGO_MD5	:= 507c6746fbf53fc9d48c577f1e265de3
>  PANGO		:= pango-$(PANGO_VERSION)
> -PANGO_SUFFIX	:= tar.bz2
> -PANGO_URL	:= http://ftp.gnome.org/pub/GNOME/sources/pango/1.29/$(PANGO).$(PANGO_SUFFIX)
> +PANGO_SUFFIX	:= tar.xz
> +PANGO_URL	:= http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/$(PANGO).$(PANGO_SUFFIX)
>  PANGO_SOURCE	:= $(SRCDIR)/$(PANGO).$(PANGO_SUFFIX)
>  PANGO_DIR	:= $(BUILDDIR)/$(PANGO)
>  PANGO_LICENSE	:= LGPL-2.0+
> @@ -37,29 +37,19 @@ PANGO_ENV 	:= $(CROSS_ENV)
>  #
>  # autoconf
>  #
> -PANGO_MODULES-$(PTXCONF_PANGO_BASIC)	+= basic-fc,basic-win32,basic-x,basic-atsui
> -PANGO_MODULES-$(PTXCONF_PANGO_ARABIC)	+= arabic-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_HANGUL)	+= hangul-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_HEBREW)	+= hebrew-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_INDIC)	+= indic-fc,indic-lang
> -PANGO_MODULES-$(PTXCONF_PANGO_KHMER)	+= khmer-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_SYRIAC)	+= syriac-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_THAI)	+= thai-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_TIBETAN)	+= tibetan-fc
> -
>  PANGO_AUTOCONF := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--x-includes=$(XORG_PREFIX)/include \
> -	--x-libraries=$(XORG_LIBDIR) \
> +	--enable-debug=no \
> +	--enable-rebuilds \
> +	--enable-introspection=no \
>  	--disable-gtk-doc \
>  	--disable-gtk-doc-html \
>  	--disable-gtk-doc-pdf \
> -	--disable-man \
>  	--disable-doc-cross-references \
> -	--enable-explicit-deps=no \
> -	--$(call ptx/wwo, PTXCONF_PANGO_TARGET_X11)-x \
> -	--with-included-modules=$(subst $(space),$(comma),$(PANGO_MODULES-y)) \
> -	--without-dynamic-modules
> +	--enable-Bsymbolic \
> +	--disable-installed-tests \
> +	--$(call ptx/wwo, PTXCONF_PANGO_TARGET_X11)-xft \
> +	--with-cairo
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> -- 
> 2.13.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de