Upgrade the Pango binary in the win32 installer to include the fix for https://bugzilla.gnome.org/show_bug.cgi?id=668154 release-2.x.y
authorDaniel Atallah <datallah@pidgin.im>
Tue, 21 Jan 2014 23:09:37 -0500
branchrelease-2.x.y
changeset3542f04b5e52 pushlog
parent 9a21b3ce6ed7
child c6b894d730dd
Upgrade the Pango binary in the win32 installer to include the fix for https://bugzilla.gnome.org/show_bug.cgi?id=668154
ChangeLog
Makefile.mingw
pidgin/win32/nsis/generate_gtk_zip.sh
      1.1 --- a/ChangeLog
      1.2 +++ b/ChangeLog
      1.3 @@ -36,6 +36,8 @@
      1.4  	* Fix crash-on-startup when ASLR is always on. (#15521)
      1.5  	* Updates to dependencies:
      1.6  		* NSS 3.15.4 and NSPR 4.10.2
      1.7 +		* Pango 1.29.4-1daa 
      1.8 +			Patched for https://bugzilla.gnome.org/show_bug.cgi?id=668154
      1.9  
     1.10  	AIM:
     1.11  	* Fix untrusted certificate error.
      2.1 --- a/Makefile.mingw
      2.2 +++ b/Makefile.mingw
      2.3 @@ -31,7 +31,7 @@
      2.4      exit; \
      2.5  }' VERSION)
      2.6  
      2.7 -GTK_INSTALL_VERSION = 2.16.6.1
      2.8 +GTK_INSTALL_VERSION = 2.16.6.2
      2.9  
     2.10  authenticode_sign = $(MONO_SIGNCODE) \
     2.11  		    -spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
      3.1 --- a/pidgin/win32/nsis/generate_gtk_zip.sh
      3.2 +++ b/pidgin/win32/nsis/generate_gtk_zip.sh
      3.3 @@ -16,8 +16,8 @@
      3.4  PIDGIN_VERSION=$( < $PIDGIN_BASE/VERSION )
      3.5  
      3.6  #This needs to be changed every time there is any sort of change.
      3.7 -BUNDLE_VERSION=2.16.6.1
      3.8 -BUNDLE_SHA1SUM=3e586e3f716f909ff6c11bf64c5ad23f1a0c98bf
      3.9 +BUNDLE_VERSION=2.16.6.2
     3.10 +BUNDLE_SHA1SUM=e1b1ec8d2159fa98b2a9f516dbfe745bf7a22169
     3.11  ZIP_FILE="$PIDGIN_BASE/pidgin/win32/nsis/gtk-runtime-$BUNDLE_VERSION.zip"
     3.12  
     3.13  #Download the existing file (so that we distribute the exact same file for all releases with the same bundle version)
     3.14 @@ -51,7 +51,7 @@
     3.15  GLIB="http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib_2.28.8-1_win32.zip Glib 2.28.8-1 sha1sum:5d158f4c77ca0b5508e1042955be573dd940b574"
     3.16  GTK="http://ftp.acc.umu.se/pub/gnome/binaries/win32/gtk+/2.16/gtk+_2.16.6-2_win32.zip GTK+ 2.16.6-2 sha1sum:012853e6de814ebda0cc4459f9eed8ae680e6d17"
     3.17  LIBPNG="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.12-1_win32.zip libpng 1.4.12-1 gpg:0x71D4DDE53F188CBE"
     3.18 -PANGO="http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.29/pango_1.29.4-1_win32.zip Pango 1.29.4-1 sha1sum:3959319bd04fbce513458857f334ada279b8cdd4"
     3.19 +PANGO="https://developer.pidgin.im/static/win32/pango_1.29.4-1daa_win32.zip Pango 1.29.4-1daa gpg:0x86723FEEDE890574"
     3.20  ZLIB="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip zlib 1.2.5-2 sha1sum:568907188761df2d9309196e447d91bbc5555d2b"
     3.21  
     3.22  ALL="ATK CAIRO EXPAT FONTCONFIG FREETYPE GETTEXT GLIB GTK LIBPNG PANGO ZLIB"