To: vim_dev@googlegroups.com
Subject: Patch 7.4.2092
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.2092
Problem:    GTK 3 build fails with older GTK version.
Solution:   Check the pango version. (Kazunobu Kuriyama)
Files:      src/gui_beval.c


*** ../vim-7.4.2091/src/gui_beval.c	2016-07-21 22:10:06.047248424 +0200
--- src/gui_beval.c	2016-07-22 22:25:38.969886920 +0200
***************
*** 1046,1052 ****
--- 1046,1054 ----
  	guicolor_T	pixel;
  #if GTK_CHECK_VERSION(3,0,0)
  	GdkRGBA		color = { 0.0, 0.0, 0.0, 1.0 };
+ # if PANGO_VERSION_CHECK(1,38,0)
  	PangoAttribute  *attr_alpha;
+ # endif
  #else
  	GdkColor	color = { 0, 0, 0, 0 };
  #endif
***************
*** 1115,1122 ****
--- 1117,1126 ----
  				DOUBLE2UINT16(color.red),
  				DOUBLE2UINT16(color.green),
  				DOUBLE2UINT16(color.blue));
+ # if PANGO_VERSION_CHECK(1,38,0)
  			attr_alpha = pango_attr_foreground_alpha_new(
  				DOUBLE2UINT16(color.alpha));
+ # endif
  # undef DOUBLE2UINT16
  #else
  			attr = pango_attr_foreground_new(
***************
*** 1126,1134 ****
--- 1130,1140 ----
  			attr->end_index   = pdest - buf + outlen;
  			pango_attr_list_insert(attr_list, attr);
  #if GTK_CHECK_VERSION(3,0,0)
+ # if PANGO_VERSION_CHECK(1,38,0)
  			attr_alpha->start_index = pdest - buf;
  			attr_alpha->end_index   = pdest - buf + outlen;
  			pango_attr_list_insert(attr_list, attr_alpha);
+ # endif
  #endif
  		    }
  		    pdest += outlen;
*** ../vim-7.4.2091/src/version.c	2016-07-22 22:12:33.457219452 +0200
--- src/version.c	2016-07-22 22:25:54.213740873 +0200
***************
*** 760,761 ****
--- 760,763 ----
  {   /* Add new patch number below this line */
+ /**/
+     2092,
  /**/

-- 
Yesterday is history.
Tomorrow is a mystery.
Today is a gift.
That's why it is called 'present'.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///