[arch-commits] Commit in kdegraphics/trunk (PKGBUILD fix-libjpeg8-compatibility.patch)

[Andrea Scarpino]

    Date: Tuesday, May 4, 2010 @ 19:09:51
  Author: andrea
Revision: 79628

fix broke rotate JPEG images in gwenview (FS#19357)

Added:
  kdegraphics/trunk/fix-libjpeg8-compatibility.patch
Modified:
  kdegraphics/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   14 ++++++++++----
 fix-libjpeg8-compatibility.patch |   13 +++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-04 22:02:05 UTC (rev 79627)
+++ PKGBUILD	2010-05-04 23:09:51 UTC (rev 79628)
@@ -12,7 +12,7 @@
          'kdegraphics-libs'
          'kdegraphics-okular')
 pkgver=4.4.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -20,11 +20,17 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'kdebase-runtime'
              'poppler-qt' 'libspectre' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qca'
              'qimageblitz' 'ebook-tools' 'libxxf86vm')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('1caa6a6183c8cdf7cd3315d86ecfd37c5c829c9d')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+	'fix-libjpeg8-compatibility.patch')
+sha1sums=('1caa6a6183c8cdf7cd3315d86ecfd37c5c829c9d'
+	'e71d0a0b5e25587c8ae026646a004c117ef5891f')
 
 build() {
-	cd $srcdir
+	# Fixed in 4.5, check before build 4.4.4
+	cd ${srcdir}/${pkgbase}-${pkgver}
+	patch -Np1 -i ${srcdir}/fix-libjpeg8-compatibility.patch || return 1
+
+	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

Added: fix-libjpeg8-compatibility.patch
===================================================================
--- fix-libjpeg8-compatibility.patch	                        (rev 0)
+++ fix-libjpeg8-compatibility.patch	2010-05-04 23:09:51 UTC (rev 79628)
@@ -0,0 +1,13 @@
+--- kdegraphics-4.4.3/gwenview/lib/jpegcontent.cpp~	2010-05-05 00:34:00.190335453 +0200
++++ kdegraphics-4.4.3/gwenview/lib/jpegcontent.cpp	2010-05-05 00:35:32.947818779 +0200
+@@ -455,9 +455,8 @@
+ 
+ 	// Init transformation
+ 	jpeg_transform_info transformoption;
++	memset(&transformoption, 0, sizeof(jpeg_transform_info));
+ 	transformoption.transform = findJxform(d->mTransformMatrix);
+-	transformoption.force_grayscale = false;
+-	transformoption.trim = false;
+ 	jtransform_request_workspace(&srcinfo, &transformoption);
+ 
+ 	/* Read source file as DCT coefficients */