[arch-commits] Commit in gtk2/repos (3 files)

[Allan McRae]

    Date: Saturday, July 18, 2009 @ 04:12:27
  Author: allan
Revision: 46425

Merged revisions 46424 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/gtk2/trunk

........
  r46424 | allan | 2009-07-18 18:10:53 +1000 (Sat, 18 Jul 2009) | 2 lines
  
  upgpkg: gtk2 2.16.4-2
      fix for libjpeg7
........

Added:
  gtk2/repos/extra-i686/libjpeg-7.patch
    (from rev 46424, gtk2/trunk/libjpeg-7.patch)
Modified:
  gtk2/repos/extra-i686/	(properties)
  gtk2/repos/extra-i686/PKGBUILD

-----------------+
 PKGBUILD        |   10 +++++++---
 libjpeg-7.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)


Property changes on: gtk2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gtk2/trunk:1-44723
   + /gtk2/trunk:1-46424

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-18 08:10:53 UTC (rev 46424)
+++ extra-i686/PKGBUILD	2009-07-18 08:12:27 UTC (rev 46425)
@@ -3,7 +3,7 @@
 
 pkgname=gtk2
 pkgver=2.16.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
@@ -16,11 +16,15 @@
 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)
-md5sums=('d666f9f5a544e9d4d45804d88b1b5c4d')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/gtk+-${pkgver}.tar.bz2
+        libjpeg-7.patch)
+md5sums=('d666f9f5a544e9d4d45804d88b1b5c4d'
+         'f2cc0629ceefea0de42333ffe3a1b6ea')
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
+  patch -Np1 -i $srcdir/libjpeg-7.patch
+  
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --with-xinput=yes \
 	      --without-libjasper \

Copied: gtk2/repos/extra-i686/libjpeg-7.patch (from rev 46424, gtk2/trunk/libjpeg-7.patch)
===================================================================
--- extra-i686/libjpeg-7.patch	                        (rev 0)
+++ extra-i686/libjpeg-7.patch	2009-07-18 08:12:27 UTC (rev 46425)
@@ -0,0 +1,12 @@
+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 @@
+ 				}
+ 			}
+ 			
+-			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) {
+ 				jpeg_calc_output_dimensions (cinfo);
+ 				if (cinfo->output_width < width || cinfo->output_height < height) {
+ 					cinfo->scale_denom /= 2;