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

[Pierre Schmitz]

    Date: Friday, July 17, 2009 @ 21:21:00
  Author: pierre
Revision: 46395

upgpkg: kdelibs 4.2.4-4

Added:
  kdelibs/trunk/libjpeg-7.patch
Modified:
  kdelibs/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-17 20:11:53 UTC (rev 46394)
+++ PKGBUILD	2009-07-18 01:21:00 UTC (rev 46395)
@@ -3,7 +3,7 @@
 
 pkgname=kdelibs
 pkgver=4.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -17,10 +17,11 @@
 options=('docs')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch' 'libjpeg-7.patch')
 md5sums=('9ed29086c33bc73256a7fa5268df560b'
          'e94450ba5430ea9c1e33bad9ae38ca2d'
-         '0ad42200df2d2b8aab01d2ef4b21e02f')
+         '0ad42200df2d2b8aab01d2ef4b21e02f'
+         'f1578c3987049ed0610732e6cd5263d9')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
@@ -29,6 +30,9 @@
 	patch -p1 -i $srcdir/kde-applications-menu.patch
 	# add Archlinux menu entry
 	patch -p0 -i $srcdir/archlinux-menu.patch
+	# fix compatibility with libjpeg-7; see https://bugs.kde.org/show_bug.cgi?id=198779
+	# will be in 4.3.0
+	patch -p0 -i $srcdir/libjpeg-7.patch
 	cd ..
 	mkdir build
 	cd build

Added: libjpeg-7.patch
===================================================================
--- libjpeg-7.patch	                        (rev 0)
+++ libjpeg-7.patch	2009-07-18 01:21:00 UTC (rev 46395)
@@ -0,0 +1,11 @@
+--- khtml/imload/decoders/jpegloader.cpp	2009/07/17 22:28:35	998544
++++ khtml/imload/decoders/jpegloader.cpp	2009/07/17 22:31:07	998545
+@@ -324,7 +324,7 @@
+                 scaleDown *= 2;
+             }
+             
+-            cinfo.scale_denom = scaleDown;
++            cinfo.scale_denom *= scaleDown;
+             
+             if (scaleDown > 8) {
+                 // Still didn't fit... Abort.