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

[Jan de Groot]

    Date: Friday, October 9, 2009 @ 04:08:53
  Author: jgc
Revision: 54349

Fix jpeg patch, update to 2.18.2

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

-----------------+
 PKGBUILD        |    6 +++---
 libjpeg-7.patch |   15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-09 07:39:06 UTC (rev 54348)
+++ PKGBUILD	2009-10-09 08:08:53 UTC (rev 54349)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.18.1
+pkgver=2.18.2
 pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
@@ -18,8 +18,8 @@
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/gtk+-${pkgver}.tar.bz2
         libjpeg-7.patch)
-sha256sums=('c783919ec7967fc36ec440fc6871cbcf3b2626e817530e1e2f0a3fcbdae31ebc'
-            '977ba13f3e2778cb82aadfd5e27fc4a8b715346e30e1cd1e6e76bec30079bf99')
+sha256sums=('5e0832e154b4accab8286ae724ddbad5d701f4af6a9291582d1430b9f360f5f1'
+            '67de89f864a8d10e617a9600025d5bd932ac22adca4cda314d470a2d72e0196e')
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"

Modified: libjpeg-7.patch
===================================================================
--- libjpeg-7.patch	2009-10-09 07:39:06 UTC (rev 54348)
+++ libjpeg-7.patch	2009-10-09 08:08:53 UTC (rev 54349)
@@ -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;