[arch-commits] Commit in gtk2 (gnome-unstable trunk/PKGBUILD trunk/libjpeg-7.patch)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 17:06:38
  Author: jgc
Revision: 55002

Merge gnome-unstable

Modified:
  gtk2/trunk/PKGBUILD
  gtk2/trunk/libjpeg-7.patch
Deleted:
  gtk2/gnome-unstable/

-----------------+
 PKGBUILD        |   17 +++++++++--------
 libjpeg-7.patch |   15 +++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2009-10-11 21:04:30 UTC (rev 55001)
+++ trunk/PKGBUILD	2009-10-11 21:06:38 UTC (rev 55002)
@@ -2,30 +2,31 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.16.6
+pkgver=2.18.2
 pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk2.install
-depends=('atk>=1.26.0' 'pango>=1.24.4' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.2.1' 'libcups>=1.3.10-3' 'libxcomposite' 'libxdamage' 'heimdal>=1.2.1' 'gnutls>=2.8.3' 'shared-mime-info')
-makedepends=('pkgconfig')
+depends=('atk>=1.28.0' 'pango>=1.26.0' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.2.1' 'libcups>=1.3.11' 'libxcomposite' 'libxdamage' 'heimdal>=1.2.1' 'gnutls>=2.8.3' 'shared-mime-info')
+makedepends=('pkgconfig' 'gtk-doc')
 replaces=('gtkprint-cups' 'gail')
 conflicts=('gtkprint-cups' 'gail')
 provides=('gail=1.22.3')
 options=('!libtool' '!docs')
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/gtk+-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/gtk+-${pkgver}.tar.bz2
         libjpeg-7.patch)
-sha256sums=('18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af'
-            '977ba13f3e2778cb82aadfd5e27fc4a8b715346e30e1cd1e6e76bec30079bf99')
+sha256sums=('5e0832e154b4accab8286ae724ddbad5d701f4af6a9291582d1430b9f360f5f1'
+            '67de89f864a8d10e617a9600025d5bd932ac22adca4cda314d470a2d72e0196e')
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
   patch -Np1 -i "${srcdir}/libjpeg-7.patch" || return 1
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
+
+  autoreconf || return 1
+  CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-xinput=yes \
       --without-libjasper \
       --with-included-loaders=png || return 1

Modified: trunk/libjpeg-7.patch
===================================================================
--- trunk/libjpeg-7.patch	2009-10-11 21:04:30 UTC (rev 55001)
+++ trunk/libjpeg-7.patch	2009-10-11 21:06:38 UTC (rev 55002)
@@ -1,12 +1,11 @@
-diff -Naur gtk+-2.16.4-orig/gdk-pixbuf/io-jpeg.c gtk+-2.16.4/gdk-pixbuf/io-jpeg.c
---- gtk+-2.16.4-orig/gdk-pixbuf/io-jpeg.c	2009-06-19 12:59:18.000000000 +1000
-+++ gtk+-2.16.4/gdk-pixbuf/io-jpeg.c	2009-07-18 17:35:05.000000000 +1000
-@@ -922,7 +922,7 @@
+--- gtk+-2.18.2/gdk-pixbuf/io-jpeg.c.orig	2009-10-09 09:53:34.000000000 +0200
++++ gtk+-2.18.2/gdk-pixbuf/io-jpeg.c	2009-10-09 09:54:23.000000000 +0200
+@@ -920,6 +920,8 @@
+ 					return FALSE;
  				}
  			}
++
++      cinfo->scale_num = 1;
  			
--			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
-+			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 16; cinfo->scale_denom *= 2) {
+ 			for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8; cinfo->scale_denom *= 2) {
  				jpeg_calc_output_dimensions (cinfo);
- 				if (cinfo->output_width < width || cinfo->output_height < height) {
- 					cinfo->scale_denom /= 2;